diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js
index f25753c3b..52f917a5a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js	
@@ -89,7 +89,7 @@
                 _postData.keyValue = keyValue;
                 _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
                 learun.layer.loading(true, '正在提交数据');
-                learun.httppost(config.webapi + 'learun/EducationalAdministration/StuAttendanceLeave/save', _postData, (data) => {
+                learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/StuAttendanceLeave/save', _postData, (data) => {
                     learun.layer.loading(false);
                     if (data) {// 表单数据保存成功 
                         if (keyValue) {
@@ -104,8 +104,8 @@
                         else {// 如果是 
                             learun.nav.closeCurrent();
                         }
-                        var prepage = learun.nav.getpage('EducationalAdministration/StuAttendanceLeave');
-                        prepage.grid.reload();
+                        var prepage = learun.nav.getpage('timeTable');
+                        prepage.init($(prepage));
                     }
                 });
             });
@@ -115,7 +115,7 @@
             $header.find('.lr-form-header-btnlist').show();
             // 获取表单数据 
             learun.layer.loading(true, '获取表单数据');
-            learun.httpget(config.webapi + 'learun/EducationalAdministration/StuAttendanceLeave/leaveform', keyValue, (data) => {
+            learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuAttendanceLeave/leaveform', keyValue, (data) => {
                 console.log(data);
                 if (data) {
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/timeTable.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/timeTable.css
index c837dc840..9bcf81d07 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/timeTable.css	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/timeTable.css	
@@ -121,7 +121,7 @@ li{
 .tSec2List li{
 	border-bottom: 1px solid #D5EAF7;
 	overflow: hidden;
-	height: 60px;
+	height: 64px;
 }
 .tSec2ListL{
 	float: left;
@@ -150,7 +150,7 @@ li{
 .tSec2ListT{
 	color: #3E3E3E;
 	font-size: 15px;
-	margin: 5px 0;
+	margin: 2px 0;
 	overflow:hidden;
 	white-space:nowrap;
 	text-overflow:ellipsis;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/timeTable.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/timeTable.js
index 43d791fa2..c945ecb72 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/timeTable.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/timeTable.js	
@@ -120,6 +120,9 @@
                                     k.LessonName +
                                     '</div>' +
                                     '<div class="tSec2ListTxt">' +
+                                    k.ClassName +
+                                    '</div>' +
+                                    '<div class="tSec2ListTxt">' +
                                     '<i class="iconfont icon-addressbook1"></i>' +
                                     k.EmpName +
                                     '</div>' +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuAttendanceLeaveController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuAttendanceLeaveController.cs
index bd26f7a65..b86aca106 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuAttendanceLeaveController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuAttendanceLeaveController.cs	
@@ -137,6 +137,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             StuAttendanceLeaveEntity entity = strEntity.ToObject<StuAttendanceLeaveEntity>();
             stuAttendanceLeaveIBLL.SaveEntity(keyValue, entity);
 
+            entity = stuAttendanceLeaveIBLL.GetStuAttendanceLeaveEntity(entity.ID);
+
             if (!string.IsNullOrEmpty(entity.IsCheck))
             {
                 if (entity.IsCheck == "1")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuAttendanceLeaveApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuAttendanceLeaveApi.cs
index 29fe98147..1ab2e02fb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuAttendanceLeaveApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuAttendanceLeaveApi.cs	
@@ -133,6 +133,7 @@ namespace Learun.Application.WebApi
         {
             ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
             StuAttendanceLeaveEntity entity = parameter.strEntity.ToObject<StuAttendanceLeaveEntity>();
+            entity.TeachClassNo = entity.ClassNo;
             stuAttendanceLeaveIBLL.SaveEntity(this.userInfo, parameter.keyValue, entity);
             if (!string.IsNullOrEmpty(entity.IsCheck))
             {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue
index 82cf5320d..55e9bb57a 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue	
@@ -1,52 +1,65 @@
 <script>
-export default {
-  // 小程序：onLaunch 仅启动时调用一次
-  // H5/App：onLaunch 打开网页/用户点刷新/代码热更新时均会调用；
-  // 考虑到用户刷新网页时会丢失全局数据、页面栈、页面数据等，因此直接跳回首页即可
+	export default {
+		// 小程序：onLaunch 仅启动时调用一次
+		// H5/App：onLaunch 打开网页/用户点刷新/代码热更新时均会调用；
+		// 考虑到用户刷新网页时会丢失全局数据、页面栈、页面数据等，因此直接跳回首页即可
 
-  async onLaunch(param) {
-    //应用的生命周期  应用启动后触发
-    // #ifdef H5 || APP-VUE
-    // H5 刷新时获取当前页面路径
-    const pagePath = "/" + param.path;
-    // 如果 H5 刷新后访问的不是首页/登录页/注册页，直接跳转回首页
-    if (!["/pages/login", "/pages/home", "/pages/signup"].includes(pagePath)) {
-      this.$nextTick(() => {
-        this.TAB_TO("/pages/home");
-        return;
-      });
-    }
-    // #endif
+		async onLaunch(param) {
+			//应用的生命周期  应用启动后触发
+			// #ifdef H5 || APP-VUE
+			// H5 刷新时获取当前页面路径
+			const pagePath = "/" + param.path;
+			// 如果 H5 刷新后访问的不是首页/登录页/注册页，直接跳转回首页
+			if (!["/pages/login", "/pages/home", "/pages/signup"].includes(pagePath)) {
+				this.$nextTick(() => {
+					this.TAB_TO("/pages/home");
+					return;
+				});
+			}
 
-    // #ifdef MP-WEIXIN
-    // 小程序端，处理更新 （支付宝/钉钉暂不支持）
-    const updateManager = uni.getUpdateManager();
-    updateManager.onUpdateReady(() => {
-      this.HIDE_LOADING();
-      uni.showModal({
-        title: "更新提示",
-        content: "小程序新版本已准备好，是否更新应用？",
-        success: ({ confirm }) => {
-          if (confirm) {
-            updateManager.applyUpdate();
-          }
-        },
-      });
-    });
-    // #endif
-  },
-  onError(error) {
-    console.log(error);
-  },
-};
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			// 小程序端，处理更新 （支付宝/钉钉暂不支持）
+			const updateManager = uni.getUpdateManager();
+			updateManager.onUpdateReady(() => {
+				this.HIDE_LOADING();
+				uni.showModal({
+					title: "更新提示",
+					content: "小程序新版本已准备好，是否更新应用？",
+					success: ({
+						confirm
+					}) => {
+						if (confirm) {
+							updateManager.applyUpdate();
+						}
+					},
+				});
+			});
+			// #endif
+		},
+		onError(error) {
+			console.log(error);
+		},
+	};
 </script>
 
 <style lang="less">
-// 现在 CSS 必须在 <style> 中引入，参考：https://ask.dcloud.net.cn/question/86907
-// 后续 uni-app 升级后可能会支持直接 import 样式，到时候可以省略下行代码
-@import "~@/components/learun-mpui/styles/index.css";
+	// 现在 CSS 必须在 <style> 中引入，参考：https://ask.dcloud.net.cn/question/86907
+	// 后续 uni-app 升级后可能会支持直接 import 样式，到时候可以省略下行代码
+	@import "~@/components/learun-mpui/styles/index.css";
+
+	page {
+		background-color: #f3f3f3;
+	}
 
-page {
-  background-color: #f3f3f3;
-}
+	.btn {
+		width: 50%;
+		line-height: 34px;
+		background-color: #0c86d8;
+		text-align: center;
+		color: #fff;
+		border-radius: 4px;
+		margin: 30px auto;
+	}
 </style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/css/common.less b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/css/common.less
new file mode 100644
index 000000000..ec4b7e619
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/css/common.less	
@@ -0,0 +1,11 @@
+@pubColor: #0C86D8;
+
+.btn {
+	width: 50%;
+	line-height: 34px;
+	background-color: #0c86d8;
+	text-align: center;
+	color: #fff;
+	border-radius: 4px;
+	margin: 30px auto;
+}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/1.jpg b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/1.jpg
new file mode 100644
index 000000000..df1127a0a
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/1.jpg differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/2.jpg b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/2.jpg
new file mode 100644
index 000000000..444ac86a5
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/2.jpg differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/2.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/2.png
new file mode 100644
index 000000000..efccc99b6
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/2.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/3.jpg b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/3.jpg
new file mode 100644
index 000000000..1c244fa67
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/3.jpg differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/4.jpg b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/4.jpg
new file mode 100644
index 000000000..2461b4f5c
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/4.jpg differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/banner.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/banner.png
new file mode 100644
index 000000000..e6830d937
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/banner.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/banner1.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/banner1.png
new file mode 100644
index 000000000..c2d5ff2bf
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/banner1.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/banner160.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/banner160.png
new file mode 100644
index 000000000..1e5e79a83
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/banner160.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/book.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/book.png
new file mode 100644
index 000000000..0db4f0234
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/book.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/dk.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/dk.png
new file mode 100644
index 000000000..64bd99bf5
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/dk.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/dkred.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/dkred.png
new file mode 100644
index 000000000..a2dc327d0
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/dkred.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/dkyellow.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/dkyellow.png
new file mode 100644
index 000000000..4f1cabb69
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/dkyellow.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-1.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-1.png
new file mode 100644
index 000000000..990fd495c
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-1.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-2.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-2.png
new file mode 100644
index 000000000..ac3c8b0fe
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-2.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-3.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-3.png
new file mode 100644
index 000000000..c088593c3
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-3.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-4.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-4.png
new file mode 100644
index 000000000..ad16a75be
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-4.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-5.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-5.png
new file mode 100644
index 000000000..74f182764
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-5.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-6.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-6.png
new file mode 100644
index 000000000..3a8521416
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter1-6.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-1.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-1.png
new file mode 100644
index 000000000..6b334c16d
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-1.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-2.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-2.png
new file mode 100644
index 000000000..79af57c9a
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-2.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-3.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-3.png
new file mode 100644
index 000000000..0cf0c96a8
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-3.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-4.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-4.png
new file mode 100644
index 000000000..5937e6a5a
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-4.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-5.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-5.png
new file mode 100644
index 000000000..91ea733b3
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/enter2-5.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/location.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/location.png
new file mode 100644
index 000000000..53c3d8932
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/location.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/location2.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/location2.png
new file mode 100644
index 000000000..c6dd0480a
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/location2.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/logo.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/logo.png
new file mode 100644
index 000000000..928b9c3e6
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/logo.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/logoXc.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/logoXc.png
new file mode 100644
index 000000000..532bd5a13
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/logoXc.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/logoXcTxt.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/logoXcTxt.png
new file mode 100644
index 000000000..e898a2075
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/logoXcTxt.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/myCardBg.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/myCardBg.png
new file mode 100644
index 000000000..676d58f78
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/myCardBg.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/notification.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/notification.png
new file mode 100644
index 000000000..63a1047c0
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/notification.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/on-boy.jpg b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/on-boy.jpg
new file mode 100644
index 000000000..0d7d6051f
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/on-boy.jpg differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/on-girl.jpg b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/on-girl.jpg
new file mode 100644
index 000000000..a59d771b7
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/on-girl.jpg differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/person.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/person.png
new file mode 100644
index 000000000..7c628a717
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/person.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/reportBg.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/reportBg.png
new file mode 100644
index 000000000..f03e24700
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/reportBg.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/student.jpg b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/student.jpg
new file mode 100644
index 000000000..de0ba984f
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/student.jpg differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab10.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab10.png
new file mode 100644
index 000000000..9fb636d45
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab10.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab11.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab11.png
new file mode 100644
index 000000000..ef6741dad
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab11.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab20.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab20.png
new file mode 100644
index 000000000..8ca8e66ac
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab20.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab21.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab21.png
new file mode 100644
index 000000000..a110b4dc4
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab21.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab30.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab30.png
new file mode 100644
index 000000000..8394fe514
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab30.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab31.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab31.png
new file mode 100644
index 000000000..06c111e89
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab31.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab40.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab40.png
new file mode 100644
index 000000000..fbe861832
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab40.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab41.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab41.png
new file mode 100644
index 000000000..7c2c8522b
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/tab41.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/time.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/time.png
new file mode 100644
index 000000000..1581f1781
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/time.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/timeT1-1.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/timeT1-1.png
new file mode 100644
index 000000000..ddfdbaf4d
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/timeT1-1.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/wechat.jpg b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/wechat.jpg
new file mode 100644
index 000000000..a7b92f902
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/wechat.jpg differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/welcomeBanner.jpg b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/welcomeBanner.jpg
new file mode 100644
index 000000000..ed47550d7
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/welcomeBanner.jpg differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcBg.jpg b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcBg.jpg
new file mode 100644
index 000000000..2241763a5
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcBg.jpg differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcQr.jpg b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcQr.jpg
new file mode 100644
index 000000000..571ab58bb
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcQr.jpg differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcYc.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcYc.png
new file mode 100644
index 000000000..3b7d8ebec
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcYc.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcYz.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcYz.png
new file mode 100644
index 000000000..7667e13c0
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcYz.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcZc.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcZc.png
new file mode 100644
index 000000000..ed807d60b
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcZc.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcZc2.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcZc2.png
new file mode 100644
index 000000000..eed805947
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcZc2.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcZc3.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcZc3.png
new file mode 100644
index 000000000..bca79a5e8
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/images/xcZc3.png differ
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/city.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/city.js
new file mode 100644
index 000000000..6dc76d48c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/city.js	
@@ -0,0 +1,11553 @@
+
+var cityData = [{
+	value: '110000',
+	text: '北京市',
+	children: [{
+		value: "110100",
+		text: "北京市",
+		children: [{
+			value: "110101",
+			text: "东城区"
+		}, {
+			value: "110102",
+			text: "西城区"
+		}, {
+			value: "110103",
+			text: "崇文区"
+		}, {
+			value: "110104",
+			text: "宣武区"
+		}, {
+			value: "110105",
+			text: "朝阳区"
+		}, {
+			value: "110106",
+			text: "丰台区"
+		}, {
+			value: "110107",
+			text: "石景山区"
+		}, {
+			value: "110108",
+			text: "海淀区"
+		}, {
+			value: "110109",
+			text: "门头沟区"
+		}, {
+			value: "110111",
+			text: "房山区"
+		}, {
+			value: "110112",
+			text: "通州区"
+		}, {
+			value: "110113",
+			text: "顺义区"
+		}, {
+			value: "110114",
+			text: "昌平区"
+		}, {
+			value: "110115",
+			text: "大兴区"
+		}, {
+			value: "110116",
+			text: "怀柔区"
+		}, {
+			value: "110117",
+			text: "平谷区"
+		}, {
+			value: "110228",
+			text: "密云县"
+		}, {
+			value: "110229",
+			text: "延庆县"
+		}, {
+			value: "110230",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '120000',
+	text: '天津市',
+	children: [{
+		value: "120100",
+		text: "天津市",
+		children: [{
+			value: "120101",
+			text: "和平区"
+		}, {
+			value: "120102",
+			text: "河东区"
+		}, {
+			value: "120103",
+			text: "河西区"
+		}, {
+			value: "120104",
+			text: "南开区"
+		}, {
+			value: "120105",
+			text: "河北区"
+		}, {
+			value: "120106",
+			text: "红桥区"
+		}, {
+			value: "120107",
+			text: "塘沽区"
+		}, {
+			value: "120108",
+			text: "汉沽区"
+		}, {
+			value: "120109",
+			text: "大港区"
+		}, {
+			value: "120110",
+			text: "东丽区"
+		}, {
+			value: "120111",
+			text: "西青区"
+		}, {
+			value: "120112",
+			text: "津南区"
+		}, {
+			value: "120113",
+			text: "北辰区"
+		}, {
+			value: "120114",
+			text: "武清区"
+		}, {
+			value: "120115",
+			text: "宝坻区"
+		}, {
+			value: "120116",
+			text: "滨海新区"
+		}, {
+			value: "120221",
+			text: "宁河县"
+		}, {
+			value: "120223",
+			text: "静海县"
+		}, {
+			value: "120225",
+			text: "蓟县"
+		}, {
+			value: "120226",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '130000',
+	text: '河北省',
+	children: [{
+		value: "130100",
+		text: "石家庄市",
+		children: [{
+			value: "130102",
+			text: "长安区"
+		}, {
+			value: "130103",
+			text: "桥东区"
+		}, {
+			value: "130104",
+			text: "桥西区"
+		}, {
+			value: "130105",
+			text: "新华区"
+		}, {
+			value: "130107",
+			text: "井陉矿区"
+		}, {
+			value: "130108",
+			text: "裕华区"
+		}, {
+			value: "130121",
+			text: "井陉县"
+		}, {
+			value: "130123",
+			text: "正定县"
+		}, {
+			value: "130124",
+			text: "栾城县"
+		}, {
+			value: "130125",
+			text: "行唐县"
+		}, {
+			value: "130126",
+			text: "灵寿县"
+		}, {
+			value: "130127",
+			text: "高邑县"
+		}, {
+			value: "130128",
+			text: "深泽县"
+		}, {
+			value: "130129",
+			text: "赞皇县"
+		}, {
+			value: "130130",
+			text: "无极县"
+		}, {
+			value: "130131",
+			text: "平山县"
+		}, {
+			value: "130132",
+			text: "元氏县"
+		}, {
+			value: "130133",
+			text: "赵县"
+		}, {
+			value: "130181",
+			text: "辛集市"
+		}, {
+			value: "130182",
+			text: "藁城市"
+		}, {
+			value: "130183",
+			text: "晋州市"
+		}, {
+			value: "130184",
+			text: "新乐市"
+		}, {
+			value: "130185",
+			text: "鹿泉市"
+		}, {
+			value: "130186",
+			text: "其它区"
+		}]
+	}, {
+		value: "130200",
+		text: "唐山市",
+		children: [{
+			value: "130202",
+			text: "路南区"
+		}, {
+			value: "130203",
+			text: "路北区"
+		}, {
+			value: "130204",
+			text: "古冶区"
+		}, {
+			value: "130205",
+			text: "开平区"
+		}, {
+			value: "130207",
+			text: "丰南区"
+		}, {
+			value: "130208",
+			text: "丰润区"
+		}, {
+			value: "130223",
+			text: "滦县"
+		}, {
+			value: "130224",
+			text: "滦南县"
+		}, {
+			value: "130225",
+			text: "乐亭县"
+		}, {
+			value: "130227",
+			text: "迁西县"
+		}, {
+			value: "130229",
+			text: "玉田县"
+		}, {
+			value: "130230",
+			text: "唐海县"
+		}, {
+			value: "130281",
+			text: "遵化市"
+		}, {
+			value: "130283",
+			text: "迁安市"
+		}, {
+			value: "130284",
+			text: "其它区"
+		}]
+	}, {
+		value: "130300",
+		text: "秦皇岛市",
+		children: [{
+			value: "130302",
+			text: "海港区"
+		}, {
+			value: "130303",
+			text: "山海关区"
+		}, {
+			value: "130304",
+			text: "北戴河区"
+		}, {
+			value: "130321",
+			text: "青龙满族自治县"
+		}, {
+			value: "130322",
+			text: "昌黎县"
+		}, {
+			value: "130323",
+			text: "抚宁县"
+		}, {
+			value: "130324",
+			text: "卢龙县"
+		}, {
+			value: "130398",
+			text: "其它区"
+		}, {
+			value: "130399",
+			text: "经济技术开发区"
+		}]
+	}, {
+		value: "130400",
+		text: "邯郸市",
+		children: [{
+			value: "130402",
+			text: "邯山区"
+		}, {
+			value: "130403",
+			text: "丛台区"
+		}, {
+			value: "130404",
+			text: "复兴区"
+		}, {
+			value: "130406",
+			text: "峰峰矿区"
+		}, {
+			value: "130421",
+			text: "邯郸县"
+		}, {
+			value: "130423",
+			text: "临漳县"
+		}, {
+			value: "130424",
+			text: "成安县"
+		}, {
+			value: "130425",
+			text: "大名县"
+		}, {
+			value: "130426",
+			text: "涉县"
+		}, {
+			value: "130427",
+			text: "磁县"
+		}, {
+			value: "130428",
+			text: "肥乡县"
+		}, {
+			value: "130429",
+			text: "永年县"
+		}, {
+			value: "130430",
+			text: "邱县"
+		}, {
+			value: "130431",
+			text: "鸡泽县"
+		}, {
+			value: "130432",
+			text: "广平县"
+		}, {
+			value: "130433",
+			text: "馆陶县"
+		}, {
+			value: "130434",
+			text: "魏县"
+		}, {
+			value: "130435",
+			text: "曲周县"
+		}, {
+			value: "130481",
+			text: "武安市"
+		}, {
+			value: "130482",
+			text: "其它区"
+		}]
+	}, {
+		value: "130500",
+		text: "邢台市",
+		children: [{
+			value: "130502",
+			text: "桥东区"
+		}, {
+			value: "130503",
+			text: "桥西区"
+		}, {
+			value: "130521",
+			text: "邢台县"
+		}, {
+			value: "130522",
+			text: "临城县"
+		}, {
+			value: "130523",
+			text: "内丘县"
+		}, {
+			value: "130524",
+			text: "柏乡县"
+		}, {
+			value: "130525",
+			text: "隆尧县"
+		}, {
+			value: "130526",
+			text: "任县"
+		}, {
+			value: "130527",
+			text: "南和县"
+		}, {
+			value: "130528",
+			text: "宁晋县"
+		}, {
+			value: "130529",
+			text: "巨鹿县"
+		}, {
+			value: "130530",
+			text: "新河县"
+		}, {
+			value: "130531",
+			text: "广宗县"
+		}, {
+			value: "130532",
+			text: "平乡县"
+		}, {
+			value: "130533",
+			text: "威县"
+		}, {
+			value: "130534",
+			text: "清河县"
+		}, {
+			value: "130535",
+			text: "临西县"
+		}, {
+			value: "130581",
+			text: "南宫市"
+		}, {
+			value: "130582",
+			text: "沙河市"
+		}, {
+			value: "130583",
+			text: "其它区"
+		}]
+	}, {
+		value: "130600",
+		text: "保定市",
+		children: [{
+			value: "130602",
+			text: "新市区"
+		}, {
+			value: "130603",
+			text: "北市区"
+		}, {
+			value: "130604",
+			text: "南市区"
+		}, {
+			value: "130621",
+			text: "满城县"
+		}, {
+			value: "130622",
+			text: "清苑县"
+		}, {
+			value: "130623",
+			text: "涞水县"
+		}, {
+			value: "130624",
+			text: "阜平县"
+		}, {
+			value: "130625",
+			text: "徐水县"
+		}, {
+			value: "130626",
+			text: "定兴县"
+		}, {
+			value: "130627",
+			text: "唐县"
+		}, {
+			value: "130628",
+			text: "高阳县"
+		}, {
+			value: "130629",
+			text: "容城县"
+		}, {
+			value: "130630",
+			text: "涞源县"
+		}, {
+			value: "130631",
+			text: "望都县"
+		}, {
+			value: "130632",
+			text: "安新县"
+		}, {
+			value: "130633",
+			text: "易县"
+		}, {
+			value: "130634",
+			text: "曲阳县"
+		}, {
+			value: "130635",
+			text: "蠡县"
+		}, {
+			value: "130636",
+			text: "顺平县"
+		}, {
+			value: "130637",
+			text: "博野县"
+		}, {
+			value: "130638",
+			text: "雄县"
+		}, {
+			value: "130681",
+			text: "涿州市"
+		}, {
+			value: "130682",
+			text: "定州市"
+		}, {
+			value: "130683",
+			text: "安国市"
+		}, {
+			value: "130684",
+			text: "高碑店市"
+		}, {
+			value: "130698",
+			text: "高开区"
+		}, {
+			value: "130699",
+			text: "其它区"
+		}]
+	}, {
+		value: "130700",
+		text: "张家口市",
+		children: [{
+			value: "130702",
+			text: "桥东区"
+		}, {
+			value: "130703",
+			text: "桥西区"
+		}, {
+			value: "130705",
+			text: "宣化区"
+		}, {
+			value: "130706",
+			text: "下花园区"
+		}, {
+			value: "130721",
+			text: "宣化县"
+		}, {
+			value: "130722",
+			text: "张北县"
+		}, {
+			value: "130723",
+			text: "康保县"
+		}, {
+			value: "130724",
+			text: "沽源县"
+		}, {
+			value: "130725",
+			text: "尚义县"
+		}, {
+			value: "130726",
+			text: "蔚县"
+		}, {
+			value: "130727",
+			text: "阳原县"
+		}, {
+			value: "130728",
+			text: "怀安县"
+		}, {
+			value: "130729",
+			text: "万全县"
+		}, {
+			value: "130730",
+			text: "怀来县"
+		}, {
+			value: "130731",
+			text: "涿鹿县"
+		}, {
+			value: "130732",
+			text: "赤城县"
+		}, {
+			value: "130733",
+			text: "崇礼县"
+		}, {
+			value: "130734",
+			text: "其它区"
+		}]
+	}, {
+		value: "130800",
+		text: "承德市",
+		children: [{
+			value: "130802",
+			text: "双桥区"
+		}, {
+			value: "130803",
+			text: "双滦区"
+		}, {
+			value: "130804",
+			text: "鹰手营子矿区"
+		}, {
+			value: "130821",
+			text: "承德县"
+		}, {
+			value: "130822",
+			text: "兴隆县"
+		}, {
+			value: "130823",
+			text: "平泉县"
+		}, {
+			value: "130824",
+			text: "滦平县"
+		}, {
+			value: "130825",
+			text: "隆化县"
+		}, {
+			value: "130826",
+			text: "丰宁满族自治县"
+		}, {
+			value: "130827",
+			text: "宽城满族自治县"
+		}, {
+			value: "130828",
+			text: "围场满族蒙古族自治县"
+		}, {
+			value: "130829",
+			text: "其它区"
+		}]
+	}, {
+		value: "130900",
+		text: "沧州市",
+		children: [{
+			value: "130902",
+			text: "新华区"
+		}, {
+			value: "130903",
+			text: "运河区"
+		}, {
+			value: "130921",
+			text: "沧县"
+		}, {
+			value: "130922",
+			text: "青县"
+		}, {
+			value: "130923",
+			text: "东光县"
+		}, {
+			value: "130924",
+			text: "海兴县"
+		}, {
+			value: "130925",
+			text: "盐山县"
+		}, {
+			value: "130926",
+			text: "肃宁县"
+		}, {
+			value: "130927",
+			text: "南皮县"
+		}, {
+			value: "130928",
+			text: "吴桥县"
+		}, {
+			value: "130929",
+			text: "献县"
+		}, {
+			value: "130930",
+			text: "孟村回族自治县"
+		}, {
+			value: "130981",
+			text: "泊头市"
+		}, {
+			value: "130982",
+			text: "任丘市"
+		}, {
+			value: "130983",
+			text: "黄骅市"
+		}, {
+			value: "130984",
+			text: "河间市"
+		}, {
+			value: "130985",
+			text: "其它区"
+		}]
+	}, {
+		value: "131000",
+		text: "廊坊市",
+		children: [{
+			value: "131002",
+			text: "安次区"
+		}, {
+			value: "131003",
+			text: "广阳区"
+		}, {
+			value: "131022",
+			text: "固安县"
+		}, {
+			value: "131023",
+			text: "永清县"
+		}, {
+			value: "131024",
+			text: "香河县"
+		}, {
+			value: "131025",
+			text: "大城县"
+		}, {
+			value: "131026",
+			text: "文安县"
+		}, {
+			value: "131028",
+			text: "大厂回族自治县"
+		}, {
+			value: "131051",
+			text: "开发区"
+		}, {
+			value: "131052",
+			text: "燕郊经济技术开发区"
+		}, {
+			value: "131081",
+			text: "霸州市"
+		}, {
+			value: "131082",
+			text: "三河市"
+		}, {
+			value: "131083",
+			text: "其它区"
+		}]
+	}, {
+		value: "131100",
+		text: "衡水市",
+		children: [{
+			value: "131102",
+			text: "桃城区"
+		}, {
+			value: "131121",
+			text: "枣强县"
+		}, {
+			value: "131122",
+			text: "武邑县"
+		}, {
+			value: "131123",
+			text: "武强县"
+		}, {
+			value: "131124",
+			text: "饶阳县"
+		}, {
+			value: "131125",
+			text: "安平县"
+		}, {
+			value: "131126",
+			text: "故城县"
+		}, {
+			value: "131127",
+			text: "景县"
+		}, {
+			value: "131128",
+			text: "阜城县"
+		}, {
+			value: "131181",
+			text: "冀州市"
+		}, {
+			value: "131182",
+			text: "深州市"
+		}, {
+			value: "131183",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '140000',
+	text: '山西省',
+	children: [{
+		value: "140100",
+		text: "太原市",
+		children: [{
+			value: "140105",
+			text: "小店区"
+		}, {
+			value: "140106",
+			text: "迎泽区"
+		}, {
+			value: "140107",
+			text: "杏花岭区"
+		}, {
+			value: "140108",
+			text: "尖草坪区"
+		}, {
+			value: "140109",
+			text: "万柏林区"
+		}, {
+			value: "140110",
+			text: "晋源区"
+		}, {
+			value: "140121",
+			text: "清徐县"
+		}, {
+			value: "140122",
+			text: "阳曲县"
+		}, {
+			value: "140123",
+			text: "娄烦县"
+		}, {
+			value: "140181",
+			text: "古交市"
+		}, {
+			value: "140182",
+			text: "其它区"
+		}]
+	}, {
+		value: "140200",
+		text: "大同市",
+		children: [{
+			value: "140202",
+			text: "城区"
+		}, {
+			value: "140203",
+			text: "矿区"
+		}, {
+			value: "140211",
+			text: "南郊区"
+		}, {
+			value: "140212",
+			text: "新荣区"
+		}, {
+			value: "140221",
+			text: "阳高县"
+		}, {
+			value: "140222",
+			text: "天镇县"
+		}, {
+			value: "140223",
+			text: "广灵县"
+		}, {
+			value: "140224",
+			text: "灵丘县"
+		}, {
+			value: "140225",
+			text: "浑源县"
+		}, {
+			value: "140226",
+			text: "左云县"
+		}, {
+			value: "140227",
+			text: "大同县"
+		}, {
+			value: "140228",
+			text: "其它区"
+		}]
+	}, {
+		value: "140300",
+		text: "阳泉市",
+		children: [{
+			value: "140302",
+			text: "城区"
+		}, {
+			value: "140303",
+			text: "矿区"
+		}, {
+			value: "140311",
+			text: "郊区"
+		}, {
+			value: "140321",
+			text: "平定县"
+		}, {
+			value: "140322",
+			text: "盂县"
+		}, {
+			value: "140323",
+			text: "其它区"
+		}]
+	}, {
+		value: "140400",
+		text: "长治市",
+		children: [{
+			value: "140421",
+			text: "长治县"
+		}, {
+			value: "140423",
+			text: "襄垣县"
+		}, {
+			value: "140424",
+			text: "屯留县"
+		}, {
+			value: "140425",
+			text: "平顺县"
+		}, {
+			value: "140426",
+			text: "黎城县"
+		}, {
+			value: "140427",
+			text: "壶关县"
+		}, {
+			value: "140428",
+			text: "长子县"
+		}, {
+			value: "140429",
+			text: "武乡县"
+		}, {
+			value: "140430",
+			text: "沁县"
+		}, {
+			value: "140431",
+			text: "沁源县"
+		}, {
+			value: "140481",
+			text: "潞城市"
+		}, {
+			value: "140482",
+			text: "城区"
+		}, {
+			value: "140483",
+			text: "郊区"
+		}, {
+			value: "140484",
+			text: "高新区"
+		}, {
+			value: "140485",
+			text: "其它区"
+		}]
+	}, {
+		value: "140500",
+		text: "晋城市",
+		children: [{
+			value: "140502",
+			text: "城区"
+		}, {
+			value: "140521",
+			text: "沁水县"
+		}, {
+			value: "140522",
+			text: "阳城县"
+		}, {
+			value: "140524",
+			text: "陵川县"
+		}, {
+			value: "140525",
+			text: "泽州县"
+		}, {
+			value: "140581",
+			text: "高平市"
+		}, {
+			value: "140582",
+			text: "其它区"
+		}]
+	}, {
+		value: "140600",
+		text: "朔州市",
+		children: [{
+			value: "140602",
+			text: "朔城区"
+		}, {
+			value: "140603",
+			text: "平鲁区"
+		}, {
+			value: "140621",
+			text: "山阴县"
+		}, {
+			value: "140622",
+			text: "应县"
+		}, {
+			value: "140623",
+			text: "右玉县"
+		}, {
+			value: "140624",
+			text: "怀仁县"
+		}, {
+			value: "140625",
+			text: "其它区"
+		}]
+	}, {
+		value: "140700",
+		text: "晋中市",
+		children: [{
+			value: "140702",
+			text: "榆次区"
+		}, {
+			value: "140721",
+			text: "榆社县"
+		}, {
+			value: "140722",
+			text: "左权县"
+		}, {
+			value: "140723",
+			text: "和顺县"
+		}, {
+			value: "140724",
+			text: "昔阳县"
+		}, {
+			value: "140725",
+			text: "寿阳县"
+		}, {
+			value: "140726",
+			text: "太谷县"
+		}, {
+			value: "140727",
+			text: "祁县"
+		}, {
+			value: "140728",
+			text: "平遥县"
+		}, {
+			value: "140729",
+			text: "灵石县"
+		}, {
+			value: "140781",
+			text: "介休市"
+		}, {
+			value: "140782",
+			text: "其它区"
+		}]
+	}, {
+		value: "140800",
+		text: "运城市",
+		children: [{
+			value: "140802",
+			text: "盐湖区"
+		}, {
+			value: "140821",
+			text: "临猗县"
+		}, {
+			value: "140822",
+			text: "万荣县"
+		}, {
+			value: "140823",
+			text: "闻喜县"
+		}, {
+			value: "140824",
+			text: "稷山县"
+		}, {
+			value: "140825",
+			text: "新绛县"
+		}, {
+			value: "140826",
+			text: "绛县"
+		}, {
+			value: "140827",
+			text: "垣曲县"
+		}, {
+			value: "140828",
+			text: "夏县"
+		}, {
+			value: "140829",
+			text: "平陆县"
+		}, {
+			value: "140830",
+			text: "芮城县"
+		}, {
+			value: "140881",
+			text: "永济市"
+		}, {
+			value: "140882",
+			text: "河津市"
+		}, {
+			value: "140883",
+			text: "其它区"
+		}]
+	}, {
+		value: "140900",
+		text: "忻州市",
+		children: [{
+			value: "140902",
+			text: "忻府区"
+		}, {
+			value: "140921",
+			text: "定襄县"
+		}, {
+			value: "140922",
+			text: "五台县"
+		}, {
+			value: "140923",
+			text: "代县"
+		}, {
+			value: "140924",
+			text: "繁峙县"
+		}, {
+			value: "140925",
+			text: "宁武县"
+		}, {
+			value: "140926",
+			text: "静乐县"
+		}, {
+			value: "140927",
+			text: "神池县"
+		}, {
+			value: "140928",
+			text: "五寨县"
+		}, {
+			value: "140929",
+			text: "岢岚县"
+		}, {
+			value: "140930",
+			text: "河曲县"
+		}, {
+			value: "140931",
+			text: "保德县"
+		}, {
+			value: "140932",
+			text: "偏关县"
+		}, {
+			value: "140981",
+			text: "原平市"
+		}, {
+			value: "140982",
+			text: "其它区"
+		}]
+	}, {
+		value: "141000",
+		text: "临汾市",
+		children: [{
+			value: "141002",
+			text: "尧都区"
+		}, {
+			value: "141021",
+			text: "曲沃县"
+		}, {
+			value: "141022",
+			text: "翼城县"
+		}, {
+			value: "141023",
+			text: "襄汾县"
+		}, {
+			value: "141024",
+			text: "洪洞县"
+		}, {
+			value: "141025",
+			text: "古县"
+		}, {
+			value: "141026",
+			text: "安泽县"
+		}, {
+			value: "141027",
+			text: "浮山县"
+		}, {
+			value: "141028",
+			text: "吉县"
+		}, {
+			value: "141029",
+			text: "乡宁县"
+		}, {
+			value: "141030",
+			text: "大宁县"
+		}, {
+			value: "141031",
+			text: "隰县"
+		}, {
+			value: "141032",
+			text: "永和县"
+		}, {
+			value: "141033",
+			text: "蒲县"
+		}, {
+			value: "141034",
+			text: "汾西县"
+		}, {
+			value: "141081",
+			text: "侯马市"
+		}, {
+			value: "141082",
+			text: "霍州市"
+		}, {
+			value: "141083",
+			text: "其它区"
+		}]
+	}, {
+		value: "141100",
+		text: "吕梁市",
+		children: [{
+			value: "141102",
+			text: "离石区"
+		}, {
+			value: "141121",
+			text: "文水县"
+		}, {
+			value: "141122",
+			text: "交城县"
+		}, {
+			value: "141123",
+			text: "兴县"
+		}, {
+			value: "141124",
+			text: "临县"
+		}, {
+			value: "141125",
+			text: "柳林县"
+		}, {
+			value: "141126",
+			text: "石楼县"
+		}, {
+			value: "141127",
+			text: "岚县"
+		}, {
+			value: "141128",
+			text: "方山县"
+		}, {
+			value: "141129",
+			text: "中阳县"
+		}, {
+			value: "141130",
+			text: "交口县"
+		}, {
+			value: "141181",
+			text: "孝义市"
+		}, {
+			value: "141182",
+			text: "汾阳市"
+		}, {
+			value: "141183",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '150000',
+	text: '内蒙古',
+	children: [{
+		value: "150100",
+		text: "呼和浩特市",
+		children: [{
+			value: "150102",
+			text: "新城区"
+		}, {
+			value: "150103",
+			text: "回民区"
+		}, {
+			value: "150104",
+			text: "玉泉区"
+		}, {
+			value: "150105",
+			text: "赛罕区"
+		}, {
+			value: "150121",
+			text: "土默特左旗"
+		}, {
+			value: "150122",
+			text: "托克托县"
+		}, {
+			value: "150123",
+			text: "和林格尔县"
+		}, {
+			value: "150124",
+			text: "清水河县"
+		}, {
+			value: "150125",
+			text: "武川县"
+		}, {
+			value: "150126",
+			text: "其它区"
+		}]
+	}, {
+		value: "150200",
+		text: "包头市",
+		children: [{
+			value: "150202",
+			text: "东河区"
+		}, {
+			value: "150203",
+			text: "昆都仑区"
+		}, {
+			value: "150204",
+			text: "青山区"
+		}, {
+			value: "150205",
+			text: "石拐区"
+		}, {
+			value: "150206",
+			text: "白云矿区"
+		}, {
+			value: "150207",
+			text: "九原区"
+		}, {
+			value: "150221",
+			text: "土默特右旗"
+		}, {
+			value: "150222",
+			text: "固阳县"
+		}, {
+			value: "150223",
+			text: "达尔罕茂明安联合旗"
+		}, {
+			value: "150224",
+			text: "其它区"
+		}]
+	}, {
+		value: "150300",
+		text: "乌海市",
+		children: [{
+			value: "150302",
+			text: "海勃湾区"
+		}, {
+			value: "150303",
+			text: "海南区"
+		}, {
+			value: "150304",
+			text: "乌达区"
+		}, {
+			value: "150305",
+			text: "其它区"
+		}]
+	}, {
+		value: "150400",
+		text: "赤峰市",
+		children: [{
+			value: "150402",
+			text: "红山区"
+		}, {
+			value: "150403",
+			text: "元宝山区"
+		}, {
+			value: "150404",
+			text: "松山区"
+		}, {
+			value: "150421",
+			text: "阿鲁科尔沁旗"
+		}, {
+			value: "150422",
+			text: "巴林左旗"
+		}, {
+			value: "150423",
+			text: "巴林右旗"
+		}, {
+			value: "150424",
+			text: "林西县"
+		}, {
+			value: "150425",
+			text: "克什克腾旗"
+		}, {
+			value: "150426",
+			text: "翁牛特旗"
+		}, {
+			value: "150428",
+			text: "喀喇沁旗"
+		}, {
+			value: "150429",
+			text: "宁城县"
+		}, {
+			value: "150430",
+			text: "敖汉旗"
+		}, {
+			value: "150431",
+			text: "其它区"
+		}]
+	}, {
+		value: "150500",
+		text: "通辽市",
+		children: [{
+			value: "150502",
+			text: "科尔沁区"
+		}, {
+			value: "150521",
+			text: "科尔沁左翼中旗"
+		}, {
+			value: "150522",
+			text: "科尔沁左翼后旗"
+		}, {
+			value: "150523",
+			text: "开鲁县"
+		}, {
+			value: "150524",
+			text: "库伦旗"
+		}, {
+			value: "150525",
+			text: "奈曼旗"
+		}, {
+			value: "150526",
+			text: "扎鲁特旗"
+		}, {
+			value: "150581",
+			text: "霍林郭勒市"
+		}, {
+			value: "150582",
+			text: "其它区"
+		}]
+	}, {
+		value: "150600",
+		text: "鄂尔多斯市",
+		children: [{
+			value: "150602",
+			text: "东胜区"
+		}, {
+			value: "150621",
+			text: "达拉特旗"
+		}, {
+			value: "150622",
+			text: "准格尔旗"
+		}, {
+			value: "150623",
+			text: "鄂托克前旗"
+		}, {
+			value: "150624",
+			text: "鄂托克旗"
+		}, {
+			value: "150625",
+			text: "杭锦旗"
+		}, {
+			value: "150626",
+			text: "乌审旗"
+		}, {
+			value: "150627",
+			text: "伊金霍洛旗"
+		}, {
+			value: "150628",
+			text: "其它区"
+		}]
+	}, {
+		value: "150700",
+		text: "呼伦贝尔市",
+		children: [{
+			value: "150702",
+			text: "海拉尔区"
+		}, {
+			value: "150721",
+			text: "阿荣旗"
+		}, {
+			value: "150722",
+			text: "莫力达瓦达斡尔族自治旗"
+		}, {
+			value: "150723",
+			text: "鄂伦春自治旗"
+		}, {
+			value: "150724",
+			text: "鄂温克族自治旗"
+		}, {
+			value: "150725",
+			text: "陈巴尔虎旗"
+		}, {
+			value: "150726",
+			text: "新巴尔虎左旗"
+		}, {
+			value: "150727",
+			text: "新巴尔虎右旗"
+		}, {
+			value: "150781",
+			text: "满洲里市"
+		}, {
+			value: "150782",
+			text: "牙克石市"
+		}, {
+			value: "150783",
+			text: "扎兰屯市"
+		}, {
+			value: "150784",
+			text: "额尔古纳市"
+		}, {
+			value: "150785",
+			text: "根河市"
+		}, {
+			value: "150786",
+			text: "其它区"
+		}]
+	}, {
+		value: "150800",
+		text: "巴彦淖尔市",
+		children: [{
+			value: "150802",
+			text: "临河区"
+		}, {
+			value: "150821",
+			text: "五原县"
+		}, {
+			value: "150822",
+			text: "磴口县"
+		}, {
+			value: "150823",
+			text: "乌拉特前旗"
+		}, {
+			value: "150824",
+			text: "乌拉特中旗"
+		}, {
+			value: "150825",
+			text: "乌拉特后旗"
+		}, {
+			value: "150826",
+			text: "杭锦后旗"
+		}, {
+			value: "150827",
+			text: "其它区"
+		}]
+	}, {
+		value: "150900",
+		text: "乌兰察布市",
+		children: [{
+			value: "150902",
+			text: "集宁区"
+		}, {
+			value: "150921",
+			text: "卓资县"
+		}, {
+			value: "150922",
+			text: "化德县"
+		}, {
+			value: "150923",
+			text: "商都县"
+		}, {
+			value: "150924",
+			text: "兴和县"
+		}, {
+			value: "150925",
+			text: "凉城县"
+		}, {
+			value: "150926",
+			text: "察哈尔右翼前旗"
+		}, {
+			value: "150927",
+			text: "察哈尔右翼中旗"
+		}, {
+			value: "150928",
+			text: "察哈尔右翼后旗"
+		}, {
+			value: "150929",
+			text: "四子王旗"
+		}, {
+			value: "150981",
+			text: "丰镇市"
+		}, {
+			value: "150982",
+			text: "其它区"
+		}]
+	}, {
+		value: "152200",
+		text: "兴安盟",
+		children: [{
+			value: "152201",
+			text: "乌兰浩特市"
+		}, {
+			value: "152202",
+			text: "阿尔山市"
+		}, {
+			value: "152221",
+			text: "科尔沁右翼前旗"
+		}, {
+			value: "152222",
+			text: "科尔沁右翼中旗"
+		}, {
+			value: "152223",
+			text: "扎赉特旗"
+		}, {
+			value: "152224",
+			text: "突泉县"
+		}, {
+			value: "152225",
+			text: "其它区"
+		}]
+	}, {
+		value: "152500",
+		text: "锡林郭勒盟",
+		children: [{
+			value: "152501",
+			text: "二连浩特市"
+		}, {
+			value: "152502",
+			text: "锡林浩特市"
+		}, {
+			value: "152522",
+			text: "阿巴嘎旗"
+		}, {
+			value: "152523",
+			text: "苏尼特左旗"
+		}, {
+			value: "152524",
+			text: "苏尼特右旗"
+		}, {
+			value: "152525",
+			text: "东乌珠穆沁旗"
+		}, {
+			value: "152526",
+			text: "西乌珠穆沁旗"
+		}, {
+			value: "152527",
+			text: "太仆寺旗"
+		}, {
+			value: "152528",
+			text: "镶黄旗"
+		}, {
+			value: "152529",
+			text: "正镶白旗"
+		}, {
+			value: "152530",
+			text: "正蓝旗"
+		}, {
+			value: "152531",
+			text: "多伦县"
+		}, {
+			value: "152532",
+			text: "其它区"
+		}]
+	}, {
+		value: "152900",
+		text: "阿拉善盟",
+		children: [{
+			value: "152921",
+			text: "阿拉善左旗"
+		}, {
+			value: "152922",
+			text: "阿拉善右旗"
+		}, {
+			value: "152923",
+			text: "额济纳旗"
+		}, {
+			value: "152924",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '210000',
+	text: '辽宁省',
+	children: [{
+		value: "210100",
+		text: "沈阳市",
+		children: [{
+			value: "210102",
+			text: "和平区"
+		}, {
+			value: "210103",
+			text: "沈河区"
+		}, {
+			value: "210104",
+			text: "大东区"
+		}, {
+			value: "210105",
+			text: "皇姑区"
+		}, {
+			value: "210106",
+			text: "铁西区"
+		}, {
+			value: "210111",
+			text: "苏家屯区"
+		}, {
+			value: "210112",
+			text: "东陵区"
+		}, {
+			value: "210113",
+			text: "新城子区"
+		}, {
+			value: "210114",
+			text: "于洪区"
+		}, {
+			value: "210122",
+			text: "辽中县"
+		}, {
+			value: "210123",
+			text: "康平县"
+		}, {
+			value: "210124",
+			text: "法库县"
+		}, {
+			value: "210181",
+			text: "新民市"
+		}, {
+			value: "210182",
+			text: "浑南新区"
+		}, {
+			value: "210183",
+			text: "张士开发区"
+		}, {
+			value: "210184",
+			text: "沈北新区"
+		}, {
+			value: "210185",
+			text: "其它区"
+		}]
+	}, {
+		value: "210200",
+		text: "大连市",
+		children: [{
+			value: "210202",
+			text: "中山区"
+		}, {
+			value: "210203",
+			text: "西岗区"
+		}, {
+			value: "210204",
+			text: "沙河口区"
+		}, {
+			value: "210211",
+			text: "甘井子区"
+		}, {
+			value: "210212",
+			text: "旅顺口区"
+		}, {
+			value: "210213",
+			text: "金州区"
+		}, {
+			value: "210224",
+			text: "长海县"
+		}, {
+			value: "210251",
+			text: "开发区"
+		}, {
+			value: "210281",
+			text: "瓦房店市"
+		}, {
+			value: "210282",
+			text: "普兰店市"
+		}, {
+			value: "210283",
+			text: "庄河市"
+		}, {
+			value: "210297",
+			text: "岭前区"
+		}, {
+			value: "210298",
+			text: "其它区"
+		}]
+	}, {
+		value: "210300",
+		text: "鞍山市",
+		children: [{
+			value: "210302",
+			text: "铁东区"
+		}, {
+			value: "210303",
+			text: "铁西区"
+		}, {
+			value: "210304",
+			text: "立山区"
+		}, {
+			value: "210311",
+			text: "千山区"
+		}, {
+			value: "210321",
+			text: "台安县"
+		}, {
+			value: "210323",
+			text: "岫岩满族自治县"
+		}, {
+			value: "210351",
+			text: "高新区"
+		}, {
+			value: "210381",
+			text: "海城市"
+		}, {
+			value: "210382",
+			text: "其它区"
+		}]
+	}, {
+		value: "210400",
+		text: "抚顺市",
+		children: [{
+			value: "210402",
+			text: "新抚区"
+		}, {
+			value: "210403",
+			text: "东洲区"
+		}, {
+			value: "210404",
+			text: "望花区"
+		}, {
+			value: "210411",
+			text: "顺城区"
+		}, {
+			value: "210421",
+			text: "抚顺县"
+		}, {
+			value: "210422",
+			text: "新宾满族自治县"
+		}, {
+			value: "210423",
+			text: "清原满族自治县"
+		}, {
+			value: "210424",
+			text: "其它区"
+		}]
+	}, {
+		value: "210500",
+		text: "本溪市",
+		children: [{
+			value: "210502",
+			text: "平山区"
+		}, {
+			value: "210503",
+			text: "溪湖区"
+		}, {
+			value: "210504",
+			text: "明山区"
+		}, {
+			value: "210505",
+			text: "南芬区"
+		}, {
+			value: "210521",
+			text: "本溪满族自治县"
+		}, {
+			value: "210522",
+			text: "桓仁满族自治县"
+		}, {
+			value: "210523",
+			text: "其它区"
+		}]
+	}, {
+		value: "210600",
+		text: "丹东市",
+		children: [{
+			value: "210602",
+			text: "元宝区"
+		}, {
+			value: "210603",
+			text: "振兴区"
+		}, {
+			value: "210604",
+			text: "振安区"
+		}, {
+			value: "210624",
+			text: "宽甸满族自治县"
+		}, {
+			value: "210681",
+			text: "东港市"
+		}, {
+			value: "210682",
+			text: "凤城市"
+		}, {
+			value: "210683",
+			text: "其它区"
+		}]
+	}, {
+		value: "210700",
+		text: "锦州市",
+		children: [{
+			value: "210702",
+			text: "古塔区"
+		}, {
+			value: "210703",
+			text: "凌河区"
+		}, {
+			value: "210711",
+			text: "太和区"
+		}, {
+			value: "210726",
+			text: "黑山县"
+		}, {
+			value: "210727",
+			text: "义县"
+		}, {
+			value: "210781",
+			text: "凌海市"
+		}, {
+			value: "210782",
+			text: "北镇市"
+		}, {
+			value: "210783",
+			text: "其它区"
+		}]
+	}, {
+		value: "210800",
+		text: "营口市",
+		children: [{
+			value: "210802",
+			text: "站前区"
+		}, {
+			value: "210803",
+			text: "西市区"
+		}, {
+			value: "210804",
+			text: "鲅鱼圈区"
+		}, {
+			value: "210811",
+			text: "老边区"
+		}, {
+			value: "210881",
+			text: "盖州市"
+		}, {
+			value: "210882",
+			text: "大石桥市"
+		}, {
+			value: "210883",
+			text: "其它区"
+		}]
+	}, {
+		value: "210900",
+		text: "阜新市",
+		children: [{
+			value: "210902",
+			text: "海州区"
+		}, {
+			value: "210903",
+			text: "新邱区"
+		}, {
+			value: "210904",
+			text: "太平区"
+		}, {
+			value: "210905",
+			text: "清河门区"
+		}, {
+			value: "210911",
+			text: "细河区"
+		}, {
+			value: "210921",
+			text: "阜新蒙古族自治县"
+		}, {
+			value: "210922",
+			text: "彰武县"
+		}, {
+			value: "210923",
+			text: "其它区"
+		}]
+	}, {
+		value: "211000",
+		text: "辽阳市",
+		children: [{
+			value: "211002",
+			text: "白塔区"
+		}, {
+			value: "211003",
+			text: "文圣区"
+		}, {
+			value: "211004",
+			text: "宏伟区"
+		}, {
+			value: "211005",
+			text: "弓长岭区"
+		}, {
+			value: "211011",
+			text: "太子河区"
+		}, {
+			value: "211021",
+			text: "辽阳县"
+		}, {
+			value: "211081",
+			text: "灯塔市"
+		}, {
+			value: "211082",
+			text: "其它区"
+		}]
+	}, {
+		value: "211100",
+		text: "盘锦市",
+		children: [{
+			value: "211102",
+			text: "双台子区"
+		}, {
+			value: "211103",
+			text: "兴隆台区"
+		}, {
+			value: "211121",
+			text: "大洼县"
+		}, {
+			value: "211122",
+			text: "盘山县"
+		}, {
+			value: "211123",
+			text: "其它区"
+		}]
+	}, {
+		value: "211200",
+		text: "铁岭市",
+		children: [{
+			value: "211202",
+			text: "银州区"
+		}, {
+			value: "211204",
+			text: "清河区"
+		}, {
+			value: "211221",
+			text: "铁岭县"
+		}, {
+			value: "211223",
+			text: "西丰县"
+		}, {
+			value: "211224",
+			text: "昌图县"
+		}, {
+			value: "211281",
+			text: "调兵山市"
+		}, {
+			value: "211282",
+			text: "开原市"
+		}, {
+			value: "211283",
+			text: "其它区"
+		}]
+	}, {
+		value: "211300",
+		text: "朝阳市",
+		children: [{
+			value: "211302",
+			text: "双塔区"
+		}, {
+			value: "211303",
+			text: "龙城区"
+		}, {
+			value: "211321",
+			text: "朝阳县"
+		}, {
+			value: "211322",
+			text: "建平县"
+		}, {
+			value: "211324",
+			text: "喀喇沁左翼蒙古族自治县"
+		}, {
+			value: "211381",
+			text: "北票市"
+		}, {
+			value: "211382",
+			text: "凌源市"
+		}, {
+			value: "211383",
+			text: "其它区"
+		}]
+	}, {
+		value: "211400",
+		text: "葫芦岛市",
+		children: [{
+			value: "211402",
+			text: "连山区"
+		}, {
+			value: "211403",
+			text: "龙港区"
+		}, {
+			value: "211404",
+			text: "南票区"
+		}, {
+			value: "211421",
+			text: "绥中县"
+		}, {
+			value: "211422",
+			text: "建昌县"
+		}, {
+			value: "211481",
+			text: "兴城市"
+		}, {
+			value: "211482",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '220000',
+	text: '吉林省',
+	children: [{
+		value: "220100",
+		text: "长春市",
+		children: [{
+			value: "220102",
+			text: "南关区"
+		}, {
+			value: "220103",
+			text: "宽城区"
+		}, {
+			value: "220104",
+			text: "朝阳区"
+		}, {
+			value: "220105",
+			text: "二道区"
+		}, {
+			value: "220106",
+			text: "绿园区"
+		}, {
+			value: "220112",
+			text: "双阳区"
+		}, {
+			value: "220122",
+			text: "农安县"
+		}, {
+			value: "220181",
+			text: "九台市"
+		}, {
+			value: "220182",
+			text: "榆树市"
+		}, {
+			value: "220183",
+			text: "德惠市"
+		}, {
+			value: "220184",
+			text: "高新技术产业开发区"
+		}, {
+			value: "220185",
+			text: "汽车产业开发区"
+		}, {
+			value: "220186",
+			text: "经济技术开发区"
+		}, {
+			value: "220187",
+			text: "净月旅游开发区"
+		}, {
+			value: "220188",
+			text: "其它区"
+		}]
+	}, {
+		value: "220200",
+		text: "吉林市",
+		children: [{
+			value: "220202",
+			text: "昌邑区"
+		}, {
+			value: "220203",
+			text: "龙潭区"
+		}, {
+			value: "220204",
+			text: "船营区"
+		}, {
+			value: "220211",
+			text: "丰满区"
+		}, {
+			value: "220221",
+			text: "永吉县"
+		}, {
+			value: "220281",
+			text: "蛟河市"
+		}, {
+			value: "220282",
+			text: "桦甸市"
+		}, {
+			value: "220283",
+			text: "舒兰市"
+		}, {
+			value: "220284",
+			text: "磐石市"
+		}, {
+			value: "220285",
+			text: "其它区"
+		}]
+	}, {
+		value: "220300",
+		text: "四平市",
+		children: [{
+			value: "220302",
+			text: "铁西区"
+		}, {
+			value: "220303",
+			text: "铁东区"
+		}, {
+			value: "220322",
+			text: "梨树县"
+		}, {
+			value: "220323",
+			text: "伊通满族自治县"
+		}, {
+			value: "220381",
+			text: "公主岭市"
+		}, {
+			value: "220382",
+			text: "双辽市"
+		}, {
+			value: "220383",
+			text: "其它区"
+		}]
+	}, {
+		value: "220400",
+		text: "辽源市",
+		children: [{
+			value: "220402",
+			text: "龙山区"
+		}, {
+			value: "220403",
+			text: "西安区"
+		}, {
+			value: "220421",
+			text: "东丰县"
+		}, {
+			value: "220422",
+			text: "东辽县"
+		}, {
+			value: "220423",
+			text: "其它区"
+		}]
+	}, {
+		value: "220500",
+		text: "通化市",
+		children: [{
+			value: "220502",
+			text: "东昌区"
+		}, {
+			value: "220503",
+			text: "二道江区"
+		}, {
+			value: "220521",
+			text: "通化县"
+		}, {
+			value: "220523",
+			text: "辉南县"
+		}, {
+			value: "220524",
+			text: "柳河县"
+		}, {
+			value: "220581",
+			text: "梅河口市"
+		}, {
+			value: "220582",
+			text: "集安市"
+		}, {
+			value: "220583",
+			text: "其它区"
+		}]
+	}, {
+		value: "220600",
+		text: "白山市",
+		children: [{
+			value: "220602",
+			text: "八道江区"
+		}, {
+			value: "220621",
+			text: "抚松县"
+		}, {
+			value: "220622",
+			text: "靖宇县"
+		}, {
+			value: "220623",
+			text: "长白朝鲜族自治县"
+		}, {
+			value: "220625",
+			text: "江源市"
+		}, {
+			value: "220681",
+			text: "临江市"
+		}, {
+			value: "220682",
+			text: "其它区"
+		}]
+	}, {
+		value: "220700",
+		text: "松原市",
+		children: [{
+			value: "220702",
+			text: "宁江区"
+		}, {
+			value: "220721",
+			text: "前郭尔罗斯蒙古族自治县"
+		}, {
+			value: "220722",
+			text: "长岭县"
+		}, {
+			value: "220723",
+			text: "乾安县"
+		}, {
+			value: "220724",
+			text: "扶余县"
+		}, {
+			value: "220725",
+			text: "其它区"
+		}]
+	}, {
+		value: "220800",
+		text: "白城市",
+		children: [{
+			value: "220802",
+			text: "洮北区"
+		}, {
+			value: "220821",
+			text: "镇赉县"
+		}, {
+			value: "220822",
+			text: "通榆县"
+		}, {
+			value: "220881",
+			text: "洮南市"
+		}, {
+			value: "220882",
+			text: "大安市"
+		}, {
+			value: "220883",
+			text: "其它区"
+		}]
+	}, {
+		value: "222400",
+		text: "延边朝鲜族自治州",
+		children: [{
+			value: "222401",
+			text: "延吉市"
+		}, {
+			value: "222402",
+			text: "图们市"
+		}, {
+			value: "222403",
+			text: "敦化市"
+		}, {
+			value: "222404",
+			text: "珲春市"
+		}, {
+			value: "222405",
+			text: "龙井市"
+		}, {
+			value: "222406",
+			text: "和龙市"
+		}, {
+			value: "222424",
+			text: "汪清县"
+		}, {
+			value: "222426",
+			text: "安图县"
+		}, {
+			value: "222427",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '230000',
+	text: '黑龙江省',
+	children: [{
+		value: "230100",
+		text: "哈尔滨市",
+		children: [{
+			value: "230102",
+			text: "道里区"
+		}, {
+			value: "230103",
+			text: "南岗区"
+		}, {
+			value: "230104",
+			text: "道外区"
+		}, {
+			value: "230106",
+			text: "香坊区"
+		}, {
+			value: "230107",
+			text: "动力区"
+		}, {
+			value: "230108",
+			text: "平房区"
+		}, {
+			value: "230109",
+			text: "松北区"
+		}, {
+			value: "230111",
+			text: "呼兰区"
+		}, {
+			value: "230123",
+			text: "依兰县"
+		}, {
+			value: "230124",
+			text: "方正县"
+		}, {
+			value: "230125",
+			text: "宾县"
+		}, {
+			value: "230126",
+			text: "巴彦县"
+		}, {
+			value: "230127",
+			text: "木兰县"
+		}, {
+			value: "230128",
+			text: "通河县"
+		}, {
+			value: "230129",
+			text: "延寿县"
+		}, {
+			value: "230181",
+			text: "阿城市"
+		}, {
+			value: "230182",
+			text: "双城市"
+		}, {
+			value: "230183",
+			text: "尚志市"
+		}, {
+			value: "230184",
+			text: "五常市"
+		}, {
+			value: "230185",
+			text: "阿城市"
+		}, {
+			value: "230186",
+			text: "其它区"
+		}]
+	}, {
+		value: "230200",
+		text: "齐齐哈尔市",
+		children: [{
+			value: "230202",
+			text: "龙沙区"
+		}, {
+			value: "230203",
+			text: "建华区"
+		}, {
+			value: "230204",
+			text: "铁锋区"
+		}, {
+			value: "230205",
+			text: "昂昂溪区"
+		}, {
+			value: "230206",
+			text: "富拉尔基区"
+		}, {
+			value: "230207",
+			text: "碾子山区"
+		}, {
+			value: "230208",
+			text: "梅里斯达斡尔族区"
+		}, {
+			value: "230221",
+			text: "龙江县"
+		}, {
+			value: "230223",
+			text: "依安县"
+		}, {
+			value: "230224",
+			text: "泰来县"
+		}, {
+			value: "230225",
+			text: "甘南县"
+		}, {
+			value: "230227",
+			text: "富裕县"
+		}, {
+			value: "230229",
+			text: "克山县"
+		}, {
+			value: "230230",
+			text: "克东县"
+		}, {
+			value: "230231",
+			text: "拜泉县"
+		}, {
+			value: "230281",
+			text: "讷河市"
+		}, {
+			value: "230282",
+			text: "其它区"
+		}]
+	}, {
+		value: "230300",
+		text: "鸡西市",
+		children: [{
+			value: "230302",
+			text: "鸡冠区"
+		}, {
+			value: "230303",
+			text: "恒山区"
+		}, {
+			value: "230304",
+			text: "滴道区"
+		}, {
+			value: "230305",
+			text: "梨树区"
+		}, {
+			value: "230306",
+			text: "城子河区"
+		}, {
+			value: "230307",
+			text: "麻山区"
+		}, {
+			value: "230321",
+			text: "鸡东县"
+		}, {
+			value: "230381",
+			text: "虎林市"
+		}, {
+			value: "230382",
+			text: "密山市"
+		}, {
+			value: "230383",
+			text: "其它区"
+		}]
+	}, {
+		value: "230400",
+		text: "鹤岗市",
+		children: [{
+			value: "230402",
+			text: "向阳区"
+		}, {
+			value: "230403",
+			text: "工农区"
+		}, {
+			value: "230404",
+			text: "南山区"
+		}, {
+			value: "230405",
+			text: "兴安区"
+		}, {
+			value: "230406",
+			text: "东山区"
+		}, {
+			value: "230407",
+			text: "兴山区"
+		}, {
+			value: "230421",
+			text: "萝北县"
+		}, {
+			value: "230422",
+			text: "绥滨县"
+		}, {
+			value: "230423",
+			text: "其它区"
+		}]
+	}, {
+		value: "230500",
+		text: "双鸭山市",
+		children: [{
+			value: "230502",
+			text: "尖山区"
+		}, {
+			value: "230503",
+			text: "岭东区"
+		}, {
+			value: "230505",
+			text: "四方台区"
+		}, {
+			value: "230506",
+			text: "宝山区"
+		}, {
+			value: "230521",
+			text: "集贤县"
+		}, {
+			value: "230522",
+			text: "友谊县"
+		}, {
+			value: "230523",
+			text: "宝清县"
+		}, {
+			value: "230524",
+			text: "饶河县"
+		}, {
+			value: "230525",
+			text: "其它区"
+		}]
+	}, {
+		value: "230600",
+		text: "大庆市",
+		children: [{
+			value: "230602",
+			text: "萨尔图区"
+		}, {
+			value: "230603",
+			text: "龙凤区"
+		}, {
+			value: "230604",
+			text: "让胡路区"
+		}, {
+			value: "230605",
+			text: "红岗区"
+		}, {
+			value: "230606",
+			text: "大同区"
+		}, {
+			value: "230621",
+			text: "肇州县"
+		}, {
+			value: "230622",
+			text: "肇源县"
+		}, {
+			value: "230623",
+			text: "林甸县"
+		}, {
+			value: "230624",
+			text: "杜尔伯特蒙古族自治县"
+		}, {
+			value: "230625",
+			text: "其它区"
+		}]
+	}, {
+		value: "230700",
+		text: "伊春市",
+		children: [{
+			value: "230702",
+			text: "伊春区"
+		}, {
+			value: "230703",
+			text: "南岔区"
+		}, {
+			value: "230704",
+			text: "友好区"
+		}, {
+			value: "230705",
+			text: "西林区"
+		}, {
+			value: "230706",
+			text: "翠峦区"
+		}, {
+			value: "230707",
+			text: "新青区"
+		}, {
+			value: "230708",
+			text: "美溪区"
+		}, {
+			value: "230709",
+			text: "金山屯区"
+		}, {
+			value: "230710",
+			text: "五营区"
+		}, {
+			value: "230711",
+			text: "乌马河区"
+		}, {
+			value: "230712",
+			text: "汤旺河区"
+		}, {
+			value: "230713",
+			text: "带岭区"
+		}, {
+			value: "230714",
+			text: "乌伊岭区"
+		}, {
+			value: "230715",
+			text: "红星区"
+		}, {
+			value: "230716",
+			text: "上甘岭区"
+		}, {
+			value: "230722",
+			text: "嘉荫县"
+		}, {
+			value: "230781",
+			text: "铁力市"
+		}, {
+			value: "230782",
+			text: "其它区"
+		}]
+	}, {
+		value: "230800",
+		text: "佳木斯市",
+		children: [{
+			value: "230802",
+			text: "永红区"
+		}, {
+			value: "230803",
+			text: "向阳区"
+		}, {
+			value: "230804",
+			text: "前进区"
+		}, {
+			value: "230805",
+			text: "东风区"
+		}, {
+			value: "230811",
+			text: "郊区"
+		}, {
+			value: "230822",
+			text: "桦南县"
+		}, {
+			value: "230826",
+			text: "桦川县"
+		}, {
+			value: "230828",
+			text: "汤原县"
+		}, {
+			value: "230833",
+			text: "抚远县"
+		}, {
+			value: "230881",
+			text: "同江市"
+		}, {
+			value: "230882",
+			text: "富锦市"
+		}, {
+			value: "230883",
+			text: "其它区"
+		}]
+	}, {
+		value: "230900",
+		text: "七台河市",
+		children: [{
+			value: "230902",
+			text: "新兴区"
+		}, {
+			value: "230903",
+			text: "桃山区"
+		}, {
+			value: "230904",
+			text: "茄子河区"
+		}, {
+			value: "230921",
+			text: "勃利县"
+		}, {
+			value: "230922",
+			text: "其它区"
+		}]
+	}, {
+		value: "231000",
+		text: "牡丹江市",
+		children: [{
+			value: "231002",
+			text: "东安区"
+		}, {
+			value: "231003",
+			text: "阳明区"
+		}, {
+			value: "231004",
+			text: "爱民区"
+		}, {
+			value: "231005",
+			text: "西安区"
+		}, {
+			value: "231024",
+			text: "东宁县"
+		}, {
+			value: "231025",
+			text: "林口县"
+		}, {
+			value: "231081",
+			text: "绥芬河市"
+		}, {
+			value: "231083",
+			text: "海林市"
+		}, {
+			value: "231084",
+			text: "宁安市"
+		}, {
+			value: "231085",
+			text: "穆棱市"
+		}, {
+			value: "231086",
+			text: "其它区"
+		}]
+	}, {
+		value: "231100",
+		text: "黑河市",
+		children: [{
+			value: "231102",
+			text: "爱辉区"
+		}, {
+			value: "231121",
+			text: "嫩江县"
+		}, {
+			value: "231123",
+			text: "逊克县"
+		}, {
+			value: "231124",
+			text: "孙吴县"
+		}, {
+			value: "231181",
+			text: "北安市"
+		}, {
+			value: "231182",
+			text: "五大连池市"
+		}, {
+			value: "231183",
+			text: "其它区"
+		}]
+	}, {
+		value: "231200",
+		text: "绥化市",
+		children: [{
+			value: "231202",
+			text: "北林区"
+		}, {
+			value: "231221",
+			text: "望奎县"
+		}, {
+			value: "231222",
+			text: "兰西县"
+		}, {
+			value: "231223",
+			text: "青冈县"
+		}, {
+			value: "231224",
+			text: "庆安县"
+		}, {
+			value: "231225",
+			text: "明水县"
+		}, {
+			value: "231226",
+			text: "绥棱县"
+		}, {
+			value: "231281",
+			text: "安达市"
+		}, {
+			value: "231282",
+			text: "肇东市"
+		}, {
+			value: "231283",
+			text: "海伦市"
+		}, {
+			value: "231284",
+			text: "其它区"
+		}]
+	}, {
+		value: "232700",
+		text: "大兴安岭地区",
+		children: [{
+			value: "232721",
+			text: "呼玛县"
+		}, {
+			value: "232722",
+			text: "塔河县"
+		}, {
+			value: "232723",
+			text: "漠河县"
+		}, {
+			value: "232724",
+			text: "加格达奇区"
+		}, {
+			value: "232725",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '310000',
+	text: '上海市',
+	children: [{
+		value: '310100',
+		text: '上海市',
+		children: [{
+			value: "310101",
+			text: "黄浦区"
+		}, {
+			value: "310103",
+			text: "卢湾区"
+		}, {
+			value: "310104",
+			text: "徐汇区"
+		}, {
+			value: "310105",
+			text: "长宁区"
+		}, {
+			value: "310106",
+			text: "静安区"
+		}, {
+			value: "310107",
+			text: "普陀区"
+		}, {
+			value: "310108",
+			text: "闸北区"
+		}, {
+			value: "310109",
+			text: "虹口区"
+		}, {
+			value: "310110",
+			text: "杨浦区"
+		}, {
+			value: "310112",
+			text: "闵行区"
+		}, {
+			value: "310113",
+			text: "宝山区"
+		}, {
+			value: "310114",
+			text: "嘉定区"
+		}, {
+			value: "310115",
+			text: "浦东新区"
+		}, {
+			value: "310116",
+			text: "金山区"
+		}, {
+			value: "310117",
+			text: "松江区"
+		}, {
+			value: "310118",
+			text: "青浦区"
+		}, {
+			value: "310119",
+			text: "南汇区"
+		}, {
+			value: "310120",
+			text: "奉贤区"
+		}, {
+			value: "310152",
+			text: "川沙区"
+		}, {
+			value: "310230",
+			text: "崇明县"
+		}, {
+			value: "310231",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '320000',
+	text: '江苏省',
+	children: [{
+		value: "320100",
+		text: "南京市",
+		children: [{
+			value: "320102",
+			text: "玄武区"
+		}, {
+			value: "320103",
+			text: "白下区"
+		}, {
+			value: "320104",
+			text: "秦淮区"
+		}, {
+			value: "320105",
+			text: "建邺区"
+		}, {
+			value: "320106",
+			text: "鼓楼区"
+		}, {
+			value: "320107",
+			text: "下关区"
+		}, {
+			value: "320111",
+			text: "浦口区"
+		}, {
+			value: "320113",
+			text: "栖霞区"
+		}, {
+			value: "320114",
+			text: "雨花台区"
+		}, {
+			value: "320115",
+			text: "江宁区"
+		}, {
+			value: "320116",
+			text: "六合区"
+		}, {
+			value: "320124",
+			text: "溧水县"
+		}, {
+			value: "320125",
+			text: "高淳县"
+		}, {
+			value: "320126",
+			text: "其它区"
+		}]
+	}, {
+		value: "320200",
+		text: "无锡市",
+		children: [{
+			value: "320202",
+			text: "崇安区"
+		}, {
+			value: "320203",
+			text: "南长区"
+		}, {
+			value: "320204",
+			text: "北塘区"
+		}, {
+			value: "320205",
+			text: "锡山区"
+		}, {
+			value: "320206",
+			text: "惠山区"
+		}, {
+			value: "320211",
+			text: "滨湖区"
+		}, {
+			value: "320281",
+			text: "江阴市"
+		}, {
+			value: "320282",
+			text: "宜兴市"
+		}, {
+			value: "320296",
+			text: "新区"
+		}, {
+			value: "320297",
+			text: "其它区"
+		}]
+	}, {
+		value: "320300",
+		text: "徐州市",
+		children: [{
+			value: "320302",
+			text: "鼓楼区"
+		}, {
+			value: "320303",
+			text: "云龙区"
+		}, {
+			value: "320304",
+			text: "九里区"
+		}, {
+			value: "320305",
+			text: "贾汪区"
+		}, {
+			value: "320311",
+			text: "泉山区"
+		}, {
+			value: "320321",
+			text: "丰县"
+		}, {
+			value: "320322",
+			text: "沛县"
+		}, {
+			value: "320323",
+			text: "铜山县"
+		}, {
+			value: "320324",
+			text: "睢宁县"
+		}, {
+			value: "320381",
+			text: "新沂市"
+		}, {
+			value: "320382",
+			text: "邳州市"
+		}, {
+			value: "320383",
+			text: "其它区"
+		}]
+	}, {
+		value: "320400",
+		text: "常州市",
+		children: [{
+			value: "320402",
+			text: "天宁区"
+		}, {
+			value: "320404",
+			text: "钟楼区"
+		}, {
+			value: "320405",
+			text: "戚墅堰区"
+		}, {
+			value: "320411",
+			text: "新北区"
+		}, {
+			value: "320412",
+			text: "武进区"
+		}, {
+			value: "320481",
+			text: "溧阳市"
+		}, {
+			value: "320482",
+			text: "金坛市"
+		}, {
+			value: "320483",
+			text: "其它区"
+		}]
+	}, {
+		value: "320500",
+		text: "苏州市",
+		children: [{
+			value: "320502",
+			text: "沧浪区"
+		}, {
+			value: "320503",
+			text: "平江区"
+		}, {
+			value: "320504",
+			text: "金阊区"
+		}, {
+			value: "320505",
+			text: "虎丘区"
+		}, {
+			value: "320506",
+			text: "吴中区"
+		}, {
+			value: "320507",
+			text: "相城区"
+		}, {
+			value: "320581",
+			text: "常熟市"
+		}, {
+			value: "320582",
+			text: "张家港市"
+		}, {
+			value: "320583",
+			text: "昆山市"
+		}, {
+			value: "320584",
+			text: "吴江市"
+		}, {
+			value: "320585",
+			text: "太仓市"
+		}, {
+			value: "320594",
+			text: "新区"
+		}, {
+			value: "320595",
+			text: "园区"
+		}, {
+			value: "320596",
+			text: "其它区"
+		}]
+	}, {
+		value: "320600",
+		text: "南通市",
+		children: [{
+			value: "320602",
+			text: "崇川区"
+		}, {
+			value: "320611",
+			text: "港闸区"
+		}, {
+			value: "320612",
+			text: "通州区"
+		}, {
+			value: "320621",
+			text: "海安县"
+		}, {
+			value: "320623",
+			text: "如东县"
+		}, {
+			value: "320681",
+			text: "启东市"
+		}, {
+			value: "320682",
+			text: "如皋市"
+		}, {
+			value: "320683",
+			text: "通州市"
+		}, {
+			value: "320684",
+			text: "海门市"
+		}, {
+			value: "320693",
+			text: "开发区"
+		}, {
+			value: "320694",
+			text: "其它区"
+		}]
+	}, {
+		value: "320700",
+		text: "连云港市",
+		children: [{
+			value: "320703",
+			text: "连云区"
+		}, {
+			value: "320705",
+			text: "新浦区"
+		}, {
+			value: "320706",
+			text: "海州区"
+		}, {
+			value: "320721",
+			text: "赣榆县"
+		}, {
+			value: "320722",
+			text: "东海县"
+		}, {
+			value: "320723",
+			text: "灌云县"
+		}, {
+			value: "320724",
+			text: "灌南县"
+		}, {
+			value: "320725",
+			text: "其它区"
+		}]
+	}, {
+		value: "320800",
+		text: "淮安市",
+		children: [{
+			value: "320802",
+			text: "清河区"
+		}, {
+			value: "320803",
+			text: "楚州区"
+		}, {
+			value: "320804",
+			text: "淮阴区"
+		}, {
+			value: "320811",
+			text: "清浦区"
+		}, {
+			value: "320826",
+			text: "涟水县"
+		}, {
+			value: "320829",
+			text: "洪泽县"
+		}, {
+			value: "320830",
+			text: "盱眙县"
+		}, {
+			value: "320831",
+			text: "金湖县"
+		}, {
+			value: "320832",
+			text: "其它区"
+		}]
+	}, {
+		value: "320900",
+		text: "盐城市",
+		children: [{
+			value: "320902",
+			text: "亭湖区"
+		}, {
+			value: "320903",
+			text: "盐都区"
+		}, {
+			value: "320921",
+			text: "响水县"
+		}, {
+			value: "320922",
+			text: "滨海县"
+		}, {
+			value: "320923",
+			text: "阜宁县"
+		}, {
+			value: "320924",
+			text: "射阳县"
+		}, {
+			value: "320925",
+			text: "建湖县"
+		}, {
+			value: "320981",
+			text: "东台市"
+		}, {
+			value: "320982",
+			text: "大丰市"
+		}, {
+			value: "320983",
+			text: "其它区"
+		}]
+	}, {
+		value: "321000",
+		text: "扬州市",
+		children: [{
+			value: "321002",
+			text: "广陵区"
+		}, {
+			value: "321003",
+			text: "邗江区"
+		}, {
+			value: "321011",
+			text: "维扬区"
+		}, {
+			value: "321023",
+			text: "宝应县"
+		}, {
+			value: "321081",
+			text: "仪征市"
+		}, {
+			value: "321084",
+			text: "高邮市"
+		}, {
+			value: "321088",
+			text: "江都市"
+		}, {
+			value: "321092",
+			text: "经济开发区"
+		}, {
+			value: "321093",
+			text: "其它区"
+		}]
+	}, {
+		value: "321100",
+		text: "镇江市",
+		children: [{
+			value: "321102",
+			text: "京口区"
+		}, {
+			value: "321111",
+			text: "润州区"
+		}, {
+			value: "321112",
+			text: "丹徒区"
+		}, {
+			value: "321181",
+			text: "丹阳市"
+		}, {
+			value: "321182",
+			text: "扬中市"
+		}, {
+			value: "321183",
+			text: "句容市"
+		}, {
+			value: "321184",
+			text: "其它区"
+		}]
+	}, {
+		value: "321200",
+		text: "泰州市",
+		children: [{
+			value: "321202",
+			text: "海陵区"
+		}, {
+			value: "321203",
+			text: "高港区"
+		}, {
+			value: "321281",
+			text: "兴化市"
+		}, {
+			value: "321282",
+			text: "靖江市"
+		}, {
+			value: "321283",
+			text: "泰兴市"
+		}, {
+			value: "321284",
+			text: "姜堰市"
+		}, {
+			value: "321285",
+			text: "其它区"
+		}]
+	}, {
+		value: "321300",
+		text: "宿迁市",
+		children: [{
+			value: "321302",
+			text: "宿城区"
+		}, {
+			value: "321311",
+			text: "宿豫区"
+		}, {
+			value: "321322",
+			text: "沭阳县"
+		}, {
+			value: "321323",
+			text: "泗阳县"
+		}, {
+			value: "321324",
+			text: "泗洪县"
+		}, {
+			value: "321325",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '330000',
+	text: '浙江省',
+	children: [{
+		value: "330100",
+		text: "杭州市",
+		children: [{
+			value: "330102",
+			text: "上城区"
+		}, {
+			value: "330103",
+			text: "下城区"
+		}, {
+			value: "330104",
+			text: "江干区"
+		}, {
+			value: "330105",
+			text: "拱墅区"
+		}, {
+			value: "330106",
+			text: "西湖区"
+		}, {
+			value: "330108",
+			text: "滨江区"
+		}, {
+			value: "330109",
+			text: "萧山区"
+		}, {
+			value: "330110",
+			text: "余杭区"
+		}, {
+			value: "330122",
+			text: "桐庐县"
+		}, {
+			value: "330127",
+			text: "淳安县"
+		}, {
+			value: "330182",
+			text: "建德市"
+		}, {
+			value: "330183",
+			text: "富阳市"
+		}, {
+			value: "330185",
+			text: "临安市"
+		}, {
+			value: "330186",
+			text: "其它区"
+		}]
+	}, {
+		value: "330200",
+		text: "宁波市",
+		children: [{
+			value: "330203",
+			text: "海曙区"
+		}, {
+			value: "330204",
+			text: "江东区"
+		}, {
+			value: "330205",
+			text: "江北区"
+		}, {
+			value: "330206",
+			text: "北仑区"
+		}, {
+			value: "330211",
+			text: "镇海区"
+		}, {
+			value: "330212",
+			text: "鄞州区"
+		}, {
+			value: "330225",
+			text: "象山县"
+		}, {
+			value: "330226",
+			text: "宁海县"
+		}, {
+			value: "330281",
+			text: "余姚市"
+		}, {
+			value: "330282",
+			text: "慈溪市"
+		}, {
+			value: "330283",
+			text: "奉化市"
+		}, {
+			value: "330284",
+			text: "其它区"
+		}]
+	}, {
+		value: "330300",
+		text: "温州市",
+		children: [{
+			value: "330302",
+			text: "鹿城区"
+		}, {
+			value: "330303",
+			text: "龙湾区"
+		}, {
+			value: "330304",
+			text: "瓯海区"
+		}, {
+			value: "330322",
+			text: "洞头县"
+		}, {
+			value: "330324",
+			text: "永嘉县"
+		}, {
+			value: "330326",
+			text: "平阳县"
+		}, {
+			value: "330327",
+			text: "苍南县"
+		}, {
+			value: "330328",
+			text: "文成县"
+		}, {
+			value: "330329",
+			text: "泰顺县"
+		}, {
+			value: "330381",
+			text: "瑞安市"
+		}, {
+			value: "330382",
+			text: "乐清市"
+		}, {
+			value: "330383",
+			text: "其它区"
+		}]
+	}, {
+		value: "330400",
+		text: "嘉兴市",
+		children: [{
+			value: "330402",
+			text: "南湖区"
+		}, {
+			value: "330411",
+			text: "秀洲区"
+		}, {
+			value: "330421",
+			text: "嘉善县"
+		}, {
+			value: "330424",
+			text: "海盐县"
+		}, {
+			value: "330481",
+			text: "海宁市"
+		}, {
+			value: "330482",
+			text: "平湖市"
+		}, {
+			value: "330483",
+			text: "桐乡市"
+		}, {
+			value: "330484",
+			text: "其它区"
+		}]
+	}, {
+		value: "330500",
+		text: "湖州市",
+		children: [{
+			value: "330502",
+			text: "吴兴区"
+		}, {
+			value: "330503",
+			text: "南浔区"
+		}, {
+			value: "330521",
+			text: "德清县"
+		}, {
+			value: "330522",
+			text: "长兴县"
+		}, {
+			value: "330523",
+			text: "安吉县"
+		}, {
+			value: "330524",
+			text: "其它区"
+		}]
+	}, {
+		value: "330600",
+		text: "绍兴市",
+		children: [{
+			value: "330602",
+			text: "越城区"
+		}, {
+			value: "330621",
+			text: "柯桥区"
+		}, {
+			value: "330624",
+			text: "新昌县"
+		}, {
+			value: "330681",
+			text: "诸暨市"
+		}, {
+			value: "330682",
+			text: "上虞区"
+		}, {
+			value: "330683",
+			text: "嵊州市"
+		}, {
+			value: "330684",
+			text: "其它区"
+		}]
+	}, {
+		value: "330700",
+		text: "金华市",
+		children: [{
+			value: "330702",
+			text: "婺城区"
+		}, {
+			value: "330703",
+			text: "金东区"
+		}, {
+			value: "330723",
+			text: "武义县"
+		}, {
+			value: "330726",
+			text: "浦江县"
+		}, {
+			value: "330727",
+			text: "磐安县"
+		}, {
+			value: "330781",
+			text: "兰溪市"
+		}, {
+			value: "330782",
+			text: "义乌市"
+		}, {
+			value: "330783",
+			text: "东阳市"
+		}, {
+			value: "330784",
+			text: "永康市"
+		}, {
+			value: "330785",
+			text: "其它区"
+		}]
+	}, {
+		value: "330800",
+		text: "衢州市",
+		children: [{
+			value: "330802",
+			text: "柯城区"
+		}, {
+			value: "330803",
+			text: "衢江区"
+		}, {
+			value: "330822",
+			text: "常山县"
+		}, {
+			value: "330824",
+			text: "开化县"
+		}, {
+			value: "330825",
+			text: "龙游县"
+		}, {
+			value: "330881",
+			text: "江山市"
+		}, {
+			value: "330882",
+			text: "其它区"
+		}]
+	}, {
+		value: "330900",
+		text: "舟山市",
+		children: [{
+			value: "330902",
+			text: "定海区"
+		}, {
+			value: "330903",
+			text: "普陀区"
+		}, {
+			value: "330921",
+			text: "岱山县"
+		}, {
+			value: "330922",
+			text: "嵊泗县"
+		}, {
+			value: "330923",
+			text: "其它区"
+		}]
+	}, {
+		value: "331000",
+		text: "台州市",
+		children: [{
+			value: "331002",
+			text: "椒江区"
+		}, {
+			value: "331003",
+			text: "黄岩区"
+		}, {
+			value: "331004",
+			text: "路桥区"
+		}, {
+			value: "331021",
+			text: "玉环县"
+		}, {
+			value: "331022",
+			text: "三门县"
+		}, {
+			value: "331023",
+			text: "天台县"
+		}, {
+			value: "331024",
+			text: "仙居县"
+		}, {
+			value: "331081",
+			text: "温岭市"
+		}, {
+			value: "331082",
+			text: "临海市"
+		}, {
+			value: "331083",
+			text: "其它区"
+		}]
+	}, {
+		value: "331100",
+		text: "丽水市",
+		children: [{
+			value: "331102",
+			text: "莲都区"
+		}, {
+			value: "331121",
+			text: "青田县"
+		}, {
+			value: "331122",
+			text: "缙云县"
+		}, {
+			value: "331123",
+			text: "遂昌县"
+		}, {
+			value: "331124",
+			text: "松阳县"
+		}, {
+			value: "331125",
+			text: "云和县"
+		}, {
+			value: "331126",
+			text: "庆元县"
+		}, {
+			value: "331127",
+			text: "景宁畲族自治县"
+		}, {
+			value: "331181",
+			text: "龙泉市"
+		}, {
+			value: "331182",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '340000',
+	text: '安徽省',
+	children: [{
+		value: "340100",
+		text: "合肥市",
+		children: [{
+			value: "340102",
+			text: "瑶海区"
+		}, {
+			value: "340103",
+			text: "庐阳区"
+		}, {
+			value: "340104",
+			text: "蜀山区"
+		}, {
+			value: "340111",
+			text: "包河区"
+		}, {
+			value: "340121",
+			text: "长丰县"
+		}, {
+			value: "340122",
+			text: "肥东县"
+		}, {
+			value: "340123",
+			text: "肥西县"
+		}, {
+			value: "340151",
+			text: "高新区"
+		}, {
+			value: "340191",
+			text: "中区"
+		}, {
+			value: "340192",
+			text: "其它区"
+		}, {
+			value: "341400",
+			text: "巢湖市"
+		}, {
+			value: "341402",
+			text: "居巢区"
+		}, {
+			value: "341421",
+			text: "庐江县"
+		}]
+	}, {
+		value: "340200",
+		text: "芜湖市",
+		children: [{
+			value: "340202",
+			text: "镜湖区"
+		}, {
+			value: "340203",
+			text: "弋江区"
+		}, {
+			value: "340207",
+			text: "鸠江区"
+		}, {
+			value: "340208",
+			text: "三山区"
+		}, {
+			value: "340221",
+			text: "芜湖县"
+		}, {
+			value: "340222",
+			text: "繁昌县"
+		}, {
+			value: "340223",
+			text: "南陵县"
+		}, {
+			value: "340224",
+			text: "其它区"
+		}, {
+			value: "341422",
+			text: "无为县"
+		}]
+	}, {
+		value: "340300",
+		text: "蚌埠市",
+		children: [{
+			value: "340302",
+			text: "龙子湖区"
+		}, {
+			value: "340303",
+			text: "蚌山区"
+		}, {
+			value: "340304",
+			text: "禹会区"
+		}, {
+			value: "340311",
+			text: "淮上区"
+		}, {
+			value: "340321",
+			text: "怀远县"
+		}, {
+			value: "340322",
+			text: "五河县"
+		}, {
+			value: "340323",
+			text: "固镇县"
+		}, {
+			value: "340324",
+			text: "其它区"
+		}]
+	}, {
+		value: "340400",
+		text: "淮南市",
+		children: [{
+			value: "340402",
+			text: "大通区"
+		}, {
+			value: "340403",
+			text: "田家庵区"
+		}, {
+			value: "340404",
+			text: "谢家集区"
+		}, {
+			value: "340405",
+			text: "八公山区"
+		}, {
+			value: "340406",
+			text: "潘集区"
+		}, {
+			value: "340421",
+			text: "凤台县"
+		}, {
+			value: "340422",
+			text: "其它区"
+		}]
+	}, {
+		value: "340500",
+		text: "马鞍山市",
+		children: [{
+			value: "340502",
+			text: "金家庄区"
+		}, {
+			value: "340503",
+			text: "花山区"
+		}, {
+			value: "340504",
+			text: "雨山区"
+		}, {
+			value: "340521",
+			text: "当涂县"
+		}, {
+			value: "340522",
+			text: "其它区"
+		}, {
+			value: "341423",
+			text: "含山县"
+		}, {
+			value: "341424",
+			text: "和县"
+		}]
+	}, {
+		value: "340600",
+		text: "淮北市",
+		children: [{
+			value: "340602",
+			text: "杜集区"
+		}, {
+			value: "340603",
+			text: "相山区"
+		}, {
+			value: "340604",
+			text: "烈山区"
+		}, {
+			value: "340621",
+			text: "濉溪县"
+		}, {
+			value: "340622",
+			text: "其它区"
+		}]
+	}, {
+		value: "340700",
+		text: "铜陵市",
+		children: [{
+			value: "340702",
+			text: "铜官山区"
+		}, {
+			value: "340703",
+			text: "狮子山区"
+		}, {
+			value: "340711",
+			text: "郊区"
+		}, {
+			value: "340721",
+			text: "铜陵县"
+		}, {
+			value: "340722",
+			text: "其它区"
+		}]
+	}, {
+		value: "340800",
+		text: "安庆市",
+		children: [{
+			value: "340802",
+			text: "迎江区"
+		}, {
+			value: "340803",
+			text: "大观区"
+		}, {
+			value: "340811",
+			text: "宜秀区"
+		}, {
+			value: "340822",
+			text: "怀宁县"
+		}, {
+			value: "340823",
+			text: "枞阳县"
+		}, {
+			value: "340824",
+			text: "潜山县"
+		}, {
+			value: "340825",
+			text: "太湖县"
+		}, {
+			value: "340826",
+			text: "宿松县"
+		}, {
+			value: "340827",
+			text: "望江县"
+		}, {
+			value: "340828",
+			text: "岳西县"
+		}, {
+			value: "340881",
+			text: "桐城市"
+		}, {
+			value: "340882",
+			text: "其它区"
+		}]
+	}, {
+		value: "341000",
+		text: "黄山市",
+		children: [{
+			value: "341002",
+			text: "屯溪区"
+		}, {
+			value: "341003",
+			text: "黄山区"
+		}, {
+			value: "341004",
+			text: "徽州区"
+		}, {
+			value: "341021",
+			text: "歙县"
+		}, {
+			value: "341022",
+			text: "休宁县"
+		}, {
+			value: "341023",
+			text: "黟县"
+		}, {
+			value: "341024",
+			text: "祁门县"
+		}, {
+			value: "341025",
+			text: "其它区"
+		}]
+	}, {
+		value: "341100",
+		text: "滁州市",
+		children: [{
+			value: "341102",
+			text: "琅琊区"
+		}, {
+			value: "341103",
+			text: "南谯区"
+		}, {
+			value: "341122",
+			text: "来安县"
+		}, {
+			value: "341124",
+			text: "全椒县"
+		}, {
+			value: "341125",
+			text: "定远县"
+		}, {
+			value: "341126",
+			text: "凤阳县"
+		}, {
+			value: "341181",
+			text: "天长市"
+		}, {
+			value: "341182",
+			text: "明光市"
+		}, {
+			value: "341183",
+			text: "其它区"
+		}]
+	}, {
+		value: "341200",
+		text: "阜阳市",
+		children: [{
+			value: "341202",
+			text: "颍州区"
+		}, {
+			value: "341203",
+			text: "颍东区"
+		}, {
+			value: "341204",
+			text: "颍泉区"
+		}, {
+			value: "341221",
+			text: "临泉县"
+		}, {
+			value: "341222",
+			text: "太和县"
+		}, {
+			value: "341225",
+			text: "阜南县"
+		}, {
+			value: "341226",
+			text: "颍上县"
+		}, {
+			value: "341282",
+			text: "界首市"
+		}, {
+			value: "341283",
+			text: "其它区"
+		}]
+	}, {
+		value: "341300",
+		text: "宿州市",
+		children: [{
+			value: "341302",
+			text: "埇桥区"
+		}, {
+			value: "341321",
+			text: "砀山县"
+		}, {
+			value: "341322",
+			text: "萧县"
+		}, {
+			value: "341323",
+			text: "灵璧县"
+		}, {
+			value: "341324",
+			text: "泗县"
+		}, {
+			value: "341325",
+			text: "其它区"
+		}]
+	}, {
+		value: "341500",
+		text: "六安市",
+		children: [{
+			value: "341502",
+			text: "金安区"
+		}, {
+			value: "341503",
+			text: "裕安区"
+		}, {
+			value: "341521",
+			text: "寿县"
+		}, {
+			value: "341522",
+			text: "霍邱县"
+		}, {
+			value: "341523",
+			text: "舒城县"
+		}, {
+			value: "341524",
+			text: "金寨县"
+		}, {
+			value: "341525",
+			text: "霍山县"
+		}, {
+			value: "341526",
+			text: "其它区"
+		}]
+	}, {
+		value: "341600",
+		text: "亳州市",
+		children: [{
+			value: "341602",
+			text: "谯城区"
+		}, {
+			value: "341621",
+			text: "涡阳县"
+		}, {
+			value: "341622",
+			text: "蒙城县"
+		}, {
+			value: "341623",
+			text: "利辛县"
+		}, {
+			value: "341624",
+			text: "其它区"
+		}]
+	}, {
+		value: "341700",
+		text: "池州市",
+		children: [{
+			value: "341702",
+			text: "贵池区"
+		}, {
+			value: "341721",
+			text: "东至县"
+		}, {
+			value: "341722",
+			text: "石台县"
+		}, {
+			value: "341723",
+			text: "青阳县"
+		}, {
+			value: "341724",
+			text: "其它区"
+		}]
+	}, {
+		value: "341800",
+		text: "宣城市",
+		children: [{
+			value: "341802",
+			text: "宣州区"
+		}, {
+			value: "341821",
+			text: "郎溪县"
+		}, {
+			value: "341822",
+			text: "广德县"
+		}, {
+			value: "341823",
+			text: "泾县"
+		}, {
+			value: "341824",
+			text: "绩溪县"
+		}, {
+			value: "341825",
+			text: "旌德县"
+		}, {
+			value: "341881",
+			text: "宁国市"
+		}, {
+			value: "341882",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '350000',
+	text: '福建省',
+	children: [{
+		value: "350100",
+		text: "福州市",
+		children: [{
+			value: "350102",
+			text: "鼓楼区"
+		}, {
+			value: "350103",
+			text: "台江区"
+		}, {
+			value: "350104",
+			text: "仓山区"
+		}, {
+			value: "350105",
+			text: "马尾区"
+		}, {
+			value: "350111",
+			text: "晋安区"
+		}, {
+			value: "350121",
+			text: "闽侯县"
+		}, {
+			value: "350122",
+			text: "连江县"
+		}, {
+			value: "350123",
+			text: "罗源县"
+		}, {
+			value: "350124",
+			text: "闽清县"
+		}, {
+			value: "350125",
+			text: "永泰县"
+		}, {
+			value: "350128",
+			text: "平潭县"
+		}, {
+			value: "350181",
+			text: "福清市"
+		}, {
+			value: "350182",
+			text: "长乐市"
+		}, {
+			value: "350183",
+			text: "其它区"
+		}]
+	}, {
+		value: "350200",
+		text: "厦门市",
+		children: [{
+			value: "350203",
+			text: "思明区"
+		}, {
+			value: "350205",
+			text: "海沧区"
+		}, {
+			value: "350206",
+			text: "湖里区"
+		}, {
+			value: "350211",
+			text: "集美区"
+		}, {
+			value: "350212",
+			text: "同安区"
+		}, {
+			value: "350213",
+			text: "翔安区"
+		}, {
+			value: "350214",
+			text: "其它区"
+		}]
+	}, {
+		value: "350300",
+		text: "莆田市",
+		children: [{
+			value: "350302",
+			text: "城厢区"
+		}, {
+			value: "350303",
+			text: "涵江区"
+		}, {
+			value: "350304",
+			text: "荔城区"
+		}, {
+			value: "350305",
+			text: "秀屿区"
+		}, {
+			value: "350322",
+			text: "仙游县"
+		}, {
+			value: "350323",
+			text: "其它区"
+		}]
+	}, {
+		value: "350400",
+		text: "三明市",
+		children: [{
+			value: "350402",
+			text: "梅列区"
+		}, {
+			value: "350403",
+			text: "三元区"
+		}, {
+			value: "350421",
+			text: "明溪县"
+		}, {
+			value: "350423",
+			text: "清流县"
+		}, {
+			value: "350424",
+			text: "宁化县"
+		}, {
+			value: "350425",
+			text: "大田县"
+		}, {
+			value: "350426",
+			text: "尤溪县"
+		}, {
+			value: "350427",
+			text: "沙县"
+		}, {
+			value: "350428",
+			text: "将乐县"
+		}, {
+			value: "350429",
+			text: "泰宁县"
+		}, {
+			value: "350430",
+			text: "建宁县"
+		}, {
+			value: "350481",
+			text: "永安市"
+		}, {
+			value: "350482",
+			text: "其它区"
+		}]
+	}, {
+		value: "350500",
+		text: "泉州市",
+		children: [{
+			value: "350502",
+			text: "鲤城区"
+		}, {
+			value: "350503",
+			text: "丰泽区"
+		}, {
+			value: "350504",
+			text: "洛江区"
+		}, {
+			value: "350505",
+			text: "泉港区"
+		}, {
+			value: "350521",
+			text: "惠安县"
+		}, {
+			value: "350524",
+			text: "安溪县"
+		}, {
+			value: "350525",
+			text: "永春县"
+		}, {
+			value: "350526",
+			text: "德化县"
+		}, {
+			value: "350527",
+			text: "金门县"
+		}, {
+			value: "350581",
+			text: "石狮市"
+		}, {
+			value: "350582",
+			text: "晋江市"
+		}, {
+			value: "350583",
+			text: "南安市"
+		}, {
+			value: "350584",
+			text: "其它区"
+		}]
+	}, {
+		value: "350600",
+		text: "漳州市",
+		children: [{
+			value: "350602",
+			text: "芗城区"
+		}, {
+			value: "350603",
+			text: "龙文区"
+		}, {
+			value: "350622",
+			text: "云霄县"
+		}, {
+			value: "350623",
+			text: "漳浦县"
+		}, {
+			value: "350624",
+			text: "诏安县"
+		}, {
+			value: "350625",
+			text: "长泰县"
+		}, {
+			value: "350626",
+			text: "东山县"
+		}, {
+			value: "350627",
+			text: "南靖县"
+		}, {
+			value: "350628",
+			text: "平和县"
+		}, {
+			value: "350629",
+			text: "华安县"
+		}, {
+			value: "350681",
+			text: "龙海市"
+		}, {
+			value: "350682",
+			text: "其它区"
+		}]
+	}, {
+		value: "350700",
+		text: "南平市",
+		children: [{
+			value: "350702",
+			text: "延平区"
+		}, {
+			value: "350721",
+			text: "顺昌县"
+		}, {
+			value: "350722",
+			text: "浦城县"
+		}, {
+			value: "350723",
+			text: "光泽县"
+		}, {
+			value: "350724",
+			text: "松溪县"
+		}, {
+			value: "350725",
+			text: "政和县"
+		}, {
+			value: "350781",
+			text: "邵武市"
+		}, {
+			value: "350782",
+			text: "武夷山市"
+		}, {
+			value: "350783",
+			text: "建瓯市"
+		}, {
+			value: "350784",
+			text: "建阳市"
+		}, {
+			value: "350785",
+			text: "其它区"
+		}]
+	}, {
+		value: "350800",
+		text: "龙岩市",
+		children: [{
+			value: "350802",
+			text: "新罗区"
+		}, {
+			value: "350821",
+			text: "长汀县"
+		}, {
+			value: "350822",
+			text: "永定县"
+		}, {
+			value: "350823",
+			text: "上杭县"
+		}, {
+			value: "350824",
+			text: "武平县"
+		}, {
+			value: "350825",
+			text: "连城县"
+		}, {
+			value: "350881",
+			text: "漳平市"
+		}, {
+			value: "350882",
+			text: "其它区"
+		}]
+	}, {
+		value: "350900",
+		text: "宁德市",
+		children: [{
+			value: "350902",
+			text: "蕉城区"
+		}, {
+			value: "350921",
+			text: "霞浦县"
+		}, {
+			value: "350922",
+			text: "古田县"
+		}, {
+			value: "350923",
+			text: "屏南县"
+		}, {
+			value: "350924",
+			text: "寿宁县"
+		}, {
+			value: "350925",
+			text: "周宁县"
+		}, {
+			value: "350926",
+			text: "柘荣县"
+		}, {
+			value: "350981",
+			text: "福安市"
+		}, {
+			value: "350982",
+			text: "福鼎市"
+		}, {
+			value: "350983",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '360000',
+	text: '江西省',
+	children: [{
+		value: "360100",
+		text: "南昌市",
+		children: [{
+			value: "360102",
+			text: "东湖区"
+		}, {
+			value: "360103",
+			text: "西湖区"
+		}, {
+			value: "360104",
+			text: "青云谱区"
+		}, {
+			value: "360105",
+			text: "湾里区"
+		}, {
+			value: "360111",
+			text: "青山湖区"
+		}, {
+			value: "360121",
+			text: "南昌县"
+		}, {
+			value: "360122",
+			text: "新建县"
+		}, {
+			value: "360123",
+			text: "安义县"
+		}, {
+			value: "360124",
+			text: "进贤县"
+		}, {
+			value: "360125",
+			text: "红谷滩新区"
+		}, {
+			value: "360126",
+			text: "经济技术开发区"
+		}, {
+			value: "360127",
+			text: "昌北区"
+		}, {
+			value: "360128",
+			text: "其它区"
+		}]
+	}, {
+		value: "360200",
+		text: "景德镇市",
+		children: [{
+			value: "360202",
+			text: "昌江区"
+		}, {
+			value: "360203",
+			text: "珠山区"
+		}, {
+			value: "360222",
+			text: "浮梁县"
+		}, {
+			value: "360281",
+			text: "乐平市"
+		}, {
+			value: "360282",
+			text: "其它区"
+		}]
+	}, {
+		value: "360300",
+		text: "萍乡市",
+		children: [{
+			value: "360302",
+			text: "安源区"
+		}, {
+			value: "360313",
+			text: "湘东区"
+		}, {
+			value: "360321",
+			text: "莲花县"
+		}, {
+			value: "360322",
+			text: "上栗县"
+		}, {
+			value: "360323",
+			text: "芦溪县"
+		}, {
+			value: "360324",
+			text: "其它区"
+		}]
+	}, {
+		value: "360400",
+		text: "九江市",
+		children: [{
+			value: "360402",
+			text: "庐山区"
+		}, {
+			value: "360403",
+			text: "浔阳区"
+		}, {
+			value: "360421",
+			text: "九江县"
+		}, {
+			value: "360423",
+			text: "武宁县"
+		}, {
+			value: "360424",
+			text: "修水县"
+		}, {
+			value: "360425",
+			text: "永修县"
+		}, {
+			value: "360426",
+			text: "德安县"
+		}, {
+			value: "360427",
+			text: "星子县"
+		}, {
+			value: "360428",
+			text: "都昌县"
+		}, {
+			value: "360429",
+			text: "湖口县"
+		}, {
+			value: "360430",
+			text: "彭泽县"
+		}, {
+			value: "360481",
+			text: "瑞昌市"
+		}, {
+			value: "360482",
+			text: "其它区"
+		}]
+	}, {
+		value: "360500",
+		text: "新余市",
+		children: [{
+			value: "360502",
+			text: "渝水区"
+		}, {
+			value: "360521",
+			text: "分宜县"
+		}, {
+			value: "360522",
+			text: "其它区"
+		}]
+	}, {
+		value: "360600",
+		text: "鹰潭市",
+		children: [{
+			value: "360602",
+			text: "月湖区"
+		}, {
+			value: "360622",
+			text: "余江县"
+		}, {
+			value: "360681",
+			text: "贵溪市"
+		}, {
+			value: "360682",
+			text: "其它区"
+		}]
+	}, {
+		value: "360700",
+		text: "赣州市",
+		children: [{
+			value: "360702",
+			text: "章贡区"
+		}, {
+			value: "360721",
+			text: "赣县"
+		}, {
+			value: "360722",
+			text: "信丰县"
+		}, {
+			value: "360723",
+			text: "大余县"
+		}, {
+			value: "360724",
+			text: "上犹县"
+		}, {
+			value: "360725",
+			text: "崇义县"
+		}, {
+			value: "360726",
+			text: "安远县"
+		}, {
+			value: "360727",
+			text: "龙南县"
+		}, {
+			value: "360728",
+			text: "定南县"
+		}, {
+			value: "360729",
+			text: "全南县"
+		}, {
+			value: "360730",
+			text: "宁都县"
+		}, {
+			value: "360731",
+			text: "于都县"
+		}, {
+			value: "360732",
+			text: "兴国县"
+		}, {
+			value: "360733",
+			text: "会昌县"
+		}, {
+			value: "360734",
+			text: "寻乌县"
+		}, {
+			value: "360735",
+			text: "石城县"
+		}, {
+			value: "360751",
+			text: "黄金区"
+		}, {
+			value: "360781",
+			text: "瑞金市"
+		}, {
+			value: "360782",
+			text: "南康市"
+		}, {
+			value: "360783",
+			text: "其它区"
+		}]
+	}, {
+		value: "360800",
+		text: "吉安市",
+		children: [{
+			value: "360802",
+			text: "吉州区"
+		}, {
+			value: "360803",
+			text: "青原区"
+		}, {
+			value: "360821",
+			text: "吉安县"
+		}, {
+			value: "360822",
+			text: "吉水县"
+		}, {
+			value: "360823",
+			text: "峡江县"
+		}, {
+			value: "360824",
+			text: "新干县"
+		}, {
+			value: "360825",
+			text: "永丰县"
+		}, {
+			value: "360826",
+			text: "泰和县"
+		}, {
+			value: "360827",
+			text: "遂川县"
+		}, {
+			value: "360828",
+			text: "万安县"
+		}, {
+			value: "360829",
+			text: "安福县"
+		}, {
+			value: "360830",
+			text: "永新县"
+		}, {
+			value: "360881",
+			text: "井冈山市"
+		}, {
+			value: "360882",
+			text: "其它区"
+		}]
+	}, {
+		value: "360900",
+		text: "宜春市",
+		children: [{
+			value: "360902",
+			text: "袁州区"
+		}, {
+			value: "360921",
+			text: "奉新县"
+		}, {
+			value: "360922",
+			text: "万载县"
+		}, {
+			value: "360923",
+			text: "上高县"
+		}, {
+			value: "360924",
+			text: "宜丰县"
+		}, {
+			value: "360925",
+			text: "靖安县"
+		}, {
+			value: "360926",
+			text: "铜鼓县"
+		}, {
+			value: "360981",
+			text: "丰城市"
+		}, {
+			value: "360982",
+			text: "樟树市"
+		}, {
+			value: "360983",
+			text: "高安市"
+		}, {
+			value: "360984",
+			text: "其它区"
+		}]
+	}, {
+		value: "361000",
+		text: "抚州市",
+		children: [{
+			value: "361002",
+			text: "临川区"
+		}, {
+			value: "361021",
+			text: "南城县"
+		}, {
+			value: "361022",
+			text: "黎川县"
+		}, {
+			value: "361023",
+			text: "南丰县"
+		}, {
+			value: "361024",
+			text: "崇仁县"
+		}, {
+			value: "361025",
+			text: "乐安县"
+		}, {
+			value: "361026",
+			text: "宜黄县"
+		}, {
+			value: "361027",
+			text: "金溪县"
+		}, {
+			value: "361028",
+			text: "资溪县"
+		}, {
+			value: "361029",
+			text: "东乡县"
+		}, {
+			value: "361030",
+			text: "广昌县"
+		}, {
+			value: "361031",
+			text: "其它区"
+		}]
+	}, {
+		value: "361100",
+		text: "上饶市",
+		children: [{
+			value: "361102",
+			text: "信州区"
+		}, {
+			value: "361121",
+			text: "上饶县"
+		}, {
+			value: "361122",
+			text: "广丰县"
+		}, {
+			value: "361123",
+			text: "玉山县"
+		}, {
+			value: "361124",
+			text: "铅山县"
+		}, {
+			value: "361125",
+			text: "横峰县"
+		}, {
+			value: "361126",
+			text: "弋阳县"
+		}, {
+			value: "361127",
+			text: "余干县"
+		}, {
+			value: "361128",
+			text: "鄱阳县"
+		}, {
+			value: "361129",
+			text: "万年县"
+		}, {
+			value: "361130",
+			text: "婺源县"
+		}, {
+			value: "361181",
+			text: "德兴市"
+		}, {
+			value: "361182",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '370000',
+	text: '山东省',
+	children: [{
+		value: "370100",
+		text: "济南市",
+		children: [{
+			value: "370102",
+			text: "历下区"
+		}, {
+			value: "370103",
+			text: "市中区"
+		}, {
+			value: "370104",
+			text: "槐荫区"
+		}, {
+			value: "370105",
+			text: "天桥区"
+		}, {
+			value: "370112",
+			text: "历城区"
+		}, {
+			value: "370113",
+			text: "长清区"
+		}, {
+			value: "370124",
+			text: "平阴县"
+		}, {
+			value: "370125",
+			text: "济阳县"
+		}, {
+			value: "370126",
+			text: "商河县"
+		}, {
+			value: "370181",
+			text: "章丘市"
+		}, {
+			value: "370182",
+			text: "其它区"
+		}]
+	}, {
+		value: "370200",
+		text: "青岛市",
+		children: [{
+			value: "370202",
+			text: "市南区"
+		}, {
+			value: "370203",
+			text: "市北区"
+		}, {
+			value: "370205",
+			text: "四方区"
+		}, {
+			value: "370211",
+			text: "黄岛区"
+		}, {
+			value: "370212",
+			text: "崂山区"
+		}, {
+			value: "370213",
+			text: "李沧区"
+		}, {
+			value: "370214",
+			text: "城阳区"
+		}, {
+			value: "370251",
+			text: "开发区"
+		}, {
+			value: "370281",
+			text: "胶州市"
+		}, {
+			value: "370282",
+			text: "即墨市"
+		}, {
+			value: "370283",
+			text: "平度市"
+		}, {
+			value: "370284",
+			text: "胶南市"
+		}, {
+			value: "370285",
+			text: "莱西市"
+		}, {
+			value: "370286",
+			text: "其它区"
+		}]
+	}, {
+		value: "370300",
+		text: "淄博市",
+		children: [{
+			value: "370302",
+			text: "淄川区"
+		}, {
+			value: "370303",
+			text: "张店区"
+		}, {
+			value: "370304",
+			text: "博山区"
+		}, {
+			value: "370305",
+			text: "临淄区"
+		}, {
+			value: "370306",
+			text: "周村区"
+		}, {
+			value: "370321",
+			text: "桓台县"
+		}, {
+			value: "370322",
+			text: "高青县"
+		}, {
+			value: "370323",
+			text: "沂源县"
+		}, {
+			value: "370324",
+			text: "其它区"
+		}]
+	}, {
+		value: "370400",
+		text: "枣庄市",
+		children: [{
+			value: "370402",
+			text: "市中区"
+		}, {
+			value: "370403",
+			text: "薛城区"
+		}, {
+			value: "370404",
+			text: "峄城区"
+		}, {
+			value: "370405",
+			text: "台儿庄区"
+		}, {
+			value: "370406",
+			text: "山亭区"
+		}, {
+			value: "370481",
+			text: "滕州市"
+		}, {
+			value: "370482",
+			text: "其它区"
+		}]
+	}, {
+		value: "370500",
+		text: "东营市",
+		children: [{
+			value: "370502",
+			text: "东营区"
+		}, {
+			value: "370503",
+			text: "河口区"
+		}, {
+			value: "370521",
+			text: "垦利县"
+		}, {
+			value: "370522",
+			text: "利津县"
+		}, {
+			value: "370523",
+			text: "广饶县"
+		}, {
+			value: "370589",
+			text: "西城区"
+		}, {
+			value: "370590",
+			text: "东城区"
+		}, {
+			value: "370591",
+			text: "其它区"
+		}]
+	}, {
+		value: "370600",
+		text: "烟台市",
+		children: [{
+			value: "370602",
+			text: "芝罘区"
+		}, {
+			value: "370611",
+			text: "福山区"
+		}, {
+			value: "370612",
+			text: "牟平区"
+		}, {
+			value: "370613",
+			text: "莱山区"
+		}, {
+			value: "370634",
+			text: "长岛县"
+		}, {
+			value: "370681",
+			text: "龙口市"
+		}, {
+			value: "370682",
+			text: "莱阳市"
+		}, {
+			value: "370683",
+			text: "莱州市"
+		}, {
+			value: "370684",
+			text: "蓬莱市"
+		}, {
+			value: "370685",
+			text: "招远市"
+		}, {
+			value: "370686",
+			text: "栖霞市"
+		}, {
+			value: "370687",
+			text: "海阳市"
+		}, {
+			value: "370688",
+			text: "其它区"
+		}]
+	}, {
+		value: "370700",
+		text: "潍坊市",
+		children: [{
+			value: "370702",
+			text: "潍城区"
+		}, {
+			value: "370703",
+			text: "寒亭区"
+		}, {
+			value: "370704",
+			text: "坊子区"
+		}, {
+			value: "370705",
+			text: "奎文区"
+		}, {
+			value: "370724",
+			text: "临朐县"
+		}, {
+			value: "370725",
+			text: "昌乐县"
+		}, {
+			value: "370751",
+			text: "开发区"
+		}, {
+			value: "370781",
+			text: "青州市"
+		}, {
+			value: "370782",
+			text: "诸城市"
+		}, {
+			value: "370783",
+			text: "寿光市"
+		}, {
+			value: "370784",
+			text: "安丘市"
+		}, {
+			value: "370785",
+			text: "高密市"
+		}, {
+			value: "370786",
+			text: "昌邑市"
+		}, {
+			value: "370787",
+			text: "其它区"
+		}]
+	}, {
+		value: "370800",
+		text: "济宁市",
+		children: [{
+			value: "370802",
+			text: "市中区"
+		}, {
+			value: "370811",
+			text: "任城区"
+		}, {
+			value: "370826",
+			text: "微山县"
+		}, {
+			value: "370827",
+			text: "鱼台县"
+		}, {
+			value: "370828",
+			text: "金乡县"
+		}, {
+			value: "370829",
+			text: "嘉祥县"
+		}, {
+			value: "370830",
+			text: "汶上县"
+		}, {
+			value: "370831",
+			text: "泗水县"
+		}, {
+			value: "370832",
+			text: "梁山县"
+		}, {
+			value: "370881",
+			text: "曲阜市"
+		}, {
+			value: "370882",
+			text: "兖州市"
+		}, {
+			value: "370883",
+			text: "邹城市"
+		}, {
+			value: "370884",
+			text: "其它区"
+		}]
+	}, {
+		value: "370900",
+		text: "泰安市",
+		children: [{
+			value: "370902",
+			text: "泰山区"
+		}, {
+			value: "370903",
+			text: "岱岳区"
+		}, {
+			value: "370921",
+			text: "宁阳县"
+		}, {
+			value: "370923",
+			text: "东平县"
+		}, {
+			value: "370982",
+			text: "新泰市"
+		}, {
+			value: "370983",
+			text: "肥城市"
+		}, {
+			value: "370984",
+			text: "其它区"
+		}]
+	}, {
+		value: "371000",
+		text: "威海市",
+		children: [{
+			value: "371002",
+			text: "环翠区"
+		}, {
+			value: "371081",
+			text: "文登市"
+		}, {
+			value: "371082",
+			text: "荣成市"
+		}, {
+			value: "371083",
+			text: "乳山市"
+		}, {
+			value: "371084",
+			text: "其它区"
+		}]
+	}, {
+		value: "371100",
+		text: "日照市",
+		children: [{
+			value: "371102",
+			text: "东港区"
+		}, {
+			value: "371103",
+			text: "岚山区"
+		}, {
+			value: "371121",
+			text: "五莲县"
+		}, {
+			value: "371122",
+			text: "莒县"
+		}, {
+			value: "371123",
+			text: "其它区"
+		}]
+	}, {
+		value: "371200",
+		text: "莱芜市",
+		children: [{
+			value: "371202",
+			text: "莱城区"
+		}, {
+			value: "371203",
+			text: "钢城区"
+		}, {
+			value: "371204",
+			text: "其它区"
+		}]
+	}, {
+		value: "371300",
+		text: "临沂市",
+		children: [{
+			value: "371302",
+			text: "兰山区"
+		}, {
+			value: "371311",
+			text: "罗庄区"
+		}, {
+			value: "371312",
+			text: "河东区"
+		}, {
+			value: "371321",
+			text: "沂南县"
+		}, {
+			value: "371322",
+			text: "郯城县"
+		}, {
+			value: "371323",
+			text: "沂水县"
+		}, {
+			value: "371324",
+			text: "苍山县"
+		}, {
+			value: "371325",
+			text: "费县"
+		}, {
+			value: "371326",
+			text: "平邑县"
+		}, {
+			value: "371327",
+			text: "莒南县"
+		}, {
+			value: "371328",
+			text: "蒙阴县"
+		}, {
+			value: "371329",
+			text: "临沭县"
+		}, {
+			value: "371330",
+			text: "其它区"
+		}]
+	}, {
+		value: "371400",
+		text: "德州市",
+		children: [{
+			value: "371402",
+			text: "德城区"
+		}, {
+			value: "371421",
+			text: "陵县"
+		}, {
+			value: "371422",
+			text: "宁津县"
+		}, {
+			value: "371423",
+			text: "庆云县"
+		}, {
+			value: "371424",
+			text: "临邑县"
+		}, {
+			value: "371425",
+			text: "齐河县"
+		}, {
+			value: "371426",
+			text: "平原县"
+		}, {
+			value: "371427",
+			text: "夏津县"
+		}, {
+			value: "371428",
+			text: "武城县"
+		}, {
+			value: "371451",
+			text: "开发区"
+		}, {
+			value: "371481",
+			text: "乐陵市"
+		}, {
+			value: "371482",
+			text: "禹城市"
+		}, {
+			value: "371483",
+			text: "其它区"
+		}]
+	}, {
+		value: "371500",
+		text: "聊城市",
+		children: [{
+			value: "371502",
+			text: "东昌府区"
+		}, {
+			value: "371521",
+			text: "阳谷县"
+		}, {
+			value: "371522",
+			text: "莘县"
+		}, {
+			value: "371523",
+			text: "茌平县"
+		}, {
+			value: "371524",
+			text: "东阿县"
+		}, {
+			value: "371525",
+			text: "冠县"
+		}, {
+			value: "371526",
+			text: "高唐县"
+		}, {
+			value: "371581",
+			text: "临清市"
+		}, {
+			value: "371582",
+			text: "其它区"
+		}]
+	}, {
+		value: "371600",
+		text: "滨州市",
+		children: [{
+			value: "371602",
+			text: "滨城区"
+		}, {
+			value: "371621",
+			text: "惠民县"
+		}, {
+			value: "371622",
+			text: "阳信县"
+		}, {
+			value: "371623",
+			text: "无棣县"
+		}, {
+			value: "371624",
+			text: "沾化县"
+		}, {
+			value: "371625",
+			text: "博兴县"
+		}, {
+			value: "371626",
+			text: "邹平县"
+		}, {
+			value: "371627",
+			text: "其它区"
+		}]
+	}, {
+		value: "371700",
+		text: "菏泽市",
+		children: [{
+			value: "371702",
+			text: "牡丹区"
+		}, {
+			value: "371721",
+			text: "曹县"
+		}, {
+			value: "371722",
+			text: "单县"
+		}, {
+			value: "371723",
+			text: "成武县"
+		}, {
+			value: "371724",
+			text: "巨野县"
+		}, {
+			value: "371725",
+			text: "郓城县"
+		}, {
+			value: "371726",
+			text: "鄄城县"
+		}, {
+			value: "371727",
+			text: "定陶县"
+		}, {
+			value: "371728",
+			text: "东明县"
+		}, {
+			value: "371729",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '410000',
+	text: '河南省',
+	children: [{
+		value: "410100",
+		text: "郑州市",
+		children: [{
+			value: "410102",
+			text: "中原区"
+		}, {
+			value: "410103",
+			text: "二七区"
+		}, {
+			value: "410104",
+			text: "管城回族区"
+		}, {
+			value: "410105",
+			text: "金水区"
+		}, {
+			value: "410106",
+			text: "上街区"
+		}, {
+			value: "410108",
+			text: "惠济区"
+		}, {
+			value: "410122",
+			text: "中牟县"
+		}, {
+			value: "410181",
+			text: "巩义市"
+		}, {
+			value: "410182",
+			text: "荥阳市"
+		}, {
+			value: "410183",
+			text: "新密市"
+		}, {
+			value: "410184",
+			text: "新郑市"
+		}, {
+			value: "410185",
+			text: "登封市"
+		}, {
+			value: "410186",
+			text: "郑东新区"
+		}, {
+			value: "410187",
+			text: "高新区"
+		}, {
+			value: "410188",
+			text: "其它区"
+		}]
+	}, {
+		value: "410200",
+		text: "开封市",
+		children: [{
+			value: "410202",
+			text: "龙亭区"
+		}, {
+			value: "410203",
+			text: "顺河回族区"
+		}, {
+			value: "410204",
+			text: "鼓楼区"
+		}, {
+			value: "410205",
+			text: "禹王台区"
+		}, {
+			value: "410211",
+			text: "金明区"
+		}, {
+			value: "410221",
+			text: "杞县"
+		}, {
+			value: "410222",
+			text: "通许县"
+		}, {
+			value: "410223",
+			text: "尉氏县"
+		}, {
+			value: "410224",
+			text: "开封县"
+		}, {
+			value: "410225",
+			text: "兰考县"
+		}, {
+			value: "410226",
+			text: "其它区"
+		}]
+	}, {
+		value: "410300",
+		text: "洛阳市",
+		children: [{
+			value: "410302",
+			text: "老城区"
+		}, {
+			value: "410303",
+			text: "西工区"
+		}, {
+			value: "410304",
+			text: "廛河回族区"
+		}, {
+			value: "410305",
+			text: "涧西区"
+		}, {
+			value: "410306",
+			text: "吉利区"
+		}, {
+			value: "410307",
+			text: "洛龙区"
+		}, {
+			value: "410322",
+			text: "孟津县"
+		}, {
+			value: "410323",
+			text: "新安县"
+		}, {
+			value: "410324",
+			text: "栾川县"
+		}, {
+			value: "410325",
+			text: "嵩县"
+		}, {
+			value: "410326",
+			text: "汝阳县"
+		}, {
+			value: "410327",
+			text: "宜阳县"
+		}, {
+			value: "410328",
+			text: "洛宁县"
+		}, {
+			value: "410329",
+			text: "伊川县"
+		}, {
+			value: "410381",
+			text: "偃师市"
+		}, {
+			value: "471004",
+			text: "高新区"
+		}, {
+			value: "471005",
+			text: "其它区"
+		}]
+	}, {
+		value: "410400",
+		text: "平顶山市",
+		children: [{
+			value: "410402",
+			text: "新华区"
+		}, {
+			value: "410403",
+			text: "卫东区"
+		}, {
+			value: "410404",
+			text: "石龙区"
+		}, {
+			value: "410411",
+			text: "湛河区"
+		}, {
+			value: "410421",
+			text: "宝丰县"
+		}, {
+			value: "410422",
+			text: "叶县"
+		}, {
+			value: "410423",
+			text: "鲁山县"
+		}, {
+			value: "410425",
+			text: "郏县"
+		}, {
+			value: "410481",
+			text: "舞钢市"
+		}, {
+			value: "410482",
+			text: "汝州市"
+		}, {
+			value: "410483",
+			text: "其它区"
+		}]
+	}, {
+		value: "410500",
+		text: "安阳市",
+		children: [{
+			value: "410502",
+			text: "文峰区"
+		}, {
+			value: "410503",
+			text: "北关区"
+		}, {
+			value: "410505",
+			text: "殷都区"
+		}, {
+			value: "410506",
+			text: "龙安区"
+		}, {
+			value: "410522",
+			text: "安阳县"
+		}, {
+			value: "410523",
+			text: "汤阴县"
+		}, {
+			value: "410526",
+			text: "滑县"
+		}, {
+			value: "410527",
+			text: "内黄县"
+		}, {
+			value: "410581",
+			text: "林州市"
+		}, {
+			value: "410582",
+			text: "其它区"
+		}]
+	}, {
+		value: "410600",
+		text: "鹤壁市",
+		children: [{
+			value: "410602",
+			text: "鹤山区"
+		}, {
+			value: "410603",
+			text: "山城区"
+		}, {
+			value: "410611",
+			text: "淇滨区"
+		}, {
+			value: "410621",
+			text: "浚县"
+		}, {
+			value: "410622",
+			text: "淇县"
+		}, {
+			value: "410623",
+			text: "其它区"
+		}]
+	}, {
+		value: "410700",
+		text: "新乡市",
+		children: [{
+			value: "410702",
+			text: "红旗区"
+		}, {
+			value: "410703",
+			text: "卫滨区"
+		}, {
+			value: "410704",
+			text: "凤泉区"
+		}, {
+			value: "410711",
+			text: "牧野区"
+		}, {
+			value: "410721",
+			text: "新乡县"
+		}, {
+			value: "410724",
+			text: "获嘉县"
+		}, {
+			value: "410725",
+			text: "原阳县"
+		}, {
+			value: "410726",
+			text: "延津县"
+		}, {
+			value: "410727",
+			text: "封丘县"
+		}, {
+			value: "410728",
+			text: "长垣县"
+		}, {
+			value: "410781",
+			text: "卫辉市"
+		}, {
+			value: "410782",
+			text: "辉县市"
+		}, {
+			value: "410783",
+			text: "其它区"
+		}]
+	}, {
+		value: "410800",
+		text: "焦作市",
+		children: [{
+			value: "410802",
+			text: "解放区"
+		}, {
+			value: "410803",
+			text: "中站区"
+		}, {
+			value: "410804",
+			text: "马村区"
+		}, {
+			value: "410811",
+			text: "山阳区"
+		}, {
+			value: "410821",
+			text: "修武县"
+		}, {
+			value: "410822",
+			text: "博爱县"
+		}, {
+			value: "410823",
+			text: "武陟县"
+		}, {
+			value: "410825",
+			text: "温县"
+		}, {
+			value: "410882",
+			text: "沁阳市"
+		}, {
+			value: "410883",
+			text: "孟州市"
+		}, {
+			value: "410884",
+			text: "其它区"
+		}]
+	}, {
+		value: "410900",
+		text: "濮阳市",
+		children: [{
+			value: "410902",
+			text: "华龙区"
+		}, {
+			value: "410922",
+			text: "清丰县"
+		}, {
+			value: "410923",
+			text: "南乐县"
+		}, {
+			value: "410926",
+			text: "范县"
+		}, {
+			value: "410927",
+			text: "台前县"
+		}, {
+			value: "410928",
+			text: "濮阳县"
+		}, {
+			value: "410929",
+			text: "其它区"
+		}]
+	}, {
+		value: "411000",
+		text: "许昌市",
+		children: [{
+			value: "411002",
+			text: "魏都区"
+		}, {
+			value: "411023",
+			text: "许昌县"
+		}, {
+			value: "411024",
+			text: "鄢陵县"
+		}, {
+			value: "411025",
+			text: "襄城县"
+		}, {
+			value: "411081",
+			text: "禹州市"
+		}, {
+			value: "411082",
+			text: "长葛市"
+		}, {
+			value: "411083",
+			text: "其它区"
+		}]
+	}, {
+		value: "411100",
+		text: "漯河市",
+		children: [{
+			value: "411102",
+			text: "源汇区"
+		}, {
+			value: "411103",
+			text: "郾城区"
+		}, {
+			value: "411104",
+			text: "召陵区"
+		}, {
+			value: "411121",
+			text: "舞阳县"
+		}, {
+			value: "411122",
+			text: "临颍县"
+		}, {
+			value: "411123",
+			text: "其它区"
+		}]
+	}, {
+		value: "411200",
+		text: "三门峡市",
+		children: [{
+			value: "411202",
+			text: "湖滨区"
+		}, {
+			value: "411221",
+			text: "渑池县"
+		}, {
+			value: "411222",
+			text: "陕县"
+		}, {
+			value: "411224",
+			text: "卢氏县"
+		}, {
+			value: "411281",
+			text: "义马市"
+		}, {
+			value: "411282",
+			text: "灵宝市"
+		}, {
+			value: "411283",
+			text: "其它区"
+		}]
+	}, {
+		value: "411300",
+		text: "南阳市",
+		children: [{
+			value: "411302",
+			text: "宛城区"
+		}, {
+			value: "411303",
+			text: "卧龙区"
+		}, {
+			value: "411321",
+			text: "南召县"
+		}, {
+			value: "411322",
+			text: "方城县"
+		}, {
+			value: "411323",
+			text: "西峡县"
+		}, {
+			value: "411324",
+			text: "镇平县"
+		}, {
+			value: "411325",
+			text: "内乡县"
+		}, {
+			value: "411326",
+			text: "淅川县"
+		}, {
+			value: "411327",
+			text: "社旗县"
+		}, {
+			value: "411328",
+			text: "唐河县"
+		}, {
+			value: "411329",
+			text: "新野县"
+		}, {
+			value: "411330",
+			text: "桐柏县"
+		}, {
+			value: "411381",
+			text: "邓州市"
+		}, {
+			value: "411382",
+			text: "其它区"
+		}]
+	}, {
+		value: "411400",
+		text: "商丘市",
+		children: [{
+			value: "411402",
+			text: "梁园区"
+		}, {
+			value: "411403",
+			text: "睢阳区"
+		}, {
+			value: "411421",
+			text: "民权县"
+		}, {
+			value: "411422",
+			text: "睢县"
+		}, {
+			value: "411423",
+			text: "宁陵县"
+		}, {
+			value: "411424",
+			text: "柘城县"
+		}, {
+			value: "411425",
+			text: "虞城县"
+		}, {
+			value: "411426",
+			text: "夏邑县"
+		}, {
+			value: "411481",
+			text: "永城市"
+		}, {
+			value: "411482",
+			text: "其它区"
+		}]
+	}, {
+		value: "411500",
+		text: "信阳市",
+		children: [{
+			value: "411502",
+			text: "浉河区"
+		}, {
+			value: "411503",
+			text: "平桥区"
+		}, {
+			value: "411521",
+			text: "罗山县"
+		}, {
+			value: "411522",
+			text: "光山县"
+		}, {
+			value: "411523",
+			text: "新县"
+		}, {
+			value: "411524",
+			text: "商城县"
+		}, {
+			value: "411525",
+			text: "固始县"
+		}, {
+			value: "411526",
+			text: "潢川县"
+		}, {
+			value: "411527",
+			text: "淮滨县"
+		}, {
+			value: "411528",
+			text: "息县"
+		}, {
+			value: "411529",
+			text: "其它区"
+		}]
+	}, {
+		value: "411600",
+		text: "周口市",
+		children: [{
+			value: "411602",
+			text: "川汇区"
+		}, {
+			value: "411621",
+			text: "扶沟县"
+		}, {
+			value: "411622",
+			text: "西华县"
+		}, {
+			value: "411623",
+			text: "商水县"
+		}, {
+			value: "411624",
+			text: "沈丘县"
+		}, {
+			value: "411625",
+			text: "郸城县"
+		}, {
+			value: "411626",
+			text: "淮阳县"
+		}, {
+			value: "411627",
+			text: "太康县"
+		}, {
+			value: "411628",
+			text: "鹿邑县"
+		}, {
+			value: "411681",
+			text: "项城市"
+		}, {
+			value: "411682",
+			text: "其它区"
+		}]
+	}, {
+		value: "411700",
+		text: "驻马店市",
+		children: [{
+			value: "411702",
+			text: "驿城区"
+		}, {
+			value: "411721",
+			text: "西平县"
+		}, {
+			value: "411722",
+			text: "上蔡县"
+		}, {
+			value: "411723",
+			text: "平舆县"
+		}, {
+			value: "411724",
+			text: "正阳县"
+		}, {
+			value: "411725",
+			text: "确山县"
+		}, {
+			value: "411726",
+			text: "泌阳县"
+		}, {
+			value: "411727",
+			text: "汝南县"
+		}, {
+			value: "411628",
+			text: "遂平县"
+		}, {
+			value: "411729",
+			text: "新蔡县"
+		}]
+	}]
+}, {
+	value: '420000',
+	text: '湖北省',
+	children: [{
+		value: "420100",
+		text: "武汉市",
+		children: [{
+			value: "420102",
+			text: "江岸区"
+		}, {
+			value: "420103",
+			text: "江汉区"
+		}, {
+			value: "420104",
+			text: "硚口区"
+		}, {
+			value: "420105",
+			text: "汉阳区"
+		}, {
+			value: "420106",
+			text: "武昌区"
+		}, {
+			value: "420107",
+			text: "青山区"
+		}, {
+			value: "420111",
+			text: "洪山区"
+		}, {
+			value: "420112",
+			text: "东西湖区"
+		}, {
+			value: "420113",
+			text: "汉南区"
+		}, {
+			value: "420114",
+			text: "蔡甸区"
+		}, {
+			value: "420115",
+			text: "江夏区"
+		}, {
+			value: "420116",
+			text: "黄陂区"
+		}, {
+			value: "420117",
+			text: "新洲区"
+		}, {
+			value: "420118",
+			text: "其它区"
+		}]
+	}, {
+		value: "420200",
+		text: "黄石市",
+		children: [{
+			value: "420202",
+			text: "黄石港区"
+		}, {
+			value: "420203",
+			text: "西塞山区"
+		}, {
+			value: "420204",
+			text: "下陆区"
+		}, {
+			value: "420205",
+			text: "铁山区"
+		}, {
+			value: "420222",
+			text: "阳新县"
+		}, {
+			value: "420281",
+			text: "大冶市"
+		}, {
+			value: "420282",
+			text: "其它区"
+		}]
+	}, {
+		value: "420300",
+		text: "十堰市",
+		children: [{
+			value: "420302",
+			text: "茅箭区"
+		}, {
+			value: "420303",
+			text: "张湾区"
+		}, {
+			value: "420321",
+			text: "郧县"
+		}, {
+			value: "420322",
+			text: "郧西县"
+		}, {
+			value: "420323",
+			text: "竹山县"
+		}, {
+			value: "420324",
+			text: "竹溪县"
+		}, {
+			value: "420325",
+			text: "房县"
+		}, {
+			value: "420381",
+			text: "丹江口市"
+		}, {
+			value: "420382",
+			text: "城区"
+		}, {
+			value: "420383",
+			text: "其它区"
+		}]
+	}, {
+		value: "420500",
+		text: "宜昌市",
+		children: [{
+			value: "420502",
+			text: "西陵区"
+		}, {
+			value: "420503",
+			text: "伍家岗区"
+		}, {
+			value: "420504",
+			text: "点军区"
+		}, {
+			value: "420505",
+			text: "猇亭区"
+		}, {
+			value: "420506",
+			text: "夷陵区"
+		}, {
+			value: "420525",
+			text: "远安县"
+		}, {
+			value: "420526",
+			text: "兴山县"
+		}, {
+			value: "420527",
+			text: "秭归县"
+		}, {
+			value: "420528",
+			text: "长阳土家族自治县"
+		}, {
+			value: "420529",
+			text: "五峰土家族自治县"
+		}, {
+			value: "420551",
+			text: "葛洲坝区"
+		}, {
+			value: "420552",
+			text: "开发区"
+		}, {
+			value: "420581",
+			text: "宜都市"
+		}, {
+			value: "420582",
+			text: "当阳市"
+		}, {
+			value: "420583",
+			text: "枝江市"
+		}, {
+			value: "420584",
+			text: "其它区"
+		}]
+	}, {
+		value: "420600",
+		text: "襄阳市",
+		children: [{
+			value: "420602",
+			text: "襄城区"
+		}, {
+			value: "420606",
+			text: "樊城区"
+		}, {
+			value: "420607",
+			text: "襄州区"
+		}, {
+			value: "420624",
+			text: "南漳县"
+		}, {
+			value: "420625",
+			text: "谷城县"
+		}, {
+			value: "420626",
+			text: "保康县"
+		}, {
+			value: "420682",
+			text: "老河口市"
+		}, {
+			value: "420683",
+			text: "枣阳市"
+		}, {
+			value: "420684",
+			text: "宜城市"
+		}, {
+			value: "420685",
+			text: "其它区"
+		}]
+	}, {
+		value: "420700",
+		text: "鄂州市",
+		children: [{
+			value: "420702",
+			text: "梁子湖区"
+		}, {
+			value: "420703",
+			text: "华容区"
+		}, {
+			value: "420704",
+			text: "鄂城区"
+		}, {
+			value: "420705",
+			text: "其它区"
+		}]
+	}, {
+		value: "420800",
+		text: "荆门市",
+		children: [{
+			value: "420802",
+			text: "东宝区"
+		}, {
+			value: "420804",
+			text: "掇刀区"
+		}, {
+			value: "420821",
+			text: "京山县"
+		}, {
+			value: "420822",
+			text: "沙洋县"
+		}, {
+			value: "420881",
+			text: "钟祥市"
+		}, {
+			value: "420882",
+			text: "其它区"
+		}]
+	}, {
+		value: "420900",
+		text: "孝感市",
+		children: [{
+			value: "420902",
+			text: "孝南区"
+		}, {
+			value: "420921",
+			text: "孝昌县"
+		}, {
+			value: "420922",
+			text: "大悟县"
+		}, {
+			value: "420923",
+			text: "云梦县"
+		}, {
+			value: "420981",
+			text: "应城市"
+		}, {
+			value: "420982",
+			text: "安陆市"
+		}, {
+			value: "420984",
+			text: "汉川市"
+		}, {
+			value: "420985",
+			text: "其它区"
+		}]
+	}, {
+		value: "421000",
+		text: "荆州市",
+		children: [{
+			value: "421002",
+			text: "沙市区"
+		}, {
+			value: "421003",
+			text: "荆州区"
+		}, {
+			value: "421022",
+			text: "公安县"
+		}, {
+			value: "421023",
+			text: "监利县"
+		}, {
+			value: "421024",
+			text: "江陵县"
+		}, {
+			value: "421081",
+			text: "石首市"
+		}, {
+			value: "421083",
+			text: "洪湖市"
+		}, {
+			value: "421087",
+			text: "松滋市"
+		}, {
+			value: "421088",
+			text: "其它区"
+		}]
+	}, {
+		value: "421100",
+		text: "黄冈市",
+		children: [{
+			value: "421102",
+			text: "黄州区"
+		}, {
+			value: "421121",
+			text: "团风县"
+		}, {
+			value: "421122",
+			text: "红安县"
+		}, {
+			value: "421123",
+			text: "罗田县"
+		}, {
+			value: "421124",
+			text: "英山县"
+		}, {
+			value: "421125",
+			text: "浠水县"
+		}, {
+			value: "421126",
+			text: "蕲春县"
+		}, {
+			value: "421127",
+			text: "黄梅县"
+		}, {
+			value: "421181",
+			text: "麻城市"
+		}, {
+			value: "421182",
+			text: "武穴市"
+		}, {
+			value: "421183",
+			text: "其它区"
+		}]
+	}, {
+		value: "421200",
+		text: "咸宁市",
+		children: [{
+			value: "421202",
+			text: "咸安区"
+		}, {
+			value: "421221",
+			text: "嘉鱼县"
+		}, {
+			value: "421222",
+			text: "通城县"
+		}, {
+			value: "421223",
+			text: "崇阳县"
+		}, {
+			value: "421224",
+			text: "通山县"
+		}, {
+			value: "421281",
+			text: "赤壁市"
+		}, {
+			value: "421282",
+			text: "温泉城区"
+		}, {
+			value: "421283",
+			text: "其它区"
+		}]
+	}, {
+		value: "421300",
+		text: "随州市",
+		children: [{
+			value: "421302",
+			text: "曾都区"
+		}, {
+			value: "421321",
+			text: "随县"
+		}, {
+			value: "421381",
+			text: "广水市"
+		}, {
+			value: "421382",
+			text: "其它区"
+		}]
+	}, {
+		value: "422800",
+		text: "恩施土家族苗族自治州",
+		children: [{
+			value: "422801",
+			text: "恩施市"
+		}, {
+			value: "422802",
+			text: "利川市"
+		}, {
+			value: "422822",
+			text: "建始县"
+		}, {
+			value: "422823",
+			text: "巴东县"
+		}, {
+			value: "422825",
+			text: "宣恩县"
+		}, {
+			value: "422826",
+			text: "咸丰县"
+		}, {
+			value: "422827",
+			text: "来凤县"
+		}, {
+			value: "422828",
+			text: "鹤峰县"
+		}, {
+			value: "422829",
+			text: "其它区"
+		}]
+	}, {
+		value: "429004",
+		text: "仙桃市"
+	}, {
+		value: "429005",
+		text: "潜江市"
+	}, {
+		value: "429006",
+		text: "天门市"
+	}, {
+		value: "429021",
+		text: "神农架林区"
+	}]
+}, {
+	value: '430000',
+	text: '湖南省',
+	children: [{
+		value: "430100",
+		text: "长沙市",
+		children: [{
+			value: "430102",
+			text: "芙蓉区"
+		}, {
+			value: "430103",
+			text: "天心区"
+		}, {
+			value: "430104",
+			text: "岳麓区"
+		}, {
+			value: "430105",
+			text: "开福区"
+		}, {
+			value: "430111",
+			text: "雨花区"
+		}, {
+			value: "430121",
+			text: "长沙县"
+		}, {
+			value: "430122",
+			text: "望城县"
+		}, {
+			value: "430124",
+			text: "宁乡县"
+		}, {
+			value: "430181",
+			text: "浏阳市"
+		}, {
+			value: "430182",
+			text: "其它区"
+		}]
+	}, {
+		value: "430200",
+		text: "株洲市",
+		children: [{
+			value: "430202",
+			text: "荷塘区"
+		}, {
+			value: "430203",
+			text: "芦淞区"
+		}, {
+			value: "430204",
+			text: "石峰区"
+		}, {
+			value: "430211",
+			text: "天元区"
+		}, {
+			value: "430221",
+			text: "株洲县"
+		}, {
+			value: "430223",
+			text: "攸县"
+		}, {
+			value: "430224",
+			text: "茶陵县"
+		}, {
+			value: "430225",
+			text: "炎陵县"
+		}, {
+			value: "430281",
+			text: "醴陵市"
+		}, {
+			value: "430282",
+			text: "其它区"
+		}]
+	}, {
+		value: "430300",
+		text: "湘潭市",
+		children: [{
+			value: "430302",
+			text: "雨湖区"
+		}, {
+			value: "430304",
+			text: "岳塘区"
+		}, {
+			value: "430321",
+			text: "湘潭县"
+		}, {
+			value: "430381",
+			text: "湘乡市"
+		}, {
+			value: "430382",
+			text: "韶山市"
+		}, {
+			value: "430383",
+			text: "其它区"
+		}]
+	}, {
+		value: "430400",
+		text: "衡阳市",
+		children: [{
+			value: "430405",
+			text: "珠晖区"
+		}, {
+			value: "430406",
+			text: "雁峰区"
+		}, {
+			value: "430407",
+			text: "石鼓区"
+		}, {
+			value: "430408",
+			text: "蒸湘区"
+		}, {
+			value: "430412",
+			text: "南岳区"
+		}, {
+			value: "430421",
+			text: "衡阳县"
+		}, {
+			value: "430422",
+			text: "衡南县"
+		}, {
+			value: "430423",
+			text: "衡山县"
+		}, {
+			value: "430424",
+			text: "衡东县"
+		}, {
+			value: "430426",
+			text: "祁东县"
+		}, {
+			value: "430481",
+			text: "耒阳市"
+		}, {
+			value: "430482",
+			text: "常宁市"
+		}, {
+			value: "430483",
+			text: "其它区"
+		}]
+	}, {
+		value: "430500",
+		text: "邵阳市",
+		children: [{
+			value: "430502",
+			text: "双清区"
+		}, {
+			value: "430503",
+			text: "大祥区"
+		}, {
+			value: "430511",
+			text: "北塔区"
+		}, {
+			value: "430521",
+			text: "邵东县"
+		}, {
+			value: "430522",
+			text: "新邵县"
+		}, {
+			value: "430523",
+			text: "邵阳县"
+		}, {
+			value: "430524",
+			text: "隆回县"
+		}, {
+			value: "430525",
+			text: "洞口县"
+		}, {
+			value: "430527",
+			text: "绥宁县"
+		}, {
+			value: "430528",
+			text: "新宁县"
+		}, {
+			value: "430529",
+			text: "城步苗族自治县"
+		}, {
+			value: "430581",
+			text: "武冈市"
+		}, {
+			value: "430582",
+			text: "其它区"
+		}]
+	}, {
+		value: "430600",
+		text: "岳阳市",
+		children: [{
+			value: "430602",
+			text: "岳阳楼区"
+		}, {
+			value: "430603",
+			text: "云溪区"
+		}, {
+			value: "430611",
+			text: "君山区"
+		}, {
+			value: "430621",
+			text: "岳阳县"
+		}, {
+			value: "430623",
+			text: "华容县"
+		}, {
+			value: "430624",
+			text: "湘阴县"
+		}, {
+			value: "430626",
+			text: "平江县"
+		}, {
+			value: "430681",
+			text: "汨罗市"
+		}, {
+			value: "430682",
+			text: "临湘市"
+		}, {
+			value: "430683",
+			text: "其它区"
+		}]
+	}, {
+		value: "430700",
+		text: "常德市",
+		children: [{
+			value: "430702",
+			text: "武陵区"
+		}, {
+			value: "430703",
+			text: "鼎城区"
+		}, {
+			value: "430721",
+			text: "安乡县"
+		}, {
+			value: "430722",
+			text: "汉寿县"
+		}, {
+			value: "430723",
+			text: "澧县"
+		}, {
+			value: "430724",
+			text: "临澧县"
+		}, {
+			value: "430725",
+			text: "桃源县"
+		}, {
+			value: "430726",
+			text: "石门县"
+		}, {
+			value: "430781",
+			text: "津市市"
+		}, {
+			value: "430782",
+			text: "其它区"
+		}]
+	}, {
+		value: "430800",
+		text: "张家界市",
+		children: [{
+			value: "430802",
+			text: "永定区"
+		}, {
+			value: "430811",
+			text: "武陵源区"
+		}, {
+			value: "430821",
+			text: "慈利县"
+		}, {
+			value: "430822",
+			text: "桑植县"
+		}, {
+			value: "430823",
+			text: "其它区"
+		}]
+	}, {
+		value: "430900",
+		text: "益阳市",
+		children: [{
+			value: "430902",
+			text: "资阳区"
+		}, {
+			value: "430903",
+			text: "赫山区"
+		}, {
+			value: "430921",
+			text: "南县"
+		}, {
+			value: "430922",
+			text: "桃江县"
+		}, {
+			value: "430923",
+			text: "安化县"
+		}, {
+			value: "430981",
+			text: "沅江市"
+		}, {
+			value: "430982",
+			text: "其它区"
+		}]
+	}, {
+		value: "431000",
+		text: "郴州市",
+		children: [{
+			value: "431002",
+			text: "北湖区"
+		}, {
+			value: "431003",
+			text: "苏仙区"
+		}, {
+			value: "431021",
+			text: "桂阳县"
+		}, {
+			value: "431022",
+			text: "宜章县"
+		}, {
+			value: "431023",
+			text: "永兴县"
+		}, {
+			value: "431024",
+			text: "嘉禾县"
+		}, {
+			value: "431025",
+			text: "临武县"
+		}, {
+			value: "431026",
+			text: "汝城县"
+		}, {
+			value: "431027",
+			text: "桂东县"
+		}, {
+			value: "431028",
+			text: "安仁县"
+		}, {
+			value: "431081",
+			text: "资兴市"
+		}, {
+			value: "431082",
+			text: "其它区"
+		}]
+	}, {
+		value: "431100",
+		text: "永州市",
+		children: [{
+			value: "431102",
+			text: "零陵区"
+		}, {
+			value: "431103",
+			text: "冷水滩区"
+		}, {
+			value: "431121",
+			text: "祁阳县"
+		}, {
+			value: "431122",
+			text: "东安县"
+		}, {
+			value: "431123",
+			text: "双牌县"
+		}, {
+			value: "431124",
+			text: "道县"
+		}, {
+			value: "431125",
+			text: "江永县"
+		}, {
+			value: "431126",
+			text: "宁远县"
+		}, {
+			value: "431127",
+			text: "蓝山县"
+		}, {
+			value: "431128",
+			text: "新田县"
+		}, {
+			value: "431129",
+			text: "江华瑶族自治县"
+		}, {
+			value: "431130",
+			text: "其它区"
+		}]
+	}, {
+		value: "431200",
+		text: "怀化市",
+		children: [{
+			value: "431202",
+			text: "鹤城区"
+		}, {
+			value: "431221",
+			text: "中方县"
+		}, {
+			value: "431222",
+			text: "沅陵县"
+		}, {
+			value: "431223",
+			text: "辰溪县"
+		}, {
+			value: "431224",
+			text: "溆浦县"
+		}, {
+			value: "431225",
+			text: "会同县"
+		}, {
+			value: "431226",
+			text: "麻阳苗族自治县"
+		}, {
+			value: "431227",
+			text: "新晃侗族自治县"
+		}, {
+			value: "431228",
+			text: "芷江侗族自治县"
+		}, {
+			value: "431229",
+			text: "靖州苗族侗族自治县"
+		}, {
+			value: "431230",
+			text: "通道侗族自治县"
+		}, {
+			value: "431281",
+			text: "洪江市"
+		}, {
+			value: "431282",
+			text: "其它区"
+		}]
+	}, {
+		value: "431300",
+		text: "娄底市",
+		children: [{
+			value: "431302",
+			text: "娄星区"
+		}, {
+			value: "431321",
+			text: "双峰县"
+		}, {
+			value: "431322",
+			text: "新化县"
+		}, {
+			value: "431381",
+			text: "冷水江市"
+		}, {
+			value: "431382",
+			text: "涟源市"
+		}, {
+			value: "431383",
+			text: "其它区"
+		}]
+	}, {
+		value: "433100",
+		text: "湘西土家族苗族自治州",
+		children: [{
+			value: "433101",
+			text: "吉首市"
+		}, {
+			value: "433122",
+			text: "泸溪县"
+		}, {
+			value: "433123",
+			text: "凤凰县"
+		}, {
+			value: "433124",
+			text: "花垣县"
+		}, {
+			value: "433125",
+			text: "保靖县"
+		}, {
+			value: "433126",
+			text: "古丈县"
+		}, {
+			value: "433127",
+			text: "永顺县"
+		}, {
+			value: "433130",
+			text: "龙山县"
+		}, {
+			value: "433131",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '440000',
+	text: '广东省',
+	children: [{
+		value: "440100",
+		text: "广州市",
+		children: [{
+			value: "440103",
+			text: "荔湾区"
+		}, {
+			value: "440104",
+			text: "越秀区"
+		}, {
+			value: "440105",
+			text: "海珠区"
+		}, {
+			value: "440106",
+			text: "天河区"
+		}, {
+			value: "440111",
+			text: "白云区"
+		}, {
+			value: "440112",
+			text: "黄埔区"
+		}, {
+			value: "440113",
+			text: "番禺区"
+		}, {
+			value: "440114",
+			text: "花都区"
+		}, {
+			value: "440115",
+			text: "南沙区"
+		}, {
+			value: "440116",
+			text: "萝岗区"
+		}, {
+			value: "440183",
+			text: "增城市"
+		}, {
+			value: "440184",
+			text: "从化市"
+		}, {
+			value: "440188",
+			text: "东山区"
+		}, {
+			value: "440189",
+			text: "其它区"
+		}]
+	}, {
+		value: "440200",
+		text: "韶关市",
+		children: [{
+			value: "440203",
+			text: "武江区"
+		}, {
+			value: "440204",
+			text: "浈江区"
+		}, {
+			value: "440205",
+			text: "曲江区"
+		}, {
+			value: "440222",
+			text: "始兴县"
+		}, {
+			value: "440224",
+			text: "仁化县"
+		}, {
+			value: "440229",
+			text: "翁源县"
+		}, {
+			value: "440232",
+			text: "乳源瑶族自治县"
+		}, {
+			value: "440233",
+			text: "新丰县"
+		}, {
+			value: "440281",
+			text: "乐昌市"
+		}, {
+			value: "440282",
+			text: "南雄市"
+		}, {
+			value: "440283",
+			text: "其它区"
+		}]
+	}, {
+		value: "440300",
+		text: "深圳市",
+		children: [{
+			value: "440303",
+			text: "罗湖区"
+		}, {
+			value: "440304",
+			text: "福田区"
+		}, {
+			value: "440305",
+			text: "南山区"
+		}, {
+			value: "440306",
+			text: "宝安区"
+		}, {
+			value: "440307",
+			text: "龙岗区"
+		}, {
+			value: "440308",
+			text: "盐田区"
+		}, {
+			value: "440309",
+			text: "其它区"
+		}]
+	}, {
+		value: "440400",
+		text: "珠海市",
+		children: [{
+			value: "440402",
+			text: "香洲区"
+		}, {
+			value: "440403",
+			text: "斗门区"
+		}, {
+			value: "440404",
+			text: "金湾区"
+		}, {
+			value: "440486",
+			text: "金唐区"
+		}, {
+			value: "440487",
+			text: "南湾区"
+		}, {
+			value: "440488",
+			text: "其它区"
+		}]
+	}, {
+		value: "440500",
+		text: "汕头市",
+		children: [{
+			value: "440507",
+			text: "龙湖区"
+		}, {
+			value: "440511",
+			text: "金平区"
+		}, {
+			value: "440512",
+			text: "濠江区"
+		}, {
+			value: "440513",
+			text: "潮阳区"
+		}, {
+			value: "440514",
+			text: "潮南区"
+		}, {
+			value: "440515",
+			text: "澄海区"
+		}, {
+			value: "440523",
+			text: "南澳县"
+		}, {
+			value: "440524",
+			text: "其它区"
+		}]
+	}, {
+		value: "440600",
+		text: "佛山市",
+		children: [{
+			value: "440604",
+			text: "禅城区"
+		}, {
+			value: "440605",
+			text: "南海区"
+		}, {
+			value: "440606",
+			text: "顺德区"
+		}, {
+			value: "440607",
+			text: "三水区"
+		}, {
+			value: "440608",
+			text: "高明区"
+		}, {
+			value: "440609",
+			text: "其它区"
+		}]
+	}, {
+		value: "440700",
+		text: "江门市",
+		children: [{
+			value: "440703",
+			text: "蓬江区"
+		}, {
+			value: "440704",
+			text: "江海区"
+		}, {
+			value: "440705",
+			text: "新会区"
+		}, {
+			value: "440781",
+			text: "台山市"
+		}, {
+			value: "440783",
+			text: "开平市"
+		}, {
+			value: "440784",
+			text: "鹤山市"
+		}, {
+			value: "440785",
+			text: "恩平市"
+		}, {
+			value: "440786",
+			text: "其它区"
+		}]
+	}, {
+		value: "440800",
+		text: "湛江市",
+		children: [{
+			value: "440802",
+			text: "赤坎区"
+		}, {
+			value: "440803",
+			text: "霞山区"
+		}, {
+			value: "440804",
+			text: "坡头区"
+		}, {
+			value: "440811",
+			text: "麻章区"
+		}, {
+			value: "440823",
+			text: "遂溪县"
+		}, {
+			value: "440825",
+			text: "徐闻县"
+		}, {
+			value: "440881",
+			text: "廉江市"
+		}, {
+			value: "440882",
+			text: "雷州市"
+		}, {
+			value: "440883",
+			text: "吴川市"
+		}, {
+			value: "440884",
+			text: "其它区"
+		}]
+	}, {
+		value: "440900",
+		text: "茂名市",
+		children: [{
+			value: "440902",
+			text: "茂南区"
+		}, {
+			value: "440903",
+			text: "茂港区"
+		}, {
+			value: "440923",
+			text: "电白县"
+		}, {
+			value: "440981",
+			text: "高州市"
+		}, {
+			value: "440982",
+			text: "化州市"
+		}, {
+			value: "440983",
+			text: "信宜市"
+		}, {
+			value: "440984",
+			text: "其它区"
+		}]
+	}, {
+		value: "441200",
+		text: "肇庆市",
+		children: [{
+			value: "441202",
+			text: "端州区"
+		}, {
+			value: "441203",
+			text: "鼎湖区"
+		}, {
+			value: "441223",
+			text: "广宁县"
+		}, {
+			value: "441224",
+			text: "怀集县"
+		}, {
+			value: "441225",
+			text: "封开县"
+		}, {
+			value: "441226",
+			text: "德庆县"
+		}, {
+			value: "441283",
+			text: "高要市"
+		}, {
+			value: "441284",
+			text: "四会市"
+		}, {
+			value: "441285",
+			text: "其它区"
+		}]
+	}, {
+		value: "441300",
+		text: "惠州市",
+		children: [{
+			value: "441302",
+			text: "惠城区"
+		}, {
+			value: "441303",
+			text: "惠阳区"
+		}, {
+			value: "441322",
+			text: "博罗县"
+		}, {
+			value: "441323",
+			text: "惠东县"
+		}, {
+			value: "441324",
+			text: "龙门县"
+		}, {
+			value: "441325",
+			text: "其它区"
+		}]
+	}, {
+		value: "441400",
+		text: "梅州市",
+		children: [{
+			value: "441402",
+			text: "梅江区"
+		}, {
+			value: "441421",
+			text: "梅县"
+		}, {
+			value: "441422",
+			text: "大埔县"
+		}, {
+			value: "441423",
+			text: "丰顺县"
+		}, {
+			value: "441424",
+			text: "五华县"
+		}, {
+			value: "441426",
+			text: "平远县"
+		}, {
+			value: "441427",
+			text: "蕉岭县"
+		}, {
+			value: "441481",
+			text: "兴宁市"
+		}, {
+			value: "441482",
+			text: "其它区"
+		}]
+	}, {
+		value: "441500",
+		text: "汕尾市",
+		children: [{
+			value: "441502",
+			text: "城区"
+		}, {
+			value: "441521",
+			text: "海丰县"
+		}, {
+			value: "441523",
+			text: "陆河县"
+		}, {
+			value: "441581",
+			text: "陆丰市"
+		}, {
+			value: "441582",
+			text: "其它区"
+		}]
+	}, {
+		value: "441600",
+		text: "河源市",
+		children: [{
+			value: "441602",
+			text: "源城区"
+		}, {
+			value: "441621",
+			text: "紫金县"
+		}, {
+			value: "441622",
+			text: "龙川县"
+		}, {
+			value: "441623",
+			text: "连平县"
+		}, {
+			value: "441624",
+			text: "和平县"
+		}, {
+			value: "441625",
+			text: "东源县"
+		}, {
+			value: "441626",
+			text: "其它区"
+		}]
+	}, {
+		value: "441700",
+		text: "阳江市",
+		children: [{
+			value: "441702",
+			text: "江城区"
+		}, {
+			value: "441721",
+			text: "阳西县"
+		}, {
+			value: "441723",
+			text: "阳东县"
+		}, {
+			value: "441781",
+			text: "阳春市"
+		}, {
+			value: "441782",
+			text: "其它区"
+		}]
+	}, {
+		value: "441800",
+		text: "清远市",
+		children: [{
+			value: "441802",
+			text: "清城区"
+		}, {
+			value: "441821",
+			text: "佛冈县"
+		}, {
+			value: "441823",
+			text: "阳山县"
+		}, {
+			value: "441825",
+			text: "连山壮族瑶族自治县"
+		}, {
+			value: "441826",
+			text: "连南瑶族自治县"
+		}, {
+			value: "441827",
+			text: "清新县"
+		}, {
+			value: "441881",
+			text: "英德市"
+		}, {
+			value: "441882",
+			text: "连州市"
+		}, {
+			value: "441883",
+			text: "其它区"
+		}]
+	}, {
+		value: "441900",
+		text: "东莞市"
+	}, {
+		value: "442000",
+		text: "中山市"
+	}, {
+		value: "445100",
+		text: "潮州市",
+		children: [{
+			value: "445102",
+			text: "湘桥区"
+		}, {
+			value: "445121",
+			text: "潮安县"
+		}, {
+			value: "445122",
+			text: "饶平县"
+		}, {
+			value: "445185",
+			text: "枫溪区"
+		}, {
+			value: "445186",
+			text: "其它区"
+		}]
+	}, {
+		value: "445200",
+		text: "揭阳市",
+		children: [{
+			value: "445202",
+			text: "榕城区"
+		}, {
+			value: "445221",
+			text: "揭东县"
+		}, {
+			value: "445222",
+			text: "揭西县"
+		}, {
+			value: "445224",
+			text: "惠来县"
+		}, {
+			value: "445281",
+			text: "普宁市"
+		}, {
+			value: "445284",
+			text: "东山区"
+		}, {
+			value: "445285",
+			text: "其它区"
+		}]
+	}, {
+		value: "445300",
+		text: "云浮市",
+		children: [{
+			value: "445302",
+			text: "云城区"
+		}, {
+			value: "445321",
+			text: "新兴县"
+		}, {
+			value: "445322",
+			text: "郁南县"
+		}, {
+			value: "445323",
+			text: "云安县"
+		}, {
+			value: "445381",
+			text: "罗定市"
+		}, {
+			value: "445382",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '450000',
+	text: '广西壮族',
+	children: [{
+		value: "450100",
+		text: "南宁市",
+		children: [{
+			value: "450102",
+			text: "兴宁区"
+		}, {
+			value: "450103",
+			text: "青秀区"
+		}, {
+			value: "450105",
+			text: "江南区"
+		}, {
+			value: "450107",
+			text: "西乡塘区"
+		}, {
+			value: "450108",
+			text: "良庆区"
+		}, {
+			value: "450109",
+			text: "邕宁区"
+		}, {
+			value: "450122",
+			text: "武鸣县"
+		}, {
+			value: "450123",
+			text: "隆安县"
+		}, {
+			value: "450124",
+			text: "马山县"
+		}, {
+			value: "450125",
+			text: "上林县"
+		}, {
+			value: "450126",
+			text: "宾阳县"
+		}, {
+			value: "450127",
+			text: "横县"
+		}, {
+			value: "450128",
+			text: "其它区"
+		}]
+	}, {
+		value: "450200",
+		text: "柳州市",
+		children: [{
+			value: "450202",
+			text: "城中区"
+		}, {
+			value: "450203",
+			text: "鱼峰区"
+		}, {
+			value: "450204",
+			text: "柳南区"
+		}, {
+			value: "450205",
+			text: "柳北区"
+		}, {
+			value: "450221",
+			text: "柳江县"
+		}, {
+			value: "450222",
+			text: "柳城县"
+		}, {
+			value: "450223",
+			text: "鹿寨县"
+		}, {
+			value: "450224",
+			text: "融安县"
+		}, {
+			value: "450225",
+			text: "融水苗族自治县"
+		}, {
+			value: "450226",
+			text: "三江侗族自治县"
+		}, {
+			value: "450227",
+			text: "其它区"
+		}]
+	}, {
+		value: "450300",
+		text: "桂林市",
+		children: [{
+			value: "450302",
+			text: "秀峰区"
+		}, {
+			value: "450303",
+			text: "叠彩区"
+		}, {
+			value: "450304",
+			text: "象山区"
+		}, {
+			value: "450305",
+			text: "七星区"
+		}, {
+			value: "450311",
+			text: "雁山区"
+		}, {
+			value: "450321",
+			text: "阳朔县"
+		}, {
+			value: "450322",
+			text: "临桂县"
+		}, {
+			value: "450323",
+			text: "灵川县"
+		}, {
+			value: "450324",
+			text: "全州县"
+		}, {
+			value: "450325",
+			text: "兴安县"
+		}, {
+			value: "450326",
+			text: "永福县"
+		}, {
+			value: "450327",
+			text: "灌阳县"
+		}, {
+			value: "450328",
+			text: "龙胜各族自治县"
+		}, {
+			value: "450329",
+			text: "资源县"
+		}, {
+			value: "450330",
+			text: "平乐县"
+		}, {
+			value: "450331",
+			text: "荔浦县"
+		}, {
+			value: "450332",
+			text: "恭城瑶族自治县"
+		}, {
+			value: "450333",
+			text: "其它区"
+		}]
+	}, {
+		value: "450400",
+		text: "梧州市",
+		children: [{
+			value: "450403",
+			text: "万秀区"
+		}, {
+			value: "450404",
+			text: "蝶山区"
+		}, {
+			value: "450405",
+			text: "长洲区"
+		}, {
+			value: "450421",
+			text: "苍梧县"
+		}, {
+			value: "450422",
+			text: "藤县"
+		}, {
+			value: "450423",
+			text: "蒙山县"
+		}, {
+			value: "450481",
+			text: "岑溪市"
+		}, {
+			value: "450482",
+			text: "其它区"
+		}]
+	}, {
+		value: "450500",
+		text: "北海市",
+		children: [{
+			value: "450502",
+			text: "海城区"
+		}, {
+			value: "450503",
+			text: "银海区"
+		}, {
+			value: "450512",
+			text: "铁山港区"
+		}, {
+			value: "450521",
+			text: "合浦县"
+		}, {
+			value: "450522",
+			text: "其它区"
+		}]
+	}, {
+		value: "450600",
+		text: "防城港市",
+		children: [{
+			value: "450602",
+			text: "港口区"
+		}, {
+			value: "450603",
+			text: "防城区"
+		}, {
+			value: "450621",
+			text: "上思县"
+		}, {
+			value: "450681",
+			text: "东兴市"
+		}, {
+			value: "450682",
+			text: "其它区"
+		}]
+	}, {
+		value: "450700",
+		text: "钦州市",
+		children: [{
+			value: "450702",
+			text: "钦南区"
+		}, {
+			value: "450703",
+			text: "钦北区"
+		}, {
+			value: "450721",
+			text: "灵山县"
+		}, {
+			value: "450722",
+			text: "浦北县"
+		}, {
+			value: "450723",
+			text: "其它区"
+		}]
+	}, {
+		value: "450800",
+		text: "贵港市",
+		children: [{
+			value: "450802",
+			text: "港北区"
+		}, {
+			value: "450803",
+			text: "港南区"
+		}, {
+			value: "450804",
+			text: "覃塘区"
+		}, {
+			value: "450821",
+			text: "平南县"
+		}, {
+			value: "450881",
+			text: "桂平市"
+		}, {
+			value: "450882",
+			text: "其它区"
+		}]
+	}, {
+		value: "450900",
+		text: "玉林市",
+		children: [{
+			value: "450902",
+			text: "玉州区"
+		}, {
+			value: "450921",
+			text: "容县"
+		}, {
+			value: "450922",
+			text: "陆川县"
+		}, {
+			value: "450923",
+			text: "博白县"
+		}, {
+			value: "450924",
+			text: "兴业县"
+		}, {
+			value: "450981",
+			text: "北流市"
+		}, {
+			value: "450982",
+			text: "其它区"
+		}]
+	}, {
+		value: "451000",
+		text: "百色市",
+		children: [{
+			value: "451002",
+			text: "右江区"
+		}, {
+			value: "451021",
+			text: "田阳县"
+		}, {
+			value: "451022",
+			text: "田东县"
+		}, {
+			value: "451023",
+			text: "平果县"
+		}, {
+			value: "451024",
+			text: "德保县"
+		}, {
+			value: "451025",
+			text: "靖西县"
+		}, {
+			value: "451026",
+			text: "那坡县"
+		}, {
+			value: "451027",
+			text: "凌云县"
+		}, {
+			value: "451028",
+			text: "乐业县"
+		}, {
+			value: "451029",
+			text: "田林县"
+		}, {
+			value: "451030",
+			text: "西林县"
+		}, {
+			value: "451031",
+			text: "隆林各族自治县"
+		}, {
+			value: "451032",
+			text: "其它区"
+		}]
+	}, {
+		value: "451100",
+		text: "贺州市",
+		children: [{
+				value: "451102",
+				text: "八步区"
+			}, {
+				value: "451121",
+				text: "昭平县"
+			}, {
+				value: "451122",
+				text: "钟山县"
+			}, {
+				value: "451123",
+				text: "富川瑶族自治县"
+			},
+
+			{
+				value: "451124",
+				text: "其它区"
+			}
+		]
+	}, {
+		value: "451200",
+		text: "河池市",
+		children: [{
+			value: "451202",
+			text: "金城江区"
+		}, {
+			value: "451221",
+			text: "南丹县"
+		}, {
+			value: "451222",
+			text: "天峨县"
+		}, {
+			value: "451223",
+			text: "凤山县"
+		}, {
+			value: "451224",
+			text: "东兰县"
+		}, {
+			value: "451225",
+			text: "罗城仫佬族自治县"
+		}, {
+			value: "451226",
+			text: "环江毛南族自治县"
+		}, {
+			value: "451227",
+			text: "巴马瑶族自治县"
+		}, {
+			value: "451228",
+			text: "都安瑶族自治县"
+		}, {
+			value: "451229",
+			text: "大化瑶族自治县"
+		}, {
+			value: "451281",
+			text: "宜州市"
+		}, {
+			value: "451282",
+			text: "其它区"
+		}]
+	}, {
+		value: "451300",
+		text: "来宾市",
+		children: [{
+			value: "451302",
+			text: "兴宾区"
+		}, {
+			value: "451321",
+			text: "忻城县"
+		}, {
+			value: "451322",
+			text: "象州县"
+		}, {
+			value: "451323",
+			text: "武宣县"
+		}, {
+			value: "451324",
+			text: "金秀瑶族自治县"
+		}, {
+			value: "451381",
+			text: "合山市"
+		}, {
+			value: "451382",
+			text: "其它区"
+		}]
+	}, {
+		value: "451400",
+		text: "崇左市",
+		children: [{
+			value: "451402",
+			text: "江洲区"
+		}, {
+			value: "451421",
+			text: "扶绥县"
+		}, {
+			value: "451422",
+			text: "宁明县"
+		}, {
+			value: "451423",
+			text: "龙州县"
+		}, {
+			value: "451424",
+			text: "大新县"
+		}, {
+			value: "451425",
+			text: "天等县"
+		}, {
+			value: "451481",
+			text: "凭祥市"
+		}, {
+			value: "451482",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '460000',
+	text: '海南省',
+	children: [{
+		value: "460100",
+		text: "海口市",
+		children: [{
+			value: "460105",
+			text: "秀英区"
+		}, {
+			value: "460106",
+			text: "龙华区"
+		}, {
+			value: "460107",
+			text: "琼山区"
+		}, {
+			value: "460108",
+			text: "美兰区"
+		}, {
+			value: "460109",
+			text: "其它区"
+		}]
+	}, {
+		value: "460200",
+		text: "三亚市"
+	}, {
+		value: "469001",
+		text: "五指山市"
+	}, {
+		value: "469002",
+		text: "琼海市"
+	}, {
+		value: "469003",
+		text: "儋州市"
+	}, {
+		value: "469005",
+		text: "文昌市"
+	}, {
+		value: "469006",
+		text: "万宁市"
+	}, {
+		value: "469007",
+		text: "东方市"
+	}, {
+		value: "469025",
+		text: "定安县"
+	}, {
+		value: "469026",
+		text: "屯昌县"
+	}, {
+		value: "469027",
+		text: "澄迈县"
+	}, {
+		value: "469028",
+		text: "临高县"
+	}, {
+		value: "469030",
+		text: "白沙黎族自治县"
+	}, {
+		value: "469031",
+		text: "昌江黎族自治县"
+	}, {
+		value: "469033",
+		text: "乐东黎族自治县"
+	}, {
+		value: "469034",
+		text: "陵水黎族自治县"
+	}, {
+		value: "469035",
+		text: "保亭黎族苗族自治县"
+	}, {
+		value: "469036",
+		text: "琼中黎族苗族自治县"
+	}, {
+		value: "469037",
+		text: "西沙群岛"
+	}, {
+		value: "469038",
+		text: "南沙群岛"
+	}, {
+		value: "469039",
+		text: "中沙群岛的岛礁及其海域"
+	}]
+}, {
+	value: '500000',
+	text: '重庆',
+	children: [{
+		value: '500000',
+		text: '重庆',
+		children: [{
+			value: "500101",
+			text: "万州区"
+		}, {
+			value: "500102",
+			text: "涪陵区"
+		}, {
+			value: "500103",
+			text: "渝中区"
+		}, {
+			value: "500104",
+			text: "大渡口区"
+		}, {
+			value: "500105",
+			text: "江北区"
+		}, {
+			value: "500106",
+			text: "沙坪坝区"
+		}, {
+			value: "500107",
+			text: "九龙坡区"
+		}, {
+			value: "500108",
+			text: "南岸区"
+		}, {
+			value: "500109",
+			text: "北碚区"
+		}, {
+			value: "500110",
+			text: "万盛区"
+		}, {
+			value: "500111",
+			text: "双桥区"
+		}, {
+			value: "500112",
+			text: "渝北区"
+		}, {
+			value: "500113",
+			text: "巴南区"
+		}, {
+			value: "500114",
+			text: "黔江区"
+		}, {
+			value: "500115",
+			text: "长寿区"
+		}, {
+			value: "500222",
+			text: "綦江县"
+		}, {
+			value: "500223",
+			text: "潼南县"
+		}, {
+			value: "500224",
+			text: "铜梁县"
+		}, {
+			value: "500225",
+			text: "大足县"
+		}, {
+			value: "500226",
+			text: "荣昌县"
+		}, {
+			value: "500227",
+			text: "璧山县"
+		}, {
+			value: "500228",
+			text: "梁平县"
+		}, {
+			value: "500229",
+			text: "城口县"
+		}, {
+			value: "500230",
+			text: "丰都县"
+		}, {
+			value: "500231",
+			text: "垫江县"
+		}, {
+			value: "500232",
+			text: "武隆县"
+		}, {
+			value: "500233",
+			text: "忠县"
+		}, {
+			value: "500234",
+			text: "开县"
+		}, {
+			value: "500235",
+			text: "云阳县"
+		}, {
+			value: "500236",
+			text: "奉节县"
+		}, {
+			value: "500237",
+			text: "巫山县"
+		}, {
+			value: "500238",
+			text: "巫溪县"
+		}, {
+			value: "500240",
+			text: "石柱土家族自治县"
+		}, {
+			value: "500241",
+			text: "秀山土家族苗族自治县"
+		}, {
+			value: "500242",
+			text: "酉阳土家族苗族自治县"
+		}, {
+			value: "500243",
+			text: "彭水苗族土家族自治县"
+		}, {
+			value: "500381",
+			text: "江津区"
+		}, {
+			value: "500382",
+			text: "合川区"
+		}, {
+			value: "500383",
+			text: "永川区"
+		}, {
+			value: "500384",
+			text: "南川区"
+		}, {
+			value: "500385",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '510000',
+	text: '四川省',
+	children: [{
+		value: "510100",
+		text: "成都市",
+		children: [{
+			value: "510104",
+			text: "锦江区"
+		}, {
+			value: "510105",
+			text: "青羊区"
+		}, {
+			value: "510106",
+			text: "金牛区"
+		}, {
+			value: "510107",
+			text: "武侯区"
+		}, {
+			value: "510108",
+			text: "成华区"
+		}, {
+			value: "510112",
+			text: "龙泉驿区"
+		}, {
+			value: "510113",
+			text: "青白江区"
+		}, {
+			value: "510114",
+			text: "新都区"
+		}, {
+			value: "510115",
+			text: "温江区"
+		}, {
+			value: "510121",
+			text: "金堂县"
+		}, {
+			value: "510122",
+			text: "双流县"
+		}, {
+			value: "510124",
+			text: "郫县"
+		}, {
+			value: "510129",
+			text: "大邑县"
+		}, {
+			value: "510131",
+			text: "蒲江县"
+		}, {
+			value: "510132",
+			text: "新津县"
+		}, {
+			value: "510181",
+			text: "都江堰市"
+		}, {
+			value: "510182",
+			text: "彭州市"
+		}, {
+			value: "510183",
+			text: "邛崃市"
+		}, {
+			value: "510184",
+			text: "崇州市"
+		}, {
+			value: "510185",
+			text: "其它区"
+		}]
+	}, {
+		value: "510300",
+		text: "自贡市",
+		children: [{
+			value: "510302",
+			text: "自流井区"
+		}, {
+			value: "510303",
+			text: "贡井区"
+		}, {
+			value: "510304",
+			text: "大安区"
+		}, {
+			value: "510311",
+			text: "沿滩区"
+		}, {
+			value: "510321",
+			text: "荣县"
+		}, {
+			value: "510322",
+			text: "富顺县"
+		}, {
+			value: "510323",
+			text: "其它区"
+		}]
+	}, {
+		value: "510400",
+		text: "攀枝花市",
+		children: [{
+			value: "510402",
+			text: "东区"
+		}, {
+			value: "510403",
+			text: "西区"
+		}, {
+			value: "510411",
+			text: "仁和区"
+		}, {
+			value: "510421",
+			text: "米易县"
+		}, {
+			value: "510422",
+			text: "盐边县"
+		}, {
+			value: "510423",
+			text: "其它区"
+		}]
+	}, {
+		value: "510500",
+		text: "泸州市",
+		children: [{
+			value: "510502",
+			text: "江阳区"
+		}, {
+			value: "510503",
+			text: "纳溪区"
+		}, {
+			value: "510504",
+			text: "龙马潭区"
+		}, {
+			value: "510521",
+			text: "泸县"
+		}, {
+			value: "510522",
+			text: "合江县"
+		}, {
+			value: "510524",
+			text: "叙永县"
+		}, {
+			value: "510525",
+			text: "古蔺县"
+		}, {
+			value: "510526",
+			text: "其它区"
+		}]
+	}, {
+		value: "510600",
+		text: "德阳市",
+		children: [{
+			value: "510603",
+			text: "旌阳区"
+		}, {
+			value: "510623",
+			text: "中江县"
+		}, {
+			value: "510626",
+			text: "罗江县"
+		}, {
+			value: "510681",
+			text: "广汉市"
+		}, {
+			value: "510682",
+			text: "什邡市"
+		}, {
+			value: "510683",
+			text: "绵竹市"
+		}, {
+			value: "510684",
+			text: "其它区"
+		}]
+	}, {
+		value: "510700",
+		text: "绵阳市",
+		children: [{
+			value: "510703",
+			text: "涪城区"
+		}, {
+			value: "510704",
+			text: "游仙区"
+		}, {
+			value: "510722",
+			text: "三台县"
+		}, {
+			value: "510723",
+			text: "盐亭县"
+		}, {
+			value: "510724",
+			text: "安县"
+		}, {
+			value: "510725",
+			text: "梓潼县"
+		}, {
+			value: "510726",
+			text: "北川羌族自治县"
+		}, {
+			value: "510727",
+			text: "平武县"
+		}, {
+			value: "510751",
+			text: "高新区"
+		}, {
+			value: "510781",
+			text: "江油市"
+		}, {
+			value: "510782",
+			text: "其它区"
+		}]
+	}, {
+		value: "510800",
+		text: "广元市",
+		children: [{
+			value: "510802",
+			text: "利州区"
+		}, {
+			value: "510811",
+			text: "元坝区"
+		}, {
+			value: "510812",
+			text: "朝天区"
+		}, {
+			value: "510821",
+			text: "旺苍县"
+		}, {
+			value: "510822",
+			text: "青川县"
+		}, {
+			value: "510823",
+			text: "剑阁县"
+		}, {
+			value: "510824",
+			text: "苍溪县"
+		}, {
+			value: "510825",
+			text: "其它区"
+		}]
+	}, {
+		value: "510900",
+		text: "遂宁市",
+		children: [{
+			value: "510903",
+			text: "船山区"
+		}, {
+			value: "510904",
+			text: "安居区"
+		}, {
+			value: "510921",
+			text: "蓬溪县"
+		}, {
+			value: "510922",
+			text: "射洪县"
+		}, {
+			value: "510923",
+			text: "大英县"
+		}, {
+			value: "510924",
+			text: "其它区"
+		}]
+	}, {
+		value: "511000",
+		text: "内江市",
+		children: [{
+			value: "511002",
+			text: "市中区"
+		}, {
+			value: "511011",
+			text: "东兴区"
+		}, {
+			value: "511024",
+			text: "威远县"
+		}, {
+			value: "511025",
+			text: "资中县"
+		}, {
+			value: "511028",
+			text: "隆昌县"
+		}, {
+			value: "511029",
+			text: "其它区"
+		}]
+	}, {
+		value: "511100",
+		text: "乐山市",
+		children: [{
+			value: "511102",
+			text: "市中区"
+		}, {
+			value: "511111",
+			text: "沙湾区"
+		}, {
+			value: "511112",
+			text: "五通桥区"
+		}, {
+			value: "511113",
+			text: "金口河区"
+		}, {
+			value: "511123",
+			text: "犍为县"
+		}, {
+			value: "511124",
+			text: "井研县"
+		}, {
+			value: "511126",
+			text: "夹江县"
+		}, {
+			value: "511129",
+			text: "沐川县"
+		}, {
+			value: "511132",
+			text: "峨边彝族自治县"
+		}, {
+			value: "511133",
+			text: "马边彝族自治县"
+		}, {
+			value: "511181",
+			text: "峨眉山市"
+		}, {
+			value: "511182",
+			text: "其它区"
+		}]
+	}, {
+		value: "511300",
+		text: "南充市",
+		children: [{
+			value: "511302",
+			text: "顺庆区"
+		}, {
+			value: "511303",
+			text: "高坪区"
+		}, {
+			value: "511304",
+			text: "嘉陵区"
+		}, {
+			value: "511321",
+			text: "南部县"
+		}, {
+			value: "511322",
+			text: "营山县"
+		}, {
+			value: "511323",
+			text: "蓬安县"
+		}, {
+			value: "511324",
+			text: "仪陇县"
+		}, {
+			value: "511325",
+			text: "西充县"
+		}, {
+			value: "511381",
+			text: "阆中市"
+		}, {
+			value: "511382",
+			text: "其它区"
+		}]
+	}, {
+		value: "511400",
+		text: "眉山市",
+		children: [{
+			value: "511402",
+			text: "东坡区"
+		}, {
+			value: "511421",
+			text: "仁寿县"
+		}, {
+			value: "511422",
+			text: "彭山县"
+		}, {
+			value: "511423",
+			text: "洪雅县"
+		}, {
+			value: "511424",
+			text: "丹棱县"
+		}, {
+			value: "511425",
+			text: "青神县"
+		}, {
+			value: "511426",
+			text: "其它区"
+		}]
+	}, {
+		value: "511500",
+		text: "宜宾市",
+		children: [{
+			value: "511502",
+			text: "翠屏区"
+		}, {
+			value: "511521",
+			text: "宜宾县"
+		}, {
+			value: "511522",
+			text: "南溪县"
+		}, {
+			value: "511523",
+			text: "江安县"
+		}, {
+			value: "511524",
+			text: "长宁县"
+		}, {
+			value: "511525",
+			text: "高县"
+		}, {
+			value: "511526",
+			text: "珙县"
+		}, {
+			value: "511527",
+			text: "筠连县"
+		}, {
+			value: "511528",
+			text: "兴文县"
+		}, {
+			value: "511529",
+			text: "屏山县"
+		}, {
+			value: "511530",
+			text: "其它区"
+		}]
+	}, {
+		value: "511600",
+		text: "广安市",
+		children: [{
+			value: "511602",
+			text: "广安区"
+		}, {
+			value: "511621",
+			text: "岳池县"
+		}, {
+			value: "511622",
+			text: "武胜县"
+		}, {
+			value: "511623",
+			text: "邻水县"
+		}, {
+			value: "511681",
+			text: "华蓥市"
+		}, {
+			value: "511682",
+			text: "市辖区"
+		}, {
+			value: "511683",
+			text: "其它区"
+		}]
+	}, {
+		value: "511700",
+		text: "达州市",
+		children: [{
+			value: "511702",
+			text: "通川区"
+		}, {
+			value: "511721",
+			text: "达县"
+		}, {
+			value: "511722",
+			text: "宣汉县"
+		}, {
+			value: "511723",
+			text: "开江县"
+		}, {
+			value: "511724",
+			text: "大竹县"
+		}, {
+			value: "511725",
+			text: "渠县"
+		}, {
+			value: "511781",
+			text: "万源市"
+		}, {
+			value: "511782",
+			text: "其它区"
+		}]
+	}, {
+		value: "511800",
+		text: "雅安市",
+		children: [{
+			value: "511802",
+			text: "雨城区"
+		}, {
+			value: "511821",
+			text: "名山县"
+		}, {
+			value: "511822",
+			text: "荥经县"
+		}, {
+			value: "511823",
+			text: "汉源县"
+		}, {
+			value: "511824",
+			text: "石棉县"
+		}, {
+			value: "511825",
+			text: "天全县"
+		}, {
+			value: "511826",
+			text: "芦山县"
+		}, {
+			value: "511827",
+			text: "宝兴县"
+		}, {
+			value: "511828",
+			text: "其它区"
+		}]
+	}, {
+		value: "511900",
+		text: "巴中市",
+		children: [{
+			value: "511902",
+			text: "巴州区"
+		}, {
+			value: "511921",
+			text: "通江县"
+		}, {
+			value: "511922",
+			text: "南江县"
+		}, {
+			value: "511923",
+			text: "平昌县"
+		}, {
+			value: "511924",
+			text: "其它区"
+		}]
+	}, {
+		value: "512000",
+		text: "资阳市",
+		children: [{
+			value: "512002",
+			text: "雁江区"
+		}, {
+			value: "512021",
+			text: "安岳县"
+		}, {
+			value: "512022",
+			text: "乐至县"
+		}, {
+			value: "512081",
+			text: "简阳市"
+		}, {
+			value: "512082",
+			text: "其它区"
+		}]
+	}, {
+		value: "513200",
+		text: "阿坝藏族羌族自治州",
+		children: [{
+			value: "513221",
+			text: "汶川县"
+		}, {
+			value: "513222",
+			text: "理县"
+		}, {
+			value: "513223",
+			text: "茂县"
+		}, {
+			value: "513224",
+			text: "松潘县"
+		}, {
+			value: "513225",
+			text: "九寨沟县"
+		}, {
+			value: "513226",
+			text: "金川县"
+		}, {
+			value: "513227",
+			text: "小金县"
+		}, {
+			value: "513228",
+			text: "黑水县"
+		}, {
+			value: "513229",
+			text: "马尔康县"
+		}, {
+			value: "513230",
+			text: "壤塘县"
+		}, {
+			value: "513231",
+			text: "阿坝县"
+		}, {
+			value: "513232",
+			text: "若尔盖县"
+		}, {
+			value: "513233",
+			text: "红原县"
+		}, {
+			value: "513234",
+			text: "其它区"
+		}]
+	}, {
+		value: "513300",
+		text: "甘孜藏族自治州",
+		children: [{
+			value: "513321",
+			text: "康定县"
+		}, {
+			value: "513322",
+			text: "泸定县"
+		}, {
+			value: "513323",
+			text: "丹巴县"
+		}, {
+			value: "513324",
+			text: "九龙县"
+		}, {
+			value: "513325",
+			text: "雅江县"
+		}, {
+			value: "513326",
+			text: "道孚县"
+		}, {
+			value: "513327",
+			text: "炉霍县"
+		}, {
+			value: "513328",
+			text: "甘孜县"
+		}, {
+			value: "513329",
+			text: "新龙县"
+		}, {
+			value: "513330",
+			text: "德格县"
+		}, {
+			value: "513331",
+			text: "白玉县"
+		}, {
+			value: "513332",
+			text: "石渠县"
+		}, {
+			value: "513333",
+			text: "色达县"
+		}, {
+			value: "513334",
+			text: "理塘县"
+		}, {
+			value: "513335",
+			text: "巴塘县"
+		}, {
+			value: "513336",
+			text: "乡城县"
+		}, {
+			value: "513337",
+			text: "稻城县"
+		}, {
+			value: "513338",
+			text: "得荣县"
+		}, {
+			value: "513339",
+			text: "其它区"
+		}]
+	}, {
+		value: "513400",
+		text: "凉山彝族自治州",
+		children: [{
+			value: "513401",
+			text: "西昌市"
+		}, {
+			value: "513422",
+			text: "木里藏族自治县"
+		}, {
+			value: "513423",
+			text: "盐源县"
+		}, {
+			value: "513424",
+			text: "德昌县"
+		}, {
+			value: "513425",
+			text: "会理县"
+		}, {
+			value: "513426",
+			text: "会东县"
+		}, {
+			value: "513427",
+			text: "宁南县"
+		}, {
+			value: "513428",
+			text: "普格县"
+		}, {
+			value: "513429",
+			text: "布拖县"
+		}, {
+			value: "513430",
+			text: "金阳县"
+		}, {
+			value: "513431",
+			text: "昭觉县"
+		}, {
+			value: "513432",
+			text: "喜德县"
+		}, {
+			value: "513433",
+			text: "冕宁县"
+		}, {
+			value: "513434",
+			text: "越西县"
+		}, {
+			value: "513435",
+			text: "甘洛县"
+		}, {
+			value: "513436",
+			text: "美姑县"
+		}, {
+			value: "513437",
+			text: "雷波县"
+		}, {
+			value: "513438",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '520000',
+	text: '贵州省',
+	children: [{
+		value: "520100",
+		text: "贵阳市",
+		children: [{
+			value: "520102",
+			text: "南明区"
+		}, {
+			value: "520103",
+			text: "云岩区"
+		}, {
+			value: "520111",
+			text: "花溪区"
+		}, {
+			value: "520112",
+			text: "乌当区"
+		}, {
+			value: "520113",
+			text: "白云区"
+		}, {
+			value: "520114",
+			text: "小河区"
+		}, {
+			value: "520121",
+			text: "开阳县"
+		}, {
+			value: "520122",
+			text: "息烽县"
+		}, {
+			value: "520123",
+			text: "修文县"
+		}, {
+			value: "520151",
+			text: "金阳开发区"
+		}, {
+			value: "520181",
+			text: "清镇市"
+		}, {
+			value: "520182",
+			text: "其它区"
+		}]
+	}, {
+		value: "520200",
+		text: "六盘水市",
+		children: [{
+			value: "520201",
+			text: "钟山区"
+		}, {
+			value: "520203",
+			text: "六枝特区"
+		}, {
+			value: "520221",
+			text: "水城县"
+		}, {
+			value: "520222",
+			text: "盘县"
+		}, {
+			value: "520223",
+			text: "其它区"
+		}]
+	}, {
+		value: "520300",
+		text: "遵义市",
+		children: [{
+			value: "520302",
+			text: "红花岗区"
+		}, {
+			value: "520303",
+			text: "汇川区"
+		}, {
+			value: "520321",
+			text: "遵义县"
+		}, {
+			value: "520322",
+			text: "桐梓县"
+		}, {
+			value: "520323",
+			text: "绥阳县"
+		}, {
+			value: "520324",
+			text: "正安县"
+		}, {
+			value: "520325",
+			text: "道真仡佬族苗族自治县"
+		}, {
+			value: "520326",
+			text: "务川仡佬族苗族自治县"
+		}, {
+			value: "520327",
+			text: "凤冈县"
+		}, {
+			value: "520328",
+			text: "湄潭县"
+		}, {
+			value: "520329",
+			text: "余庆县"
+		}, {
+			value: "520330",
+			text: "习水县"
+		}, {
+			value: "520381",
+			text: "赤水市"
+		}, {
+			value: "520382",
+			text: "仁怀市"
+		}, {
+			value: "520383",
+			text: "其它区"
+		}]
+	}, {
+		value: "520400",
+		text: "安顺市",
+		children: [{
+			value: "520402",
+			text: "西秀区"
+		}, {
+			value: "520421",
+			text: "平坝县"
+		}, {
+			value: "520422",
+			text: "普定县"
+		}, {
+			value: "520423",
+			text: "镇宁布依族苗族自治县"
+		}, {
+			value: "520424",
+			text: "关岭布依族苗族自治县"
+		}, {
+			value: "520425",
+			text: "紫云苗族布依族自治县"
+		}, {
+			value: "520426",
+			text: "其它区"
+		}]
+	}, {
+		value: "522200",
+		text: "铜仁地区",
+		children: [{
+			value: "522201",
+			text: "铜仁市"
+		}, {
+			value: "522222",
+			text: "江口县"
+		}, {
+			value: "522223",
+			text: "玉屏侗族自治县"
+		}, {
+			value: "522224",
+			text: "石阡县"
+		}, {
+			value: "522225",
+			text: "思南县"
+		}, {
+			value: "522226",
+			text: "印江土家族苗族自治县"
+		}, {
+			value: "522227",
+			text: "德江县"
+		}, {
+			value: "522228",
+			text: "沿河土家族自治县"
+		}, {
+			value: "522229",
+			text: "松桃苗族自治县"
+		}, {
+			value: "522230",
+			text: "万山特区"
+		}, {
+			value: "522231",
+			text: "其它区"
+		}]
+	}, {
+		value: "522300",
+		text: "黔西南布依族苗族自治州",
+		children: [{
+			value: "522301",
+			text: "兴义市"
+		}, {
+			value: "522322",
+			text: "兴仁县"
+		}, {
+			value: "522323",
+			text: "普安县"
+		}, {
+			value: "522324",
+			text: "晴隆县"
+		}, {
+			value: "522325",
+			text: "贞丰县"
+		}, {
+			value: "522326",
+			text: "望谟县"
+		}, {
+			value: "522327",
+			text: "册亨县"
+		}, {
+			value: "522328",
+			text: "安龙县"
+		}, {
+			value: "522329",
+			text: "其它区"
+		}]
+	}, {
+		value: "522400",
+		text: "毕节地区",
+		children: [{
+			value: "522401",
+			text: "毕节市"
+		}, {
+			value: "522422",
+			text: "大方县"
+		}, {
+			value: "522423",
+			text: "黔西县"
+		}, {
+			value: "522424",
+			text: "金沙县"
+		}, {
+			value: "522425",
+			text: "织金县"
+		}, {
+			value: "522426",
+			text: "纳雍县"
+		}, {
+			value: "522427",
+			text: "威宁彝族回族苗族自治县"
+		}, {
+			value: "522428",
+			text: "赫章县"
+		}, {
+			value: "522429",
+			text: "其它区"
+		}]
+	}, {
+		value: "522600",
+		text: "黔东南苗族侗族自治州",
+		children: [{
+			value: "522601",
+			text: "凯里市"
+		}, {
+			value: "522622",
+			text: "黄平县"
+		}, {
+			value: "522623",
+			text: "施秉县"
+		}, {
+			value: "522624",
+			text: "三穗县"
+		}, {
+			value: "522625",
+			text: "镇远县"
+		}, {
+			value: "522626",
+			text: "岑巩县"
+		}, {
+			value: "522627",
+			text: "天柱县"
+		}, {
+			value: "522628",
+			text: "锦屏县"
+		}, {
+			value: "522629",
+			text: "剑河县"
+		}, {
+			value: "522630",
+			text: "台江县"
+		}, {
+			value: "522631",
+			text: "黎平县"
+		}, {
+			value: "522632",
+			text: "榕江县"
+		}, {
+			value: "522633",
+			text: "从江县"
+		}, {
+			value: "522634",
+			text: "雷山县"
+		}, {
+			value: "522635",
+			text: "麻江县"
+		}, {
+			value: "522636",
+			text: "丹寨县"
+		}, {
+			value: "522637",
+			text: "其它区"
+		}]
+	}, {
+		value: "522700",
+		text: "黔南布依族苗族自治州",
+		children: [{
+			value: "522701",
+			text: "都匀市"
+		}, {
+			value: "522702",
+			text: "福泉市"
+		}, {
+			value: "522722",
+			text: "荔波县"
+		}, {
+			value: "522723",
+			text: "贵定县"
+		}, {
+			value: "522725",
+			text: "瓮安县"
+		}, {
+			value: "522726",
+			text: "独山县"
+		}, {
+			value: "522727",
+			text: "平塘县"
+		}, {
+			value: "522728",
+			text: "罗甸县"
+		}, {
+			value: "522729",
+			text: "长顺县"
+		}, {
+			value: "522730",
+			text: "龙里县"
+		}, {
+			value: "522731",
+			text: "惠水县"
+		}, {
+			value: "522732",
+			text: "三都水族自治县"
+		}, {
+			value: "522733",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '530000',
+	text: '云南省',
+	children: [{
+		value: "530100",
+		text: "昆明市",
+		children: [{
+			value: "530102",
+			text: "五华区"
+		}, {
+			value: "530103",
+			text: "盘龙区"
+		}, {
+			value: "530111",
+			text: "官渡区"
+		}, {
+			value: "530112",
+			text: "西山区"
+		}, {
+			value: "530113",
+			text: "东川区"
+		}, {
+			value: "530121",
+			text: "呈贡县"
+		}, {
+			value: "530122",
+			text: "晋宁县"
+		}, {
+			value: "530124",
+			text: "富民县"
+		}, {
+			value: "530125",
+			text: "宜良县"
+		}, {
+			value: "530126",
+			text: "石林彝族自治县"
+		}, {
+			value: "530127",
+			text: "嵩明县"
+		}, {
+			value: "530128",
+			text: "禄劝彝族苗族自治县"
+		}, {
+			value: "530129",
+			text: "寻甸回族彝族自治县"
+		}, {
+			value: "530181",
+			text: "安宁市"
+		}, {
+			value: "530182",
+			text: "其它区"
+		}]
+	}, {
+		value: "530300",
+		text: "曲靖市",
+		children: [{
+			value: "530302",
+			text: "麒麟区"
+		}, {
+			value: "530321",
+			text: "马龙县"
+		}, {
+			value: "530322",
+			text: "陆良县"
+		}, {
+			value: "530323",
+			text: "师宗县"
+		}, {
+			value: "530324",
+			text: "罗平县"
+		}, {
+			value: "530325",
+			text: "富源县"
+		}, {
+			value: "530326",
+			text: "会泽县"
+		}, {
+			value: "530328",
+			text: "沾益县"
+		}, {
+			value: "530381",
+			text: "宣威市"
+		}, {
+			value: "530382",
+			text: "其它区"
+		}]
+	}, {
+		value: "530400",
+		text: "玉溪市",
+		children: [{
+			value: "530402",
+			text: "红塔区"
+		}, {
+			value: "530421",
+			text: "江川县"
+		}, {
+			value: "530422",
+			text: "澄江县"
+		}, {
+			value: "530423",
+			text: "通海县"
+		}, {
+			value: "530424",
+			text: "华宁县"
+		}, {
+			value: "530425",
+			text: "易门县"
+		}, {
+			value: "530426",
+			text: "峨山彝族自治县"
+		}, {
+			value: "530427",
+			text: "新平彝族傣族自治县"
+		}, {
+			value: "530428",
+			text: "元江哈尼族彝族傣族自治县"
+		}, {
+			value: "530429",
+			text: "其它区"
+		}]
+	}, {
+		value: "530500",
+		text: "保山市",
+		children: [{
+			value: "530502",
+			text: "隆阳区"
+		}, {
+			value: "530521",
+			text: "施甸县"
+		}, {
+			value: "530522",
+			text: "腾冲县"
+		}, {
+			value: "530523",
+			text: "龙陵县"
+		}, {
+			value: "530524",
+			text: "昌宁县"
+		}, {
+			value: "530525",
+			text: "其它区"
+		}]
+	}, {
+		value: "530600",
+		text: "昭通市",
+		children: [{
+			value: "530602",
+			text: "昭阳区"
+		}, {
+			value: "530621",
+			text: "鲁甸县"
+		}, {
+			value: "530622",
+			text: "巧家县"
+		}, {
+			value: "530623",
+			text: "盐津县"
+		}, {
+			value: "530624",
+			text: "大关县"
+		}, {
+			value: "530625",
+			text: "永善县"
+		}, {
+			value: "530626",
+			text: "绥江县"
+		}, {
+			value: "530627",
+			text: "镇雄县"
+		}, {
+			value: "530628",
+			text: "彝良县"
+		}, {
+			value: "530629",
+			text: "威信县"
+		}, {
+			value: "530630",
+			text: "水富县"
+		}, {
+			value: "530631",
+			text: "其它区"
+		}]
+	}, {
+		value: "530700",
+		text: "丽江市",
+		children: [{
+			value: "530702",
+			text: "古城区"
+		}, {
+			value: "530721",
+			text: "玉龙纳西族自治县"
+		}, {
+			value: "530722",
+			text: "永胜县"
+		}, {
+			value: "530723",
+			text: "华坪县"
+		}, {
+			value: "530724",
+			text: "宁蒗彝族自治县"
+		}, {
+			value: "530725",
+			text: "其它区"
+		}]
+	}, {
+		value: "530800",
+		text: "普洱市",
+		children: [{
+			value: "530802",
+			text: "思茅区"
+		}, {
+			value: "530821",
+			text: "宁洱哈尼族彝族自治县"
+		}, {
+			value: "530822",
+			text: "墨江哈尼族自治县"
+		}, {
+			value: "530823",
+			text: "景东彝族自治县"
+		}, {
+			value: "530824",
+			text: "景谷傣族彝族自治县"
+		}, {
+			value: "530825",
+			text: "镇沅彝族哈尼族拉祜族自治县"
+		}, {
+			value: "530826",
+			text: "江城哈尼族彝族自治县"
+		}, {
+			value: "530827",
+			text: "孟连傣族拉祜族佤族自治县"
+		}, {
+			value: "530828",
+			text: "澜沧拉祜族自治县"
+		}, {
+			value: "530829",
+			text: "西盟佤族自治县"
+		}, {
+			value: "530830",
+			text: "其它区"
+		}]
+	}, {
+		value: "530900",
+		text: "临沧市",
+		children: [{
+			value: "530902",
+			text: "临翔区"
+		}, {
+			value: "530921",
+			text: "凤庆县"
+		}, {
+			value: "530922",
+			text: "云县"
+		}, {
+			value: "530923",
+			text: "永德县"
+		}, {
+			value: "530924",
+			text: "镇康县"
+		}, {
+			value: "530925",
+			text: "双江拉祜族佤族布朗族傣族自治县"
+		}, {
+			value: "530926",
+			text: "耿马傣族佤族自治县"
+		}, {
+			value: "530927",
+			text: "沧源佤族自治县"
+		}, {
+			value: "530928",
+			text: "其它区"
+		}]
+	}, {
+		value: "532300",
+		text: "楚雄彝族自治州",
+		children: [{
+			value: "532301",
+			text: "楚雄市"
+		}, {
+			value: "532322",
+			text: "双柏县"
+		}, {
+			value: "532323",
+			text: "牟定县"
+		}, {
+			value: "532324",
+			text: "南华县"
+		}, {
+			value: "532325",
+			text: "姚安县"
+		}, {
+			value: "532326",
+			text: "大姚县"
+		}, {
+			value: "532327",
+			text: "永仁县"
+		}, {
+			value: "532328",
+			text: "元谋县"
+		}, {
+			value: "532329",
+			text: "武定县"
+		}, {
+			value: "532331",
+			text: "禄丰县"
+		}, {
+			value: "532332",
+			text: "其它区"
+		}]
+	}, {
+		value: "532500",
+		text: "红河哈尼族彝族自治州",
+		children: [{
+			value: "532501",
+			text: "个旧市"
+		}, {
+			value: "532502",
+			text: "开远市"
+		}, {
+			value: "532522",
+			text: "蒙自县"
+		}, {
+			value: "532523",
+			text: "屏边苗族自治县"
+		}, {
+			value: "532524",
+			text: "建水县"
+		}, {
+			value: "532525",
+			text: "石屏县"
+		}, {
+			value: "532526",
+			text: "弥勒县"
+		}, {
+			value: "532527",
+			text: "泸西县"
+		}, {
+			value: "532528",
+			text: "元阳县"
+		}, {
+			value: "532529",
+			text: "红河县"
+		}, {
+			value: "532530",
+			text: "金平苗族瑶族傣族自治县"
+		}, {
+			value: "532531",
+			text: "绿春县"
+		}, {
+			value: "532532",
+			text: "河口瑶族自治县"
+		}, {
+			value: "532533",
+			text: "其它区"
+		}]
+	}, {
+		value: "532600",
+		text: "文山壮族苗族自治州",
+		children: [{
+			value: "532621",
+			text: "文山县"
+		}, {
+			value: "532622",
+			text: "砚山县"
+		}, {
+			value: "532623",
+			text: "西畴县"
+		}, {
+			value: "532624",
+			text: "麻栗坡县"
+		}, {
+			value: "532625",
+			text: "马关县"
+		}, {
+			value: "532626",
+			text: "丘北县"
+		}, {
+			value: "532627",
+			text: "广南县"
+		}, {
+			value: "532628",
+			text: "富宁县"
+		}, {
+			value: "532629",
+			text: "其它区"
+		}]
+	}, {
+		value: "532800",
+		text: "西双版纳傣族自治州",
+		children: [{
+			value: "532801",
+			text: "景洪市"
+		}, {
+			value: "532822",
+			text: "勐海县"
+		}, {
+			value: "532823",
+			text: "勐腊县"
+		}, {
+			value: "532824",
+			text: "其它区"
+		}]
+	}, {
+		value: "532900",
+		text: "大理白族自治州",
+		children: [{
+			value: "532901",
+			text: "大理市"
+		}, {
+			value: "532922",
+			text: "漾濞彝族自治县"
+		}, {
+			value: "532923",
+			text: "祥云县"
+		}, {
+			value: "532924",
+			text: "宾川县"
+		}, {
+			value: "532925",
+			text: "弥渡县"
+		}, {
+			value: "532926",
+			text: "南涧彝族自治县"
+		}, {
+			value: "532927",
+			text: "巍山彝族回族自治县"
+		}, {
+			value: "532928",
+			text: "永平县"
+		}, {
+			value: "532929",
+			text: "云龙县"
+		}, {
+			value: "532930",
+			text: "洱源县"
+		}, {
+			value: "532931",
+			text: "剑川县"
+		}, {
+			value: "532932",
+			text: "鹤庆县"
+		}, {
+			value: "532933",
+			text: "其它区"
+		}]
+	}, {
+		value: "533100",
+		text: "德宏傣族景颇族自治州",
+		children: [{
+			value: "533102",
+			text: "瑞丽市"
+		}, {
+			value: "533103",
+			text: "潞西市"
+		}, {
+			value: "533122",
+			text: "梁河县"
+		}, {
+			value: "533123",
+			text: "盈江县"
+		}, {
+			value: "533124",
+			text: "陇川县"
+		}, {
+			value: "533125",
+			text: "其它区"
+		}]
+	}, {
+		value: "533300",
+		text: "怒江傈僳族自治州",
+		children: [{
+			value: "533321",
+			text: "泸水县"
+		}, {
+			value: "533323",
+			text: "福贡县"
+		}, {
+			value: "533324",
+			text: "贡山独龙族怒族自治县"
+		}, {
+			value: "533325",
+			text: "兰坪白族普米族自治县"
+		}, {
+			value: "533326",
+			text: "其它区"
+		}]
+	}, {
+		value: "533400",
+		text: "迪庆藏族自治州",
+		children: [{
+			value: "533421",
+			text: "香格里拉县"
+		}, {
+			value: "533422",
+			text: "德钦县"
+		}, {
+			value: "533423",
+			text: "维西傈僳族自治县"
+		}, {
+			value: "533424",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '540000',
+	text: '西藏',
+	children: [{
+		value: "540100",
+		text: "拉萨市",
+		children: [{
+			value: "540102",
+			text: "城关区"
+		}, {
+			value: "540121",
+			text: "林周县"
+		}, {
+			value: "540122",
+			text: "当雄县"
+		}, {
+			value: "540123",
+			text: "尼木县"
+		}, {
+			value: "540124",
+			text: "曲水县"
+		}, {
+			value: "540125",
+			text: "堆龙德庆县"
+		}, {
+			value: "540126",
+			text: "达孜县"
+		}, {
+			value: "540127",
+			text: "墨竹工卡县"
+		}, {
+			value: "540128",
+			text: "其它区"
+		}]
+	}, {
+		value: "542100",
+		text: "昌都地区",
+		children: [{
+			value: "542121",
+			text: "昌都县"
+		}, {
+			value: "542122",
+			text: "江达县"
+		}, {
+			value: "542123",
+			text: "贡觉县"
+		}, {
+			value: "542124",
+			text: "类乌齐县"
+		}, {
+			value: "542125",
+			text: "丁青县"
+		}, {
+			value: "542126",
+			text: "察雅县"
+		}, {
+			value: "542127",
+			text: "八宿县"
+		}, {
+			value: "542128",
+			text: "左贡县"
+		}, {
+			value: "542129",
+			text: "芒康县"
+		}, {
+			value: "542132",
+			text: "洛隆县"
+		}, {
+			value: "542133",
+			text: "边坝县"
+		}, {
+			value: "542134",
+			text: "其它区"
+		}]
+	}, {
+		value: "542200",
+		text: "山南地区",
+		children: [{
+			value: "542221",
+			text: "乃东县"
+		}, {
+			value: "542222",
+			text: "扎囊县"
+		}, {
+			value: "542223",
+			text: "贡嘎县"
+		}, {
+			value: "542224",
+			text: "桑日县"
+		}, {
+			value: "542225",
+			text: "琼结县"
+		}, {
+			value: "542226",
+			text: "曲松县"
+		}, {
+			value: "542227",
+			text: "措美县"
+		}, {
+			value: "542228",
+			text: "洛扎县"
+		}, {
+			value: "542229",
+			text: "加查县"
+		}, {
+			value: "542231",
+			text: "隆子县"
+		}, {
+			value: "542232",
+			text: "错那县"
+		}, {
+			value: "542233",
+			text: "浪卡子县"
+		}, {
+			value: "542234",
+			text: "其它区"
+		}]
+	}, {
+		value: "542300",
+		text: "日喀则地区",
+		children: [{
+			value: "542301",
+			text: "日喀则市"
+		}, {
+			value: "542322",
+			text: "南木林县"
+		}, {
+			value: "542323",
+			text: "江孜县"
+		}, {
+			value: "542324",
+			text: "定日县"
+		}, {
+			value: "542325",
+			text: "萨迦县"
+		}, {
+			value: "542326",
+			text: "拉孜县"
+		}, {
+			value: "542327",
+			text: "昂仁县"
+		}, {
+			value: "542328",
+			text: "谢通门县"
+		}, {
+			value: "542329",
+			text: "白朗县"
+		}, {
+			value: "542330",
+			text: "仁布县"
+		}, {
+			value: "542331",
+			text: "康马县"
+		}, {
+			value: "542332",
+			text: "定结县"
+		}, {
+			value: "542333",
+			text: "仲巴县"
+		}, {
+			value: "542334",
+			text: "亚东县"
+		}, {
+			value: "542335",
+			text: "吉隆县"
+		}, {
+			value: "542336",
+			text: "聂拉木县"
+		}, {
+			value: "542337",
+			text: "萨嘎县"
+		}, {
+			value: "542338",
+			text: "岗巴县"
+		}, {
+			value: "542339",
+			text: "其它区"
+		}]
+	}, {
+		value: "542400",
+		text: "那曲地区",
+		children: [{
+			value: "542421",
+			text: "那曲县"
+		}, {
+			value: "542422",
+			text: "嘉黎县"
+		}, {
+			value: "542423",
+			text: "比如县"
+		}, {
+			value: "542424",
+			text: "聂荣县"
+		}, {
+			value: "542425",
+			text: "安多县"
+		}, {
+			value: "542426",
+			text: "申扎县"
+		}, {
+			value: "542427",
+			text: "索县"
+		}, {
+			value: "542428",
+			text: "班戈县"
+		}, {
+			value: "542429",
+			text: "巴青县"
+		}, {
+			value: "542430",
+			text: "尼玛县"
+		}, {
+			value: "542431",
+			text: "其它区"
+		}]
+	}, {
+		value: "542500",
+		text: "阿里地区",
+		children: [{
+			value: "542521",
+			text: "普兰县"
+		}, {
+			value: "542522",
+			text: "札达县"
+		}, {
+			value: "542523",
+			text: "噶尔县"
+		}, {
+			value: "542524",
+			text: "日土县"
+		}, {
+			value: "542525",
+			text: "革吉县"
+		}, {
+			value: "542526",
+			text: "改则县"
+		}, {
+			value: "542527",
+			text: "措勤县"
+		}, {
+			value: "542528",
+			text: "其它区"
+		}]
+	}, {
+		value: "542600",
+		text: "林芝地区",
+		children: [{
+			value: "542621",
+			text: "林芝县"
+		}, {
+			value: "542622",
+			text: "工布江达县"
+		}, {
+			value: "542623",
+			text: "米林县"
+		}, {
+			value: "542624",
+			text: "墨脱县"
+		}, {
+			value: "542625",
+			text: "波密县"
+		}, {
+			value: "542626",
+			text: "察隅县"
+		}, {
+			value: "542627",
+			text: "朗县"
+		}, {
+			value: "542628",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '610000',
+	text: '陕西省',
+	children: [{
+		value: "610100",
+		text: "西安市",
+		children: [{
+			value: "610102",
+			text: "新城区"
+		}, {
+			value: "610103",
+			text: "碑林区"
+		}, {
+			value: "610104",
+			text: "莲湖区"
+		}, {
+			value: "610111",
+			text: "灞桥区"
+		}, {
+			value: "610112",
+			text: "未央区"
+		}, {
+			value: "610113",
+			text: "雁塔区"
+		}, {
+			value: "610114",
+			text: "阎良区"
+		}, {
+			value: "610115",
+			text: "临潼区"
+		}, {
+			value: "610116",
+			text: "长安区"
+		}, {
+			value: "610122",
+			text: "蓝田县"
+		}, {
+			value: "610124",
+			text: "周至县"
+		}, {
+			value: "610125",
+			text: "户县"
+		}, {
+			value: "610126",
+			text: "高陵县"
+		}, {
+			value: "610127",
+			text: "其它区"
+		}]
+	}, {
+		value: "610200",
+		text: "铜川市",
+		children: [{
+			value: "610202",
+			text: "王益区"
+		}, {
+			value: "610203",
+			text: "印台区"
+		}, {
+			value: "610204",
+			text: "耀州区"
+		}, {
+			value: "610222",
+			text: "宜君县"
+		}, {
+			value: "610223",
+			text: "其它区"
+		}]
+	}, {
+		value: "610300",
+		text: "宝鸡市",
+		children: [{
+			value: "610302",
+			text: "渭滨区"
+		}, {
+			value: "610303",
+			text: "金台区"
+		}, {
+			value: "610304",
+			text: "陈仓区"
+		}, {
+			value: "610322",
+			text: "凤翔县"
+		}, {
+			value: "610323",
+			text: "岐山县"
+		}, {
+			value: "610324",
+			text: "扶风县"
+		}, {
+			value: "610326",
+			text: "眉县"
+		}, {
+			value: "610327",
+			text: "陇县"
+		}, {
+			value: "610328",
+			text: "千阳县"
+		}, {
+			value: "610329",
+			text: "麟游县"
+		}, {
+			value: "610330",
+			text: "凤县"
+		}, {
+			value: "610331",
+			text: "太白县"
+		}, {
+			value: "610332",
+			text: "其它区"
+		}]
+	}, {
+		value: "610400",
+		text: "咸阳市",
+		children: [{
+			value: "610402",
+			text: "秦都区"
+		}, {
+			value: "610403",
+			text: "杨陵区"
+		}, {
+			value: "610404",
+			text: "渭城区"
+		}, {
+			value: "610422",
+			text: "三原县"
+		}, {
+			value: "610423",
+			text: "泾阳县"
+		}, {
+			value: "610424",
+			text: "乾县"
+		}, {
+			value: "610425",
+			text: "礼泉县"
+		}, {
+			value: "610426",
+			text: "永寿县"
+		}, {
+			value: "610427",
+			text: "彬县"
+		}, {
+			value: "610428",
+			text: "长武县"
+		}, {
+			value: "610429",
+			text: "旬邑县"
+		}, {
+			value: "610430",
+			text: "淳化县"
+		}, {
+			value: "610431",
+			text: "武功县"
+		}, {
+			value: "610481",
+			text: "兴平市"
+		}, {
+			value: "610482",
+			text: "其它区"
+		}]
+	}, {
+		value: "610500",
+		text: "渭南市",
+		children: [{
+			value: "610502",
+			text: "临渭区"
+		}, {
+			value: "610521",
+			text: "华县"
+		}, {
+			value: "610522",
+			text: "潼关县"
+		}, {
+			value: "610523",
+			text: "大荔县"
+		}, {
+			value: "610524",
+			text: "合阳县"
+		}, {
+			value: "610525",
+			text: "澄城县"
+		}, {
+			value: "610526",
+			text: "蒲城县"
+		}, {
+			value: "610527",
+			text: "白水县"
+		}, {
+			value: "610528",
+			text: "富平县"
+		}, {
+			value: "610581",
+			text: "韩城市"
+		}, {
+			value: "610582",
+			text: "华阴市"
+		}, {
+			value: "610583",
+			text: "其它区"
+		}]
+	}, {
+		value: "610600",
+		text: "延安市",
+		children: [{
+			value: "610602",
+			text: "宝塔区"
+		}, {
+			value: "610621",
+			text: "延长县"
+		}, {
+			value: "610622",
+			text: "延川县"
+		}, {
+			value: "610623",
+			text: "子长县"
+		}, {
+			value: "610624",
+			text: "安塞县"
+		}, {
+			value: "610625",
+			text: "志丹县"
+		}, {
+			value: "610626",
+			text: "吴起县"
+		}, {
+			value: "610627",
+			text: "甘泉县"
+		}, {
+			value: "610628",
+			text: "富县"
+		}, {
+			value: "610629",
+			text: "洛川县"
+		}, {
+			value: "610630",
+			text: "宜川县"
+		}, {
+			value: "610631",
+			text: "黄龙县"
+		}, {
+			value: "610632",
+			text: "黄陵县"
+		}, {
+			value: "610633",
+			text: "其它区"
+		}]
+	}, {
+		value: "610700",
+		text: "汉中市",
+		children: [{
+			value: "610702",
+			text: "汉台区"
+		}, {
+			value: "610721",
+			text: "南郑县"
+		}, {
+			value: "610722",
+			text: "城固县"
+		}, {
+			value: "610723",
+			text: "洋县"
+		}, {
+			value: "610724",
+			text: "西乡县"
+		}, {
+			value: "610725",
+			text: "勉县"
+		}, {
+			value: "610726",
+			text: "宁强县"
+		}, {
+			value: "610727",
+			text: "略阳县"
+		}, {
+			value: "610728",
+			text: "镇巴县"
+		}, {
+			value: "610729",
+			text: "留坝县"
+		}, {
+			value: "610730",
+			text: "佛坪县"
+		}, {
+			value: "610731",
+			text: "其它区"
+		}]
+	}, {
+		value: "610800",
+		text: "榆林市",
+		children: [{
+			value: "610802",
+			text: "榆阳区"
+		}, {
+			value: "610821",
+			text: "神木县"
+		}, {
+			value: "610822",
+			text: "府谷县"
+		}, {
+			value: "610823",
+			text: "横山县"
+		}, {
+			value: "610824",
+			text: "靖边县"
+		}, {
+			value: "610825",
+			text: "定边县"
+		}, {
+			value: "610826",
+			text: "绥德县"
+		}, {
+			value: "610827",
+			text: "米脂县"
+		}, {
+			value: "610828",
+			text: "佳县"
+		}, {
+			value: "610829",
+			text: "吴堡县"
+		}, {
+			value: "610830",
+			text: "清涧县"
+		}, {
+			value: "610831",
+			text: "子洲县"
+		}, {
+			value: "610832",
+			text: "其它区"
+		}]
+	}, {
+		value: "610900",
+		text: "安康市",
+		children: [{
+			value: "610902",
+			text: "汉滨区"
+		}, {
+			value: "610921",
+			text: "汉阴县"
+		}, {
+			value: "610922",
+			text: "石泉县"
+		}, {
+			value: "610923",
+			text: "宁陕县"
+		}, {
+			value: "610924",
+			text: "紫阳县"
+		}, {
+			value: "610925",
+			text: "岚皋县"
+		}, {
+			value: "610926",
+			text: "平利县"
+		}, {
+			value: "610927",
+			text: "镇坪县"
+		}, {
+			value: "610928",
+			text: "旬阳县"
+		}, {
+			value: "610929",
+			text: "白河县"
+		}, {
+			value: "610930",
+			text: "其它区"
+		}]
+	}, {
+		value: "611000",
+		text: "商洛市",
+		children: [{
+			value: "611002",
+			text: "商州区"
+		}, {
+			value: "611021",
+			text: "洛南县"
+		}, {
+			value: "611022",
+			text: "丹凤县"
+		}, {
+			value: "611023",
+			text: "商南县"
+		}, {
+			value: "611024",
+			text: "山阳县"
+		}, {
+			value: "611025",
+			text: "镇安县"
+		}, {
+			value: "611026",
+			text: "柞水县"
+		}, {
+			value: "611027",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '620000',
+	text: '甘肃省',
+	children: [{
+		value: "620100",
+		text: "兰州市",
+		children: [{
+			value: "620102",
+			text: "城关区"
+		}, {
+			value: "620103",
+			text: "七里河区"
+		}, {
+			value: "620104",
+			text: "西固区"
+		}, {
+			value: "620105",
+			text: "安宁区"
+		}, {
+			value: "620111",
+			text: "红古区"
+		}, {
+			value: "620121",
+			text: "永登县"
+		}, {
+			value: "620122",
+			text: "皋兰县"
+		}, {
+			value: "620123",
+			text: "榆中县"
+		}, {
+			value: "620124",
+			text: "其它区"
+		}]
+	}, {
+		value: "620200",
+		text: "嘉峪关市",
+		children: []
+	}, {
+		value: "620300",
+		text: "金昌市",
+		children: [{
+			value: "620302",
+			text: "金川区"
+		}, {
+			value: "620321",
+			text: "永昌县"
+		}, {
+			value: "620322",
+			text: "其它区"
+		}]
+	}, {
+		value: "620400",
+		text: "白银市",
+		children: [{
+			value: "620402",
+			text: "白银区"
+		}, {
+			value: "620403",
+			text: "平川区"
+		}, {
+			value: "620421",
+			text: "靖远县"
+		}, {
+			value: "620422",
+			text: "会宁县"
+		}, {
+			value: "620423",
+			text: "景泰县"
+		}, {
+			value: "620424",
+			text: "其它区"
+		}]
+	}, {
+		value: "620500",
+		text: "天水市",
+		children: [{
+			value: "620502",
+			text: "秦州区"
+		}, {
+			value: "620503",
+			text: "麦积区"
+		}, {
+			value: "620521",
+			text: "清水县"
+		}, {
+			value: "620522",
+			text: "秦安县"
+		}, {
+			value: "620523",
+			text: "甘谷县"
+		}, {
+			value: "620524",
+			text: "武山县"
+		}, {
+			value: "620525",
+			text: "张家川回族自治县"
+		}, {
+			value: "620526",
+			text: "其它区"
+		}]
+	}, {
+		value: "620600",
+		text: "武威市",
+		children: [{
+			value: "620602",
+			text: "凉州区"
+		}, {
+			value: "620621",
+			text: "民勤县"
+		}, {
+			value: "620622",
+			text: "古浪县"
+		}, {
+			value: "620623",
+			text: "天祝藏族自治县"
+		}, {
+			value: "620624",
+			text: "其它区"
+		}]
+	}, {
+		value: "620700",
+		text: "张掖市",
+		children: [{
+			value: "620702",
+			text: "甘州区"
+		}, {
+			value: "620721",
+			text: "肃南裕固族自治县"
+		}, {
+			value: "620722",
+			text: "民乐县"
+		}, {
+			value: "620723",
+			text: "临泽县"
+		}, {
+			value: "620724",
+			text: "高台县"
+		}, {
+			value: "620725",
+			text: "山丹县"
+		}, {
+			value: "620726",
+			text: "其它区"
+		}]
+	}, {
+		value: "620800",
+		text: "平凉市",
+		children: [{
+			value: "620802",
+			text: "崆峒区"
+		}, {
+			value: "620821",
+			text: "泾川县"
+		}, {
+			value: "620822",
+			text: "灵台县"
+		}, {
+			value: "620823",
+			text: "崇信县"
+		}, {
+			value: "620824",
+			text: "华亭县"
+		}, {
+			value: "620825",
+			text: "庄浪县"
+		}, {
+			value: "620826",
+			text: "静宁县"
+		}, {
+			value: "620827",
+			text: "其它区"
+		}]
+	}, {
+		value: "620900",
+		text: "酒泉市",
+		children: [{
+			value: "620902",
+			text: "肃州区"
+		}, {
+			value: "620921",
+			text: "金塔县"
+		}, {
+			value: "620922",
+			text: "安西县"
+		}, {
+			value: "620923",
+			text: "肃北蒙古族自治县"
+		}, {
+			value: "620924",
+			text: "阿克塞哈萨克族自治县"
+		}, {
+			value: "620981",
+			text: "玉门市"
+		}, {
+			value: "620982",
+			text: "敦煌市"
+		}, {
+			value: "620983",
+			text: "其它区"
+		}]
+	}, {
+		value: "621000",
+		text: "庆阳市",
+		children: [{
+			value: "621002",
+			text: "西峰区"
+		}, {
+			value: "621021",
+			text: "庆城县"
+		}, {
+			value: "621022",
+			text: "环县"
+		}, {
+			value: "621023",
+			text: "华池县"
+		}, {
+			value: "621024",
+			text: "合水县"
+		}, {
+			value: "621025",
+			text: "正宁县"
+		}, {
+			value: "621026",
+			text: "宁县"
+		}, {
+			value: "621027",
+			text: "镇原县"
+		}, {
+			value: "621028",
+			text: "其它区"
+		}]
+	}, {
+		value: "621100",
+		text: "定西市",
+		children: [{
+			value: "621102",
+			text: "安定区"
+		}, {
+			value: "621121",
+			text: "通渭县"
+		}, {
+			value: "621122",
+			text: "陇西县"
+		}, {
+			value: "621123",
+			text: "渭源县"
+		}, {
+			value: "621124",
+			text: "临洮县"
+		}, {
+			value: "621125",
+			text: "漳县"
+		}, {
+			value: "621126",
+			text: "岷县"
+		}, {
+			value: "621127",
+			text: "其它区"
+		}]
+	}, {
+		value: "621200",
+		text: "陇南市",
+		children: [{
+			value: "621202",
+			text: "武都区"
+		}, {
+			value: "621221",
+			text: "成县"
+		}, {
+			value: "621222",
+			text: "文县"
+		}, {
+			value: "621223",
+			text: "宕昌县"
+		}, {
+			value: "621224",
+			text: "康县"
+		}, {
+			value: "621225",
+			text: "西和县"
+		}, {
+			value: "621226",
+			text: "礼县"
+		}, {
+			value: "621227",
+			text: "徽县"
+		}, {
+			value: "621228",
+			text: "两当县"
+		}, {
+			value: "621229",
+			text: "其它区"
+		}]
+	}, {
+		value: "622900",
+		text: "临夏回族自治州",
+		children: [{
+			value: "622901",
+			text: "临夏市"
+		}, {
+			value: "622921",
+			text: "临夏县"
+		}, {
+			value: "622922",
+			text: "康乐县"
+		}, {
+			value: "622923",
+			text: "永靖县"
+		}, {
+			value: "622924",
+			text: "广河县"
+		}, {
+			value: "622925",
+			text: "和政县"
+		}, {
+			value: "622926",
+			text: "东乡族自治县"
+		}, {
+			value: "622927",
+			text: "积石山保安族东乡族撒拉族自治县"
+		}, {
+			value: "622928",
+			text: "其它区"
+		}]
+	}, {
+		value: "623000",
+		text: "甘南藏族自治州",
+		children: [{
+			value: "623001",
+			text: "合作市"
+		}, {
+			value: "623021",
+			text: "临潭县"
+		}, {
+			value: "623022",
+			text: "卓尼县"
+		}, {
+			value: "623023",
+			text: "舟曲县"
+		}, {
+			value: "623024",
+			text: "迭部县"
+		}, {
+			value: "623025",
+			text: "玛曲县"
+		}, {
+			value: "623026",
+			text: "碌曲县"
+		}, {
+			value: "623027",
+			text: "夏河县"
+		}, {
+			value: "623028",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '630000',
+	text: '青海省',
+	children: [{
+		value: "630100",
+		text: "西宁市",
+		children: [{
+			value: "630102",
+			text: "城东区"
+		}, {
+			value: "630103",
+			text: "城中区"
+		}, {
+			value: "630104",
+			text: "城西区"
+		}, {
+			value: "630105",
+			text: "城北区"
+		}, {
+			value: "630121",
+			text: "大通回族土族自治县"
+		}, {
+			value: "630122",
+			text: "湟中县"
+		}, {
+			value: "630123",
+			text: "湟源县"
+		}, {
+			value: "630124",
+			text: "其它区"
+		}]
+	}, {
+		value: "632100",
+		text: "海东地区",
+		children: [{
+			value: "632121",
+			text: "平安县"
+		}, {
+			value: "632122",
+			text: "民和回族土族自治县"
+		}, {
+			value: "632123",
+			text: "乐都县"
+		}, {
+			value: "632126",
+			text: "互助土族自治县"
+		}, {
+			value: "632127",
+			text: "化隆回族自治县"
+		}, {
+			value: "632128",
+			text: "循化撒拉族自治县"
+		}, {
+			value: "632129",
+			text: "其它区"
+		}]
+	}, {
+		value: "632200",
+		text: "海北藏族自治州",
+		children: [{
+			value: "632221",
+			text: "门源回族自治县"
+		}, {
+			value: "632222",
+			text: "祁连县"
+		}, {
+			value: "632223",
+			text: "海晏县"
+		}, {
+			value: "632224",
+			text: "刚察县"
+		}, {
+			value: "632225",
+			text: "其它区"
+		}]
+	}, {
+		value: "632300",
+		text: "黄南藏族自治州",
+		children: [{
+			value: "632321",
+			text: "同仁县"
+		}, {
+			value: "632322",
+			text: "尖扎县"
+		}, {
+			value: "632323",
+			text: "泽库县"
+		}, {
+			value: "632324",
+			text: "河南蒙古族自治县"
+		}, {
+			value: "632325",
+			text: "其它区"
+		}]
+	}, {
+		value: "632500",
+		text: "海南藏族自治州",
+		children: [{
+			value: "632521",
+			text: "共和县"
+		}, {
+			value: "632522",
+			text: "同德县"
+		}, {
+			value: "632523",
+			text: "贵德县"
+		}, {
+			value: "632524",
+			text: "兴海县"
+		}, {
+			value: "632525",
+			text: "贵南县"
+		}, {
+			value: "632526",
+			text: "其它区"
+		}]
+	}, {
+		value: "632600",
+		text: "果洛藏族自治州",
+		children: [{
+			value: "632621",
+			text: "玛沁县"
+		}, {
+			value: "632622",
+			text: "班玛县"
+		}, {
+			value: "632623",
+			text: "甘德县"
+		}, {
+			value: "632624",
+			text: "达日县"
+		}, {
+			value: "632625",
+			text: "久治县"
+		}, {
+			value: "632626",
+			text: "玛多县"
+		}, {
+			value: "632627",
+			text: "其它区"
+		}]
+	}, {
+		value: "632700",
+		text: "玉树藏族自治州",
+		children: [{
+			value: "632721",
+			text: "玉树县"
+		}, {
+			value: "632722",
+			text: "杂多县"
+		}, {
+			value: "632723",
+			text: "称多县"
+		}, {
+			value: "632724",
+			text: "治多县"
+		}, {
+			value: "632725",
+			text: "囊谦县"
+		}, {
+			value: "632726",
+			text: "曲麻莱县"
+		}, {
+			value: "632727",
+			text: "其它区"
+		}]
+	}, {
+		value: "632800",
+		text: "海西蒙古族藏族自治州",
+		children: [{
+			value: "632801",
+			text: "格尔木市"
+		}, {
+			value: "632802",
+			text: "德令哈市"
+		}, {
+			value: "632821",
+			text: "乌兰县"
+		}, {
+			value: "632822",
+			text: "都兰县"
+		}, {
+			value: "632823",
+			text: "天峻县"
+		}, {
+			value: "632824",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '640000',
+	text: '宁夏',
+	children: [{
+		value: "640100",
+		text: "银川市",
+		children: [{
+			value: "640104",
+			text: "兴庆区"
+		}, {
+			value: "640105",
+			text: "西夏区"
+		}, {
+			value: "640106",
+			text: "金凤区"
+		}, {
+			value: "640121",
+			text: "永宁县"
+		}, {
+			value: "640122",
+			text: "贺兰县"
+		}, {
+			value: "640181",
+			text: "灵武市"
+		}, {
+			value: "640182",
+			text: "其它区"
+		}]
+	}, {
+		value: "640200",
+		text: "石嘴山市",
+		children: [{
+			value: "640202",
+			text: "大武口区"
+		}, {
+			value: "640205",
+			text: "惠农区"
+		}, {
+			value: "640221",
+			text: "平罗县"
+		}, {
+			value: "640222",
+			text: "其它区"
+		}]
+	}, {
+		value: "640300",
+		text: "吴忠市",
+		children: [{
+			value: "640302",
+			text: "利通区"
+		}, {
+			value: "640303",
+			text: "红寺堡区"
+		}, {
+			value: "640323",
+			text: "盐池县"
+		}, {
+			value: "640324",
+			text: "同心县"
+		}, {
+			value: "640381",
+			text: "青铜峡市"
+		}, {
+			value: "640382",
+			text: "其它区"
+		}]
+	}, {
+		value: "640400",
+		text: "固原市",
+		children: [{
+			value: "640402",
+			text: "原州区"
+		}, {
+			value: "640422",
+			text: "西吉县"
+		}, {
+			value: "640423",
+			text: "隆德县"
+		}, {
+			value: "640424",
+			text: "泾源县"
+		}, {
+			value: "640425",
+			text: "彭阳县"
+		}, {
+			value: "640426",
+			text: "其它区"
+		}]
+	}, {
+		value: "640500",
+		text: "中卫市",
+		children: [{
+			value: "640502",
+			text: "沙坡头区"
+		}, {
+			value: "640521",
+			text: "中宁县"
+		}, {
+			value: "640522",
+			text: "海原县"
+		}, {
+			value: "640523",
+			text: "其它区"
+		}]
+	}]
+}, {
+	value: '650000',
+	text: '新疆',
+	children: [{
+		value: "650100",
+		text: "乌鲁木齐市",
+		children: [{
+			value: "650102",
+			text: "天山区"
+		}, {
+			value: "650103",
+			text: "沙依巴克区"
+		}, {
+			value: "650104",
+			text: "新市区"
+		}, {
+			value: "650105",
+			text: "水磨沟区"
+		}, {
+			value: "650106",
+			text: "头屯河区"
+		}, {
+			value: "650107",
+			text: "达坂城区"
+		}, {
+			value: "650108",
+			text: "东山区"
+		}, {
+			value: "650109",
+			text: "米东区"
+		}, {
+			value: "650121",
+			text: "乌鲁木齐县"
+		}, {
+			value: "650122",
+			text: "其它区"
+		}]
+	}, {
+		value: "650200",
+		text: "克拉玛依市",
+		children: [{
+			value: "650202",
+			text: "独山子区"
+		}, {
+			value: "650203",
+			text: "克拉玛依区"
+		}, {
+			value: "650204",
+			text: "白碱滩区"
+		}, {
+			value: "650205",
+			text: "乌尔禾区"
+		}, {
+			value: "650206",
+			text: "其它区"
+		}]
+	}, {
+		value: "652100",
+		text: "吐鲁番地区",
+		children: [{
+			value: "652101",
+			text: "吐鲁番市"
+		}, {
+			value: "652122",
+			text: "鄯善县"
+		}, {
+			value: "652123",
+			text: "托克逊县"
+		}, {
+			value: "652124",
+			text: "其它区"
+		}]
+	}, {
+		value: "652200",
+		text: "哈密地区",
+		children: [{
+			value: "652201",
+			text: "哈密市"
+		}, {
+			value: "652222",
+			text: "巴里坤哈萨克自治县"
+		}, {
+			value: "652223",
+			text: "伊吾县"
+		}, {
+			value: "652224",
+			text: "其它区"
+		}]
+	}, {
+		value: "652300",
+		text: "昌吉回族自治州",
+		children: [{
+			value: "652301",
+			text: "昌吉市"
+		}, {
+			value: "652302",
+			text: "阜康市"
+		}, {
+			value: "652303",
+			text: "米泉市"
+		}, {
+			value: "652323",
+			text: "呼图壁县"
+		}, {
+			value: "652324",
+			text: "玛纳斯县"
+		}, {
+			value: "652325",
+			text: "奇台县"
+		}, {
+			value: "652327",
+			text: "吉木萨尔县"
+		}, {
+			value: "652328",
+			text: "木垒哈萨克自治县"
+		}, {
+			value: "652329",
+			text: "其它区"
+		}]
+	}, {
+		value: "652700",
+		text: "博尔塔拉蒙古自治州",
+		children: [{
+			value: "652701",
+			text: "博乐市"
+		}, {
+			value: "652722",
+			text: "精河县"
+		}, {
+			value: "652723",
+			text: "温泉县"
+		}, {
+			value: "652724",
+			text: "其它区"
+		}]
+	}, {
+		value: "652800",
+		text: "巴音郭楞蒙古自治州",
+		children: [{
+			value: "652801",
+			text: "库尔勒市"
+		}, {
+			value: "652822",
+			text: "轮台县"
+		}, {
+			value: "652823",
+			text: "尉犁县"
+		}, {
+			value: "652824",
+			text: "若羌县"
+		}, {
+			value: "652825",
+			text: "且末县"
+		}, {
+			value: "652826",
+			text: "焉耆回族自治县"
+		}, {
+			value: "652827",
+			text: "和静县"
+		}, {
+			value: "652828",
+			text: "和硕县"
+		}, {
+			value: "652829",
+			text: "博湖县"
+		}, {
+			value: "652830",
+			text: "其它区"
+		}]
+	}, {
+		value: "652900",
+		text: "阿克苏地区",
+		children: [{
+			value: "652901",
+			text: "阿克苏市"
+		}, {
+			value: "652922",
+			text: "温宿县"
+		}, {
+			value: "652923",
+			text: "库车县"
+		}, {
+			value: "652924",
+			text: "沙雅县"
+		}, {
+			value: "652925",
+			text: "新和县"
+		}, {
+			value: "652926",
+			text: "拜城县"
+		}, {
+			value: "652927",
+			text: "乌什县"
+		}, {
+			value: "652928",
+			text: "阿瓦提县"
+		}, {
+			value: "652929",
+			text: "柯坪县"
+		}, {
+			value: "652930",
+			text: "其它区"
+		}]
+	}, {
+		value: "653000",
+		text: "克孜勒苏柯尔克孜自治州",
+		children: [{
+			value: "653001",
+			text: "阿图什市"
+		}, {
+			value: "653022",
+			text: "阿克陶县"
+		}, {
+			value: "653023",
+			text: "阿合奇县"
+		}, {
+			value: "653024",
+			text: "乌恰县"
+		}, {
+			value: "653025",
+			text: "其它区"
+		}]
+	}, {
+		value: "653100",
+		text: "喀什地区",
+		children: [{
+			value: "653101",
+			text: "喀什市"
+		}, {
+			value: "653121",
+			text: "疏附县"
+		}, {
+			value: "653122",
+			text: "疏勒县"
+		}, {
+			value: "653123",
+			text: "英吉沙县"
+		}, {
+			value: "653124",
+			text: "泽普县"
+		}, {
+			value: "653125",
+			text: "莎车县"
+		}, {
+			value: "653126",
+			text: "叶城县"
+		}, {
+			value: "653127",
+			text: "麦盖提县"
+		}, {
+			value: "653128",
+			text: "岳普湖县"
+		}, {
+			value: "653129",
+			text: "伽师县"
+		}, {
+			value: "653130",
+			text: "巴楚县"
+		}, {
+			value: "653131",
+			text: "塔什库尔干塔吉克自治县"
+		}, {
+			value: "653132",
+			text: "其它区"
+		}]
+	}, {
+		value: "653200",
+		text: "和田地区",
+		children: [{
+			value: "653201",
+			text: "和田市"
+		}, {
+			value: "653221",
+			text: "和田县"
+		}, {
+			value: "653222",
+			text: "墨玉县"
+		}, {
+			value: "653223",
+			text: "皮山县"
+		}, {
+			value: "653224",
+			text: "洛浦县"
+		}, {
+			value: "653225",
+			text: "策勒县"
+		}, {
+			value: "653226",
+			text: "于田县"
+		}, {
+			value: "653227",
+			text: "民丰县"
+		}, {
+			value: "653228",
+			text: "其它区"
+		}]
+	}, {
+		value: "654000",
+		text: "伊犁哈萨克自治州",
+		children: [{
+			value: "654002",
+			text: "伊宁市"
+		}, {
+			value: "654003",
+			text: "奎屯市"
+		}, {
+			value: "654021",
+			text: "伊宁县"
+		}, {
+			value: "654022",
+			text: "察布查尔锡伯自治县"
+		}, {
+			value: "654023",
+			text: "霍城县"
+		}, {
+			value: "654024",
+			text: "巩留县"
+		}, {
+			value: "654025",
+			text: "新源县"
+		}, {
+			value: "654026",
+			text: "昭苏县"
+		}, {
+			value: "654027",
+			text: "特克斯县"
+		}, {
+			value: "654028",
+			text: "尼勒克县"
+		}, {
+			value: "654029",
+			text: "其它区"
+		}]
+	}, {
+		value: "654200",
+		text: "塔城地区",
+		children: [{
+			value: "654201",
+			text: "塔城市"
+		}, {
+			value: "654202",
+			text: "乌苏市"
+		}, {
+			value: "654221",
+			text: "额敏县"
+		}, {
+			value: "654223",
+			text: "沙湾县"
+		}, {
+			value: "654224",
+			text: "托里县"
+		}, {
+			value: "654225",
+			text: "裕民县"
+		}, {
+			value: "654226",
+			text: "和布克赛尔蒙古自治县"
+		}, {
+			value: "654227",
+			text: "其它区"
+		}]
+	}, {
+		value: "654300",
+		text: "阿勒泰地区",
+		children: [{
+			value: "654301",
+			text: "阿勒泰市"
+		}, {
+			value: "654321",
+			text: "布尔津县"
+		}, {
+			value: "654322",
+			text: "富蕴县"
+		}, {
+			value: "654323",
+			text: "福海县"
+		}, {
+			value: "654324",
+			text: "哈巴河县"
+		}, {
+			value: "654325",
+			text: "青河县"
+		}, {
+			value: "654326",
+			text: "吉木乃县"
+		}, {
+			value: "654327",
+			text: "其它区"
+		}]
+	}, {
+		value: "659001",
+		text: "石河子市"
+	}, {
+		value: "659002",
+		text: "阿拉尔市"
+	}, {
+		value: "659003",
+		text: "图木舒克市"
+	}, {
+		value: "659004",
+		text: "五家渠市"
+	}]
+}, {
+	value: '710000',
+	text: '台湾省',
+	children: [{
+		value: "710100",
+		text: "台北市",
+		children: [{
+			value: "710101",
+			text: "中正区"
+		}, {
+			value: "710102",
+			text: "大同区"
+		}, {
+			value: "710103",
+			text: "中山区"
+		}, {
+			value: "710104",
+			text: "松山区"
+		}, {
+			value: "710105",
+			text: "大安区"
+		}, {
+			value: "710106",
+			text: "万华区"
+		}, {
+			value: "710107",
+			text: "信义区"
+		}, {
+			value: "710108",
+			text: "士林区"
+		}, {
+			value: "710109",
+			text: "北投区"
+		}, {
+			value: "710110",
+			text: "内湖区"
+		}, {
+			value: "710111",
+			text: "南港区"
+		}, {
+			value: "710112",
+			text: "文山区"
+		}, {
+			value: "710113",
+			text: "其它区"
+		}]
+	}, {
+		value: "710200",
+		text: "高雄市",
+		children: [{
+			value: "710201",
+			text: "新兴区"
+		}, {
+			value: "710202",
+			text: "前金区"
+		}, {
+			value: "710203",
+			text: "芩雅区"
+		}, {
+			value: "710204",
+			text: "盐埕区"
+		}, {
+			value: "710205",
+			text: "鼓山区"
+		}, {
+			value: "710206",
+			text: "旗津区"
+		}, {
+			value: "710207",
+			text: "前镇区"
+		}, {
+			value: "710208",
+			text: "三民区"
+		}, {
+			value: "710209",
+			text: "左营区"
+		}, {
+			value: "710210",
+			text: "楠梓区"
+		}, {
+			value: "710211",
+			text: "小港区"
+		}, {
+			value: "710212",
+			text: "其它区"
+		}]
+	}, {
+		value: "710300",
+		text: "台南市",
+		children: [{
+			value: "710301",
+			text: "中西区"
+		}, {
+			value: "710302",
+			text: "东区"
+		}, {
+			value: "710303",
+			text: "南区"
+		}, {
+			value: "710304",
+			text: "北区"
+		}, {
+			value: "710305",
+			text: "安平区"
+		}, {
+			value: "710306",
+			text: "安南区"
+		}, {
+			value: "710307",
+			text: "其它区"
+		}]
+	}, {
+		value: "710400",
+		text: "台中市",
+		children: [{
+			value: "710401",
+			text: "中区"
+		}, {
+			value: "710402",
+			text: "东区"
+		}, {
+			value: "710403",
+			text: "南区"
+		}, {
+			value: "710404",
+			text: "西区"
+		}, {
+			value: "710405",
+			text: "北区"
+		}, {
+			value: "710406",
+			text: "北屯区"
+		}, {
+			value: "710407",
+			text: "西屯区"
+		}, {
+			value: "710408",
+			text: "南屯区"
+		}, {
+			value: "710409",
+			text: "其它区"
+		}]
+	}, {
+		value: "710500",
+		text: "金门县"
+	}, {
+		value: "710600",
+		text: "南投县"
+	}, {
+		value: "710700",
+		text: "基隆市",
+		children: [{
+			value: "710701",
+			text: "仁爱区"
+		}, {
+			value: "710702",
+			text: "信义区"
+		}, {
+			value: "710703",
+			text: "中正区"
+		}, {
+			value: "710704",
+			text: "中山区"
+		}, {
+			value: "710705",
+			text: "安乐区"
+		}, {
+			value: "710706",
+			text: "暖暖区"
+		}, {
+			value: "710707",
+			text: "七堵区"
+		}, {
+			value: "710708",
+			text: "其它区"
+		}]
+	}, {
+		value: "710800",
+		text: "新竹市",
+		children: [{
+			value: "710801",
+			text: "东区"
+		}, {
+			value: "710802",
+			text: "北区"
+		}, {
+			value: "710803",
+			text: "香山区"
+		}, {
+			value: "710804",
+			text: "其它区"
+		}]
+	}, {
+		value: "710900",
+		text: "嘉义市",
+		children: [{
+			value: "710901",
+			text: "东区"
+		}, {
+			value: "710902",
+			text: "西区"
+		}, {
+			value: "710903",
+			text: "其它区"
+		}]
+	}, {
+		value: "711100",
+		text: "新北市"
+	}, {
+		value: "711200",
+		text: "宜兰县"
+	}, {
+		value: "711300",
+		text: "新竹县"
+	}, {
+		value: "711400",
+		text: "桃园县"
+	}, {
+		value: "711500",
+		text: "苗栗县"
+	}, {
+		value: "711700",
+		text: "彰化县"
+	}, {
+		value: "711900",
+		text: "嘉义县"
+	}, {
+		value: "712100",
+		text: "云林县"
+	}, {
+		value: "712400",
+		text: "屏东县"
+	}, {
+		value: "712500",
+		text: "台东县"
+	}, {
+		value: "712600",
+		text: "花莲县"
+	}, {
+		value: "712700",
+		text: "澎湖县"
+	}]
+}, {
+	value: '810000',
+	text: '香港',
+	children: [{
+		value: "810100",
+		text: "香港岛",
+		children: [{
+			value: "810101",
+			text: "中西区"
+		}, {
+			value: "810102",
+			text: "湾仔"
+		}, {
+			value: "810103",
+			text: "东区"
+		}, {
+			value: "810104",
+			text: "南区"
+		}]
+	}, {
+		value: "810200",
+		text: "九龙",
+		children: [{
+			value: "810201",
+			text: "九龙城区"
+		}, {
+			value: "810202",
+			text: "油尖旺区"
+		}, {
+			value: "810203",
+			text: "深水埗区"
+		}, {
+			value: "810204",
+			text: "黄大仙区"
+		}, {
+			value: "810205",
+			text: "观塘区"
+		}]
+	}, {
+		value: "810300",
+		text: "新界",
+		children: [{
+			value: "810301",
+			text: "北区"
+		}, {
+			value: "810302",
+			text: "大埔区"
+		}, {
+			value: "810303",
+			text: "沙田区"
+		}, {
+			value: "810304",
+			text: "西贡区"
+		}, {
+			value: "810305",
+			text: "元朗区"
+		}, {
+			value: "810306",
+			text: "屯门区"
+		}, {
+			value: "810307",
+			text: "荃湾区"
+		}, {
+			value: "810308",
+			text: "葵青区"
+		}, {
+			value: "810309",
+			text: "离岛区"
+		}]
+	}]
+}, {
+	value: '820000',
+	text: '澳门',
+	children: [{
+		value: "820100",
+		text: "澳门半岛"
+	}, {
+		value: "820200",
+		text: "离岛"
+	}]
+}, {
+	value: '990000',
+	text: '海外',
+	children: [{
+		value: "990100",
+		text: "海外"
+	}]
+}]
+
+export default{
+	cityData
+}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/common.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/common.js
new file mode 100644
index 000000000..a2b133f39
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/common.js	
@@ -0,0 +1,55 @@
+export default {
+	fmtDate(obj) {
+		let date =obj? new Date(obj) : new Date();
+		let y = 1900+date.getYear();
+		let m = "0"+(date.getMonth()+1);
+		let d = "0"+date.getDate();
+		return y+"-"+m.substring(m.length-2,m.length)+"-"+d.substring(d.length-2,d.length);
+	},
+	judgeDate(obj) { //判断学期
+		let date = obj ? new Date(obj) : new Date();
+		let y = 1900 + date.getYear();
+		let m = date.getMonth() + 1;
+		if(m >= 2) {
+			if(m < 7) {
+				return (y - 1) + '-' + y + '学年第二学期'
+			} else {
+				return y + '-' + (y + 1) + '学年第一学期'
+			}
+		}else{
+			return (y - 1) + '-' + y + '学年第一学期'
+		}
+	},
+	oneDayTime () {
+		return 24 * 60 * 60 * 1000  //一天时间
+	},
+	weekday(obj) { //根据今天得到周一与周日的时间
+		var now = obj? new Date(obj):new Date(); 
+		var nowTime = now.getTime(); 
+		var day = now.getDay();
+		//显示周一
+		var MondayTime = nowTime - (day - 1) * this.oneDayTime() ; 
+		//显示周日
+		var SundayTime =  nowTime + (7 - day) * this.oneDayTime() ; 
+		return {
+			MondayTime: MondayTime,
+			Monday: this.fmtDate(MondayTime),
+			SundayTime: SundayTime,
+			Sunday: this.fmtDate(SundayTime)
+		}
+	},
+	compare (key) {
+	  return (obj1, obj2) => {
+	    let value1 = obj1[key]
+	    let value2 = obj2[key]
+	    if (value1 < value2) {
+	      return -1;
+	    } else if (value1 > value2) {
+	      return 1;
+	    } else {
+	      return 0
+	    }
+	  }
+	}
+}
+
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/scanCodeFun.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/scanCodeFun.js
new file mode 100644
index 000000000..509568d1b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/scanCodeFun.js	
@@ -0,0 +1,29 @@
+export default {
+	scanCodeFun() {
+		const promise = new Promise((resolve, reject) => {
+			// #ifdef APP-PLUS || MP-WEIXIN
+			uni.scanCode({
+				success: function(res) {
+					// console.log(res)
+					// console.log('条码类型：' + res.scanType);
+					// console.log('条码内容：' + res.result);
+					resolve(res)
+				},
+				fail: function(res) {
+					resolve(false)
+				}
+			});
+			// #endif
+			
+			// #ifndef APP-PLUS || MP-WEIXIN
+			resolve(false)
+			uni.showToast({
+				title: '请下载app或者到微信浏览器打开网页',
+				icon: 'none',
+				mask: false
+			})
+			// #endif
+		})
+		return promise
+	}
+}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/todayTime.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/todayTime.js
new file mode 100644
index 000000000..916052f92
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/todayTime.js	
@@ -0,0 +1,17 @@
+export default {
+	fmtDate(obj) {
+		let date =obj? new Date(obj) : new Date();
+		let y = 1900+date.getYear();
+		let m = "0"+(date.getMonth()+1);
+		let d = "0"+date.getDate();
+		let h = "0"+date.getHours();
+		let min = "0"+date.getMinutes();
+		let second = "0"+date.getSeconds();
+		return {
+			ymdhMin:y+"-"+m.substring(m.length-2,m.length)+"-"+d.substring(d.length-2,d.length) + ' ' + h.substring(h.length-2,h.length) + ':' + min.substring(min.length-2,min.length),
+			ymdhMins:y+"-"+m.substring(m.length-2,m.length)+"-"+d.substring(d.length-2,d.length) + ' ' + h.substring(h.length-2,h.length) + ':' + min.substring(min.length-2,min.length) + ':' + second.substring(second.length-2,second.length),
+			ymd:y+"-"+m.substring(m.length-2,m.length)+"-"+d.substring(d.length-2,d.length)
+		};
+	}
+}
+
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js
index 8e61e971a..b64043ab0 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js	
@@ -206,7 +206,7 @@ export default {
 				return []
 			}
 
-			return await this.HTTP_GET('/datasource/map', {
+			return await this.HTTP_GET('learun/adms/datasource/map', {
 				code,
 				ver: ''
 			})
@@ -218,7 +218,7 @@ export default {
 				return ''
 			}
 
-			return await this.HTTP_GET('/coderule/code', rulecode)
+			return await this.HTTP_GET('learun/adms/coderule/code', rulecode)
 		},
 
 		// 拉取指定 id 的文件信息
@@ -227,7 +227,7 @@ export default {
 				return null
 			}
 
-			return await this.HTTP_GET('/annexes/wxfileinfo', fileId)
+			return await this.HTTP_GET('learun/adms/annexes/wxfileinfo', fileId)
 		},
 
 		// 封装的 GET 请求，集成了验证信息
@@ -393,10 +393,10 @@ export default {
 		// 目前包括了：公司、部门、人员、数据字典
 		async FETCH_CLIENTDATA() {
 			await Promise.all([
-				this.HTTP_GET('/company/map').then(res => this.SET_GLOBAL('company', res.data || {})),
-				this.HTTP_GET('/department/map').then(res => this.SET_GLOBAL('department', res.data || {})),
-				this.HTTP_GET('/user/map').then(res => this.SET_GLOBAL('user', res.data || {})),
-				this.HTTP_GET('/dataitem/map').then(res => this.SET_GLOBAL('dataDictionary', res.data || {}))
+				this.HTTP_GET('learun/adms/company/map').then(res => this.SET_GLOBAL('company', res.data || {})),
+				this.HTTP_GET('learun/adms/department/map').then(res => this.SET_GLOBAL('department', res.data || {})),
+				this.HTTP_GET('learun/adms/user/map').then(res => this.SET_GLOBAL('user', res.data || {})),
+				this.HTTP_GET('learun/adms/dataitem/map').then(res => this.SET_GLOBAL('dataDictionary', res.data || {}))
 			])
 		},
 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/customlist-sidepage-datefilter.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/customlist-sidepage-datefilter.vue
index fdea8e1bb..d32ec0eba 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/customlist-sidepage-datefilter.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/customlist-sidepage-datefilter.vue	
@@ -76,6 +76,7 @@
       @change="customChange"
       title="结束时间"
       placeholder="点击来选取"
+	  
     />
   </view>
 </template>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue
index 838165d5c..5ca7caacc 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue	
@@ -124,11 +124,21 @@ export default {
 
       // 加载子部门
       if (this.level === 'department' || this.level === 'user') {
-        children = children.concat(
-          Object.entries(this.GET_GLOBAL('department'))
-            .filter(([id, item]) => item.companyId === this.root.id && Number(item.parentId) !== -1)
-            .map(([id, item]) => ({ ...item, id, type: 'department' }))
-        )
+		  console.log(this.level,'level')
+		  if(this.root.type == 'company'){
+			  children = children.concat(
+			    Object.entries(this.GET_GLOBAL('department'))
+			      .filter(([id, item]) => item.companyId === this.root.id && (Number(item.parentId) == -1||Number(item.parentId) == 0))
+			      .map(([id, item]) => ({ ...item, id, type: 'department' }))
+			  )
+		  }
+		  else{
+			  children = children.concat(
+			    Object.entries(this.GET_GLOBAL('department'))
+			      .filter(([id, item]) => item.companyId === this.root.companyId && (item.parentId == this.root.id ))
+			      .map(([id, item]) => ({ ...item, id, type: 'department' }))
+			  )
+		  }
       }
 
       // 加载子职员
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/scroll-list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/scroll-list.vue
index 250667e2d..f40958889 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/scroll-list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/scroll-list.vue	
@@ -81,6 +81,6 @@ export default {
 <style lang="less">
 :host {
   display: block;
-  height: 100%;
+  height: 100vh;
 }
 </style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/workflow-action.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/workflow-action.vue
index f95837fd9..7b8c68d9e 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/workflow-action.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/workflow-action.vue	
@@ -38,7 +38,7 @@
 
     <!-- 子流程草稿/提交按钮 -->
     <view
-      v-if="['child', 'create', 'again'].includes(type)"
+      v-if="['child', 'create', 'again','draft'].includes(type)"
       class="form-action padding bg-white margin-top lr-hidden"
       style="padding-top: 0;"
     >
@@ -95,7 +95,7 @@ export default {
 
     // 是否显示催办按钮（仅限我的任务，满足以下条件则可以催办：已开始、未结束、未作废）
     canUrge() {
-      if (this.openFrom !== 'my') {
+      if (this.openFrom !== 'my' || ['child', 'create', 'again','draft'].includes(this.type)) {
         return false
       }
 
@@ -104,7 +104,7 @@ export default {
 
     // 是否显示撤销按钮（仅限我的任务，满足以下条件则可以撤销：未开始）
     canRevoke() {
-      if (this.openFrom !== 'my') {
+      if (this.openFrom !== 'my' || ['child', 'create', 'again','draft'].includes(this.type)) {
         return false
       }
 
@@ -113,7 +113,7 @@ export default {
 
     // 是否允许加签（仅限待办任务，流程中配置允许加签则）
     canMultipleSign() {
-      if (this.openFrom !== 'pre') {
+      if (this.openFrom !== 'pre' || ['child', 'create', 'again','draft'].includes(this.type)) {
         return false
       }
 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/workflow-timeline.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/workflow-timeline.vue
index 8b8bc05ab..5e3d482d4 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/workflow-timeline.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/workflow-timeline.vue	
@@ -36,9 +36,11 @@
 <script>
 export default {
   name: 'l-workflow-timeline',
-
   props: {
-    processList: { default: () => [] }
-  }
+    processList: { default: () => [] },
+	currentTask: { default: () => ({}) },
+  },
+  
+  
 }
 </script>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-ali/date-picker.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-ali/date-picker.vue
index e24325735..b43fa6ddc 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-ali/date-picker.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-ali/date-picker.vue	
@@ -26,7 +26,9 @@ export default {
     required: {},
     value: {}
   },
-
+created() {
+	console.log(this.end)
+},
   methods: {
     click(e) {
       if (this.disabled) {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-ali/title.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-ali/title.vue
index 678f5f2f5..82d074ea4 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-ali/title.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-ali/title.vue	
@@ -1,5 +1,5 @@
 <template>
-  <view v-if="type !== 'default'" :class="className" :style="style" class="cu-bar bg-white cu-title">
+  <view @click="$emit('click', $event)" v-if="type !== 'default'" :class="className" :style="style" class="cu-bar bg-white cu-title">
     <!-- 下划线标题(普通/变色) -->
     <view v-if="type === 'underline' || type === 'colorfulUnderline'" class="action border-title">
       <text :class="['text-' + color, blod ? 'text-blod' : '']" class="text-xl"><slot></slot></text>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-mp/select.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-mp/select.vue
index ee676a1e7..a41faf25e 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-mp/select.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-mp/select.vue	
@@ -57,6 +57,7 @@ export default {
       this.index = e.detail.value
       this.$emit('input', this.currentModel)
       this.$emit('change', this.currentModel)
+	  //console.log(e)
     },
 
     calcIndex() {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-mp/title.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-mp/title.vue
index 190d0cbf6..46cd10caa 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-mp/title.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-mp/title.vue	
@@ -31,7 +31,7 @@
   </view>
 
   <!-- 普通标题(圆点/长圆点) -->
-  <view v-else :class="[border ? 'solid-bottom' : '']" class="cu-bar bg-white cu-title">
+  <view @click="$emit('click', $event)" v-else :class="[border ? 'solid-bottom' : '']" class="cu-bar bg-white cu-title">
     <view class="action" style="vertical-align: middle;">
       <text
         :class="[subColor ? 'text-' + subColor : '', long ? 'cuIcon-titles' : 'cuIcon-title']"
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/location/location.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/location/location.vue
new file mode 100644
index 000000000..468a9a286
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/location/location.vue	
@@ -0,0 +1,106 @@
+<template>
+	<view class="">
+		<l-label :title="title">
+			<picker mode="multiSelector" @columnchange="bindMultiPickerColumnChange" :value="multiIndex" :range="multiArray" @change="locationChange">
+				<view class="picker">{{ multiArray[0][multiIndex[0]] }}-{{ multiArray[1][multiIndex[1]] }}-{{ multiArray[2][multiIndex[2]] }}</view>
+			</picker>
+		</l-label>
+	</view>
+</template>
+
+<script>
+import city from '@/common/js/city.js';
+export default {
+	name: 'location-picker',
+	props: {
+		multiIndex: { 
+			type: Array, 
+			default() {
+				return [0, 0, 0]
+			},
+		},
+		code:{}
+	},
+	data() {
+		return {
+			title: '省市区',
+			multiArray: [[], [], []],
+			codeArr: null
+		};
+	},
+	methods:{
+		init(){
+			var _this = this;
+			//根据code回显
+			if(this.code != ''){
+				this.codeArr = this.code.split(',');
+				this.Feedback(city.cityData, 0);
+			}
+			this.cityCl(city.cityData, 0);
+			this.locationChange()
+			// console.log(this.code)
+			// console.log(this.codeArr)
+			// console.log(this.multiIndex)
+		},
+		Feedback(data, num) {
+			let _this = this;
+			data.forEach((n, i) => {
+				if(n.value == _this.codeArr[num]){
+					_this.multiIndex[num] = i;
+					if (n.children) {
+						let number = num + 1;
+						_this.Feedback(n.children, number);
+					}
+				}
+			});
+		},
+		locationChange() {
+			let province = city.cityData[this.multiIndex[0]];
+			let citys = province.children[this.multiIndex[1]];
+			let area = citys.children[this.multiIndex[2]];
+
+			// console.log(`province.value , citys.value , area.value`)
+			this.$emit('input', province.value + ',' + citys.value + ',' + area.value)
+			this.$emit('change', province.value + ',' + citys.value + ',' + area.value)
+		},
+		bindMultiPickerColumnChange: function(e) {
+			// console.log(e);
+			// console.log('修改的列为：' + e.detail.column + '，值为：' + e.detail.value);
+			let _this = this;
+			this.multiIndex[e.detail.column] = e.detail.value;
+			if (e.detail.column == 0) {
+				_this.multiArray[1].length = 0;
+				_this.multiArray[2].length = 0;
+				_this.multiIndex[1] = 0;
+				_this.multiIndex[2] = 0;
+				this.cityCl(city.cityData[_this.multiIndex[0]].children, 1);
+			} else if (e.detail.column == 1) {
+				_this.multiArray[2].length = 0;
+				_this.multiIndex[2] = 0;
+				this.cityCl(city.cityData[_this.multiIndex[0]].children[_this.multiIndex[1]].children, 2);
+			}
+			this.$forceUpdate();
+		},
+		cityCl(data, num) {
+			let _this = this;
+			data.forEach((n, i) => {
+				if (i == _this.multiIndex[num] && n.children) {
+					let number = num + 1;
+					_this.cityCl(n.children, number);
+				}
+				_this.multiArray[num].push(n.text);
+			});
+		},
+		watch: {
+		  value() {
+		    this.locationChange()
+		  }
+		}
+	},
+	mounted() {
+		this.init()
+	}
+};
+</script>
+
+<style lang="less" scoped></style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/uni-calendar/calendar.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/uni-calendar/calendar.js
new file mode 100644
index 000000000..b8d7d6fc4
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/uni-calendar/calendar.js	
@@ -0,0 +1,546 @@
+/**
+* @1900-2100区间内的公历、农历互转
+* @charset UTF-8
+* @github  https://github.com/jjonline/calendar.js
+* @Author  Jea杨(JJonline@JJonline.Cn)
+* @Time    2014-7-21
+* @Time    2016-8-13 Fixed 2033hex、Attribution Annals
+* @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
+* @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+* @Version 1.0.3
+* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+*/
+/* eslint-disable */
+var calendar = {
+
+  /**
+      * 农历1900-2100的润大小信息表
+      * @Array Of Property
+      * @return Hex
+      */
+  lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
+    0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+    0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+    0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+    0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+    0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+    0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+    0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+    0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+    0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+    0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+    0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+    0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+    0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+    0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+    /** Add By JJonline@JJonline.Cn**/
+    0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+    0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+    0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+    0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+    0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+    0x0d520], // 2100
+
+  /**
+      * 公历每个月份的天数普通表
+      * @Array Of Property
+      * @return Number
+      */
+  solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+  /**
+      * 天干地支之天干速查表
+      * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+      * @return Cn string
+      */
+  Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
+
+  /**
+      * 天干地支之地支速查表
+      * @Array Of Property
+      * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+      * @return Cn string
+      */
+  Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149', '\u620c', '\u4ea5'],
+
+  /**
+      * 天干地支之地支速查表<=>生肖
+      * @Array Of Property
+      * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+      * @return Cn string
+      */
+  Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21', '\u72d7', '\u732a'],
+
+  /**
+      * 24节气速查表
+      * @Array Of Property
+      * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+      * @return Cn string
+      */
+  solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206', '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3', '\u5c0f\u6691', '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732', '\u971c\u964d', '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'],
+
+  /**
+      * 1900-2100各年的24节气日期速查表
+      * @Array Of Property
+      * @return 0x string For splice
+      */
+  sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+    '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+    '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+    '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'],
+
+  /**
+      * 数字转中文速查表
+      * @Array Of Property
+      * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+      * @return Cn string
+      */
+  nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341'],
+
+  /**
+      * 日期转农历称呼速查表
+      * @Array Of Property
+      * @trans ['初','十','廿','卅']
+      * @return Cn string
+      */
+  nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+  /**
+      * 月份转农历称呼速查表
+      * @Array Of Property
+      * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+      * @return Cn string
+      */
+  nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341', '\u51ac', '\u814a'],
+
+  /**
+      * 返回农历y年一整年的总天数
+      * @param lunar Year
+      * @return Number
+      * @eg:var count = calendar.lYearDays(1987) ;//count=387
+      */
+  lYearDays: function (y) {
+    var i; var sum = 348
+    for (i = 0x8000; i > 0x8; i >>= 1) { sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0 }
+    return (sum + this.leapDays(y))
+  },
+
+  /**
+      * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+      * @param lunar Year
+      * @return Number (0-12)
+      * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+      */
+  leapMonth: function (y) { // 闰字编码 \u95f0
+    return (this.lunarInfo[y - 1900] & 0xf)
+  },
+
+  /**
+      * 返回农历y年闰月的天数 若该年没有闰月则返回0
+      * @param lunar Year
+      * @return Number (0、29、30)
+      * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+      */
+  leapDays: function (y) {
+    if (this.leapMonth(y)) {
+      return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+    }
+    return (0)
+  },
+
+  /**
+      * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+      * @param lunar Year
+      * @return Number (-1、29、30)
+      * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+      */
+  monthDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 }// 月份参数从1至12，参数错误返回-1
+    return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+  },
+
+  /**
+      * 返回公历(!)y年m月的天数
+      * @param solar Year
+      * @return Number (-1、28、29、30、31)
+      * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+      */
+  solarDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var ms = m - 1
+    if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
+      return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
+    } else {
+      return (this.solarMonth[ms])
+    }
+  },
+
+  /**
+     * 农历年份转换为干支纪年
+     * @param  lYear 农历年的年份数
+     * @return Cn string
+     */
+  toGanZhiYear: function (lYear) {
+    var ganKey = (lYear - 3) % 10
+    var zhiKey = (lYear - 3) % 12
+    if (ganKey == 0) ganKey = 10// 如果余数为0则为最后一个天干
+    if (zhiKey == 0) zhiKey = 12// 如果余数为0则为最后一个地支
+    return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+  },
+
+  /**
+     * 公历月、日判断所属星座
+     * @param  cMonth [description]
+     * @param  cDay [description]
+     * @return Cn string
+     */
+  toAstro: function (cMonth, cDay) {
+    var s = '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+    return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7'// 座
+  },
+
+  /**
+      * 传入offset偏移量返回干支
+      * @param offset 相对甲子的偏移量
+      * @return Cn string
+      */
+  toGanZhi: function (offset) {
+    return this.Gan[offset % 10] + this.Zhi[offset % 12]
+  },
+
+  /**
+      * 传入公历(!)y年获得该年第n个节气的公历日期
+      * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+      * @return day Number
+      * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+      */
+  getTerm: function (y, n) {
+    if (y < 1900 || y > 2100) { return -1 }
+    if (n < 1 || n > 24) { return -1 }
+    var _table = this.sTermInfo[y - 1900]
+    var _info = [
+      parseInt('0x' + _table.substr(0, 5)).toString(),
+      parseInt('0x' + _table.substr(5, 5)).toString(),
+      parseInt('0x' + _table.substr(10, 5)).toString(),
+      parseInt('0x' + _table.substr(15, 5)).toString(),
+      parseInt('0x' + _table.substr(20, 5)).toString(),
+      parseInt('0x' + _table.substr(25, 5)).toString()
+    ]
+    var _calday = [
+      _info[0].substr(0, 1),
+      _info[0].substr(1, 2),
+      _info[0].substr(3, 1),
+      _info[0].substr(4, 2),
+
+      _info[1].substr(0, 1),
+      _info[1].substr(1, 2),
+      _info[1].substr(3, 1),
+      _info[1].substr(4, 2),
+
+      _info[2].substr(0, 1),
+      _info[2].substr(1, 2),
+      _info[2].substr(3, 1),
+      _info[2].substr(4, 2),
+
+      _info[3].substr(0, 1),
+      _info[3].substr(1, 2),
+      _info[3].substr(3, 1),
+      _info[3].substr(4, 2),
+
+      _info[4].substr(0, 1),
+      _info[4].substr(1, 2),
+      _info[4].substr(3, 1),
+      _info[4].substr(4, 2),
+
+      _info[5].substr(0, 1),
+      _info[5].substr(1, 2),
+      _info[5].substr(3, 1),
+      _info[5].substr(4, 2)
+    ]
+    return parseInt(_calday[n - 1])
+  },
+
+  /**
+      * 传入农历数字月份返回汉语通俗表示法
+      * @param lunar month
+      * @return Cn string
+      * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+      */
+  toChinaMonth: function (m) { // 月 => \u6708
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var s = this.nStr3[m - 1]
+    s += '\u6708'// 加上月字
+    return s
+  },
+
+  /**
+      * 传入农历日期数字返回汉字表示法
+      * @param lunar day
+      * @return Cn string
+      * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+      */
+  toChinaDay: function (d) { // 日 => \u65e5
+    var s
+    switch (d) {
+      case 10:
+        s = '\u521d\u5341'; break
+      case 20:
+        s = '\u4e8c\u5341'; break
+        break
+      case 30:
+        s = '\u4e09\u5341'; break
+        break
+      default :
+        s = this.nStr2[Math.floor(d / 10)]
+        s += this.nStr1[d % 10]
+    }
+    return (s)
+  },
+
+  /**
+      * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+      * @param y year
+      * @return Cn string
+      * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+      */
+  getAnimal: function (y) {
+    return this.Animals[(y - 4) % 12]
+  },
+
+  /**
+      * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+      * @param y  solar year
+      * @param m  solar month
+      * @param d  solar day
+      * @return JSON object
+      * @eg:console.log(calendar.solar2lunar(1987,11,01));
+      */
+  solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
+    // 年份限定、上限
+    if (y < 1900 || y > 2100) {
+      return -1// undefined转换为数字变为NaN
+    }
+    // 公历传参最下限
+    if (y == 1900 && m == 1 && d < 31) {
+      return -1
+    }
+    // 未传参  获得当天
+    if (!y) {
+      var objDate = new Date()
+    } else {
+      var objDate = new Date(y, parseInt(m) - 1, d)
+    }
+    var i; var leap = 0; var temp = 0
+    // 修正ymd参数
+    var y = objDate.getFullYear()
+    var m = objDate.getMonth() + 1
+    var d = objDate.getDate()
+    var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0, 31)) / 86400000
+    for (i = 1900; i < 2101 && offset > 0; i++) {
+      temp = this.lYearDays(i)
+      offset -= temp
+    }
+    if (offset < 0) {
+      offset += temp; i--
+    }
+
+    // 是否今天
+    var isTodayObj = new Date()
+    var isToday = false
+    if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
+      isToday = true
+    }
+    // 星期几
+    var nWeek = objDate.getDay()
+    var cWeek = this.nStr1[nWeek]
+    // 数字表示周几顺应天朝周一开始的惯例
+    if (nWeek == 0) {
+      nWeek = 7
+    }
+    // 农历年
+    var year = i
+    var leap = this.leapMonth(i) // 闰哪个月
+    var isLeap = false
+
+    // 效验闰月
+    for (i = 1; i < 13 && offset > 0; i++) {
+      // 闰月
+      if (leap > 0 && i == (leap + 1) && isLeap == false) {
+        --i
+        isLeap = true; temp = this.leapDays(year) // 计算农历闰月天数
+      } else {
+        temp = this.monthDays(year, i)// 计算农历普通月天数
+      }
+      // 解除闰月
+      if (isLeap == true && i == (leap + 1)) { isLeap = false }
+      offset -= temp
+    }
+    // 闰月导致数组下标重叠取反
+    if (offset == 0 && leap > 0 && i == leap + 1) {
+      if (isLeap) {
+        isLeap = false
+      } else {
+        isLeap = true; --i
+      }
+    }
+    if (offset < 0) {
+      offset += temp; --i
+    }
+    // 农历月
+    var month = i
+    // 农历日
+    var day = offset + 1
+    // 天干地支处理
+    var sm = m - 1
+    var gzY = this.toGanZhiYear(year)
+
+    // 当月的两个节气
+    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+    var firstNode = this.getTerm(y, (m * 2 - 1))// 返回当月「节」为几日开始
+    var secondNode = this.getTerm(y, (m * 2))// 返回当月「节」为几日开始
+
+    // 依据12节气修正干支月
+    var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+    if (d >= firstNode) {
+      gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+    }
+
+    // 传入的日期的节气与否
+    var isTerm = false
+    var Term = null
+    if (firstNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 2]
+    }
+    if (secondNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 1]
+    }
+    // 日柱 当月一日与 1900/1/1 相差天数
+    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+    var gzD = this.toGanZhi(dayCyclical + d - 1)
+    // 该日期所属的星座
+    var astro = this.toAstro(m, d)
+
+    return { 'lYear': year, 'lMonth': month, 'lDay': day, 'Animal': this.getAnimal(year), 'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month), 'IDayCn': this.toChinaDay(day), 'cYear': y, 'cMonth': m, 'cDay': d, 'gzYear': gzY, 'gzMonth': gzM, 'gzDay': gzD, 'isToday': isToday, 'isLeap': isLeap, 'nWeek': nWeek, 'ncWeek': '\u661f\u671f' + cWeek, 'isTerm': isTerm, 'Term': Term, 'astro': astro }
+  },
+
+  /**
+      * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+      * @param y  lunar year
+      * @param m  lunar month
+      * @param d  lunar day
+      * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+      * @return JSON object
+      * @eg:console.log(calendar.lunar2solar(1987,9,10));
+      */
+  lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+    var isLeapMonth = !!isLeapMonth
+    var leapOffset = 0
+    var leapMonth = this.leapMonth(y)
+    var leapDay = this.leapDays(y)
+    if (isLeapMonth && (leapMonth != m)) { return -1 }// 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+    if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) { return -1 }// 超出了最大极限值
+    var day = this.monthDays(y, m)
+    var _day = day
+    // bugFix 2016-9-25
+    // if month is leap, _day use leapDays method
+    if (isLeapMonth) {
+      _day = this.leapDays(y, m)
+    }
+    if (y < 1900 || y > 2100 || d > _day) { return -1 }// 参数合法性效验
+
+    // 计算农历的时间差
+    var offset = 0
+    for (var i = 1900; i < y; i++) {
+      offset += this.lYearDays(i)
+    }
+    var leap = 0; var isAdd = false
+    for (var i = 1; i < m; i++) {
+      leap = this.leapMonth(y)
+      if (!isAdd) { // 处理闰月
+        if (leap <= i && leap > 0) {
+          offset += this.leapDays(y); isAdd = true
+        }
+      }
+      offset += this.monthDays(y, i)
+    }
+    // 转换闰月农历 需补充该年闰月的前一个月的时差
+    if (isLeapMonth) { offset += day }
+    // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+    var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+    var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+    var cY = calObj.getUTCFullYear()
+    var cM = calObj.getUTCMonth() + 1
+    var cD = calObj.getUTCDate()
+
+    return this.solar2lunar(cY, cM, cD)
+  }
+}
+
+export default calendar
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/uni-calendar/uni-calendar-item.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/uni-calendar/uni-calendar-item.vue
new file mode 100644
index 000000000..c66a58d31
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/uni-calendar/uni-calendar-item.vue	
@@ -0,0 +1,170 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+		'uni-calendar-item--checked':(calendar.fullDate === weeks.fullDate && !weeks.isDay) ,
+		'uni-calendar-item--before-checked':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked':weeks.afterMultiple,
+		}"
+	 @click="choiceDate(weeks)">
+		<view class="uni-calendar-item__weeks-box-item">
+			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text" :class="{
+				'uni-calendar-item--isDay-text': weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.date}}</text>
+			<text v-if="!lunar&&!weeks.extraInfo && weeks.isDay" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				}">今天</text>
+			<text v-if="lunar&&!weeks.extraInfo" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.isDay?'今天': (weeks.lunar.IDayCn === '初一'?weeks.lunar.IMonthCn:weeks.lunar.IDayCn)}}</text>
+			<text v-if="weeks.extraInfo&&weeks.extraInfo.info" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--extra':weeks.extraInfo.info,
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.extraInfo.info}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-lunar-text {
+		font-size: $uni-font-size-sm;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 100rpx;
+		height: 100rpx;
+	}
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: $uni-color-error;
+
+	}
+
+	.uni-calendar-item--disable {
+		background-color: rgba(249, 249, 249, $uni-opacity-disabled);
+		color: $uni-text-color-disable;
+	}
+
+	.uni-calendar-item--isDay-text {
+		color: $uni-color-primary;
+	}
+
+	.uni-calendar-item--isDay {
+		background-color: $uni-color-primary;
+		opacity: 0.8;
+		color: #fff;
+	}
+
+	.uni-calendar-item--extra {
+		color: $uni-color-error;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--checked {
+		background-color: $uni-color-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color: $uni-color-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+	.uni-calendar-item--before-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+	.uni-calendar-item--after-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/uni-calendar/uni-calendar.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/uni-calendar/uni-calendar.vue
new file mode 100644
index 000000000..405832050
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/uni-calendar/uni-calendar.vue	
@@ -0,0 +1,505 @@
+<template>
+	<view class="uni-calendar">
+		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}" @click="clean"></view>
+		<view v-if="insert || show" class="uni-calendar__content" :class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow}">
+			<view v-if="!insert" class="uni-calendar__header uni-calendar--fixed-top">
+				<view class="uni-calendar__header-btn-box" @click="close">
+					<text class="uni-calendar__header-text uni-calendar--fixed-width">取消</text>
+				</view>
+				<view class="uni-calendar__header-btn-box" @click="confirm">
+					<text class="uni-calendar__header-text uni-calendar--fixed-width">确定</text>
+				</view>
+			</view>
+			<view class="uni-calendar__header">
+				<view class="uni-calendar__header-btn-box" @click.stop="pre">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text class="uni-calendar__header-text">{{ (nowDate.year||'') +'年'+( nowDate.month||'') +'月'}}</text>
+				</picker>
+				<view class="uni-calendar__header-btn-box" @click.stop="next">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+				<text class="uni-calendar__backtoday" @click="backtoday">回到今天</text>
+
+			</view>
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+				<view class="uni-calendar__weeks">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">日</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">一</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">二</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">三</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">四</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">五</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">六</text>
+					</view>
+				</view>
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></calendar-item>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Calendar from './util.js';
+	import calendarItem from './uni-calendar-item.vue'
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {Boolean} lunar 显示农历
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem
+		},
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: '',
+				aniMaskShow: false
+			}
+		},
+		watch: {
+			date(newVal) {
+				this.cale.setDate(newVal)
+				this.init(this.cale.selectDate.fullDate)
+			},
+			startDate(val){
+				this.cale.resetSatrtDate(val)
+			},
+			endDate(val){
+				this.cale.resetEndDate(val)
+			},
+			selected(newVal) {
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			}
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				// date: new Date(),
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			// 选中某一天
+			this.cale.setDate(this.date)
+			this.init(this.cale.selectDate.fullDate)
+			// this.setDay
+		},
+		methods: {
+			// 取消穿透
+			clean() {},
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				console.log(this.cale.getDate(value));
+				this.cale.setDate(value)
+				this.init(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				this.weeks = this.cale.weeks
+				this.nowDate = this.calendar = this.cale.getInfo(date)
+			},
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					this.cale.setDate(this.date)
+					this.init(this.cale.selectDate.fullDate)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				if (!this.insert) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					lunar,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					fulldate: fullDate,
+					lunar,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				this.change()
+			},
+			/**
+			 * 回到今天
+			 */
+			backtoday() {
+				console.log(this.cale.getDate(new Date()).fullDate);
+				let date = this.cale.getDate(new Date()).fullDate
+				this.cale.setDate(date)
+				this.init(date)
+				this.change()
+			},
+			/**
+			 * 上个月
+			 */
+			pre() {
+				const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate
+				this.setDate(preDate)
+				this.monthSwitch()
+
+			},
+			/**
+			 * 下个月
+			 */
+			next() {
+				const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate
+				this.setDate(nextDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: $uni-bg-color-mask;
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+		border-bottom-color: $uni-border-color;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+		// padding: 0 15px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: $uni-text-color;
+		background-color: $uni-bg-color-hover;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 10px;
+		height: 10px;
+		border-left-color: $uni-text-color-placeholder;
+		border-left-style: solid;
+		border-left-width: 2px;
+		border-top-color: $uni-color-subtitle;
+		border-top-style: solid;
+		border-top-width: 2px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 14px;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: $uni-text-color-grey;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/uni-calendar/util.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/uni-calendar/util.js
new file mode 100644
index 000000000..37f44321e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/uni-calendar/util.js	
@@ -0,0 +1,352 @@
+import CALENDAR from './calendar.js'
+
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				lunar: this.getlunar(full.year, full.month - 1, beforeDate),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let isinfo = false
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				let dateCompBefore = this.dateCompare(this.startDate, fullDate)
+				disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
+			}
+
+			if (this.endDate) {
+				let dateCompAfter = this.dateCompare(fullDate, this.endDate)
+				disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate),
+				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
+				month: full.month,
+				lunar: this.getlunar(full.year, full.month, i),
+				disable: !disableBefore || !disableAfter,
+				isDay
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				lunar: this.getlunar(full.year, Number(full.month) + 1, i),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+	/**
+	 * 计算阴历日期显示
+	 */
+	getlunar(year, month, date) {
+		return CALENDAR.solar2lunar(year, month, date)
+	}
+	/**
+	 * 设置打点
+	 */
+	setSelectInfo(data, value) {
+		this.selected = value
+		this._getWeek(data)
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+
+		if (!this.range) return
+		if (before && after) {
+			this.multipleStatus.before = ''
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+				}
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			fullDate,
+			year,
+			month,
+			date,
+			day
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/xuan-linkAddress/api.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/xuan-linkAddress/api.js
new file mode 100644
index 000000000..9eb1dcae5
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/xuan-linkAddress/api.js	
@@ -0,0 +1,11 @@
+import Request from "@/static/xuan-linkAddress/request.js"
+//创建Request对象
+let request=new Request();
+
+export default{
+	//data 参数值
+	get_linkAddress_api:function(data){
+		console.log(data);
+		return request.http('/api/address/area',data,'GET');
+	}
+}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/xuan-linkAddress/xuan-linkAddress.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/xuan-linkAddress/xuan-linkAddress.vue
new file mode 100644
index 000000000..b7b4576db
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/xuan-linkAddress/xuan-linkAddress.vue	
@@ -0,0 +1,408 @@
+<template>
+	<view class="popup-layout-wrap " :class="popuplayoutClass" >
+		<view class="popup-layout-content" :class="popupContentClass" :style="[{height:height}]">
+			<view class="link-address-wrap">
+				<view class="link-adress-content">
+					<view class="head-wrap">
+						<text class="cancel" @click="btn_cancel">取消</text>
+						<text class="confirm" @click="btn_confirm">确认</text>
+					</view>
+					<view class="head-selected">
+						<text class="selected-txt">已选择:{{selected_address}}</text>
+					</view>
+					<view class="operation-wrap">
+						<view class="operation-container">
+							<view class="operation-content" v-for="(base_items,base_index) of linkAddress_area">
+								<scroll-view
+									scroll-y="true"
+									class="province"
+									show-scrollbar="false">
+									<view 
+										@click="choosefun(base_items.clickfun,items.id)" 
+										v-model="items.id" 
+										v-for="(items , index) of base_items.info"
+										:class="[index==base_items.current ? 'province-txt-click' : 'province-txt']" 
+										>
+											{{items.name}}
+											<view class="pic" v-show="index===base_items.current">
+												<image src="../../static/xuan-linkAddress/yes.png"></image>
+											</view>
+									</view>
+								</scroll-view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-if="maskShow" class="popup-layout-mask" @tap="close(maskClick)"></view>
+	</view>
+</template>
+
+<script>
+	import linkAddress_p from '../../static/xuan-linkAddress/get_linkAddress_p.js'
+	export default{
+		data(){
+			return{
+				newActive:"",
+				newTransition:true,
+				//省0市1区2
+				linkAddress_area:[
+					{
+						current:null,
+						info: [],
+						clickfun:'province_txt_click'
+					},
+					{
+						current:null,
+						info: [],
+						clickfun:'city_txt_click'
+					},
+					{
+						current:null,
+						info: [],
+						clickfun:'district_txt_click'
+					}
+				],
+				/*请求提交的*/
+				submission:{
+					province:'',//省
+					city:'',//市
+					county:'',//区
+					town:''//镇
+				},
+				/*用户选择的地址*/
+				user_address:{
+					province:'',//省
+					city:'',//市
+					district:''//区		
+				},
+				selected_address:''
+			};
+		},
+		props:{
+			/*底部弹窗的属性*/
+			active:{
+				type:Boolean,
+				default:false
+			},
+			height:{
+				type:[String],
+				default:"100%"
+			},
+			//遮盖层显示
+			maskShow:{
+				type:Boolean,
+				default:true
+			},
+			//遮盖层点击
+			maskClick:{
+				type:Boolean,
+				default:true
+			},
+			//回掉
+			callback:{
+				type:Function,
+				default:function () {
+					
+				}
+			},
+		},
+		computed:{
+			popuplayoutClass:function(){
+				let _class="";
+				if(this.newActive){
+					_class+="popup-layout-active";
+				}	
+				_class+=" popup-layout-bottom";
+				return _class;
+			},
+			popupContentClass:function () {
+				let _class = "";
+				if (this.newTransition&&this.transition!=='none') {
+					_class+="popup-layout-transition-slider"
+				}
+				return _class;
+			}
+		},
+		methods: {
+			//显示弹窗
+			show:function () {
+				//提交的数据置为空
+				this.submission={
+					province:'',
+					city:'',
+					county:'',
+					town:''
+				},
+				//请求市数据
+				linkAddress_p.get_linkAddress(this,"province",this.submission,(revert)=>{
+					this.submission.province='1';
+				});
+				
+				this.newActive = true;
+				let _this = this;
+				setTimeout(function () {
+					_this.newTransition = false;
+				},50)
+			},
+			
+			//关闭弹窗
+			close:function (v) {
+				let close = v || true;
+				if (close) {
+					this.newTransition = true;
+					let _this=this;
+					setTimeout(function () {
+						_this.newActive = false;
+						
+					},300)
+				}
+					
+			},
+			//选择点击事件
+			choosefun(targetfun,targetid){
+				this[targetfun](targetid);
+			},
+			//省点击选择
+			province_txt_click(target){
+				//区数据置为空
+				this.linkAddress_area[2].info= [];
+				//市、区的选择计数置为null
+				this.linkAddress_area[1].current=null;
+				this.linkAddress_area[2].current=null;
+				let province;
+				//得到点击的数据，改变样式
+				for (let i = 0; i < this.linkAddress_area[0].info.length; i++) {
+					if (this.linkAddress_area[0].info[i].id === target) {
+						this.linkAddress_area[0].current = i;
+						province=this.linkAddress_area[0].info[i].name;
+						break;
+					}
+				}
+				//用户选择
+				this.user_address={
+					province:province,
+					city:'',
+					district:''
+				}
+				//请求提交的数据先置为空
+				this.submission={
+					province:'',
+					city:'',
+					county:'',
+					town:''
+				};
+				//再赋值
+				this.submission.province=target;
+				this.selected_address=this.user_address.province;
+				//请求市数据
+				linkAddress_p.get_linkAddress(this,"city",this.submission,(revert)=>{
+					
+				});
+			},
+			
+			//市点击选择
+			city_txt_click(target){
+				//区的选择计数置为null
+				this.linkAddress_area[2].current=null;
+				let city;
+				//得到点击的数据，改变样式
+				for (let i = 0; i < this.linkAddress_area[1].info.length; i++) {
+					if (this.linkAddress_area[1].info[i].id === target) {
+						this.linkAddress_area[1].current = i;
+						city=this.linkAddress_area[1].info[i].name;
+						break;
+					}
+				}
+				//得到市
+				this.user_address.city=city;
+				//把区的信息置为空
+				this.user_address.district='';
+				
+				this.submission.city=target;
+				
+				this.selected_address=this.user_address.province+"-"+this.user_address.city;
+				//请求区数据
+				linkAddress_p.get_linkAddress(this,"district",this.submission,(revert)=>{
+					
+				});
+			},
+			//区点击选择
+			district_txt_click(target){
+				let district;
+				//得到点击的数据，改变样式
+				for (let i = 0; i < this.linkAddress_area[2].info.length; i++) {
+					if (this.linkAddress_area[2].info[i].id === target) {
+						// this.district_current = i;
+						this.linkAddress_area[2].current = i;
+						district=this.linkAddress_area[2].info[i].name;
+						break;
+					}
+				}
+				//得到区信息
+				this.user_address.district=district;
+				this.selected_address=this.user_address.province+"-"+this.user_address.city+"-"+this.user_address.district;
+			},
+			
+			//取消按钮
+			btn_cancel:function(){
+				this.close();
+				
+				//全部置为空
+				this.submission={
+					province:'',
+					city:'',
+					county:'',
+					town:''
+				}
+				this.linkAddress_area[1].info= [];
+				this.linkAddress_area[2].info= [];
+				this.linkAddress_area[0].current=null;
+				this.linkAddress_area[1].current=null;
+				this.linkAddress_area[2].current=null;
+				this.selected_address='';
+			},
+			//确定按钮
+			btn_confirm:function(){
+				this.close();
+				console.log(this.user_address)
+				//可以使用vuex传值
+				this.$store.commit('commit_address',this.user_address);
+				this.$emit('confirmCallback');
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	popup-layout-wrap{
+		position: absolute;
+	}
+	.popup-layout-wrap{
+		position: fixed;
+		z-index: 998;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		height: 100%;
+		width: 100%;
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: center;
+		align-items: center;
+		display: none;
+		&.popup-layout-active{
+			display: flex;
+		}
+		&.popup-layout-bottom{
+			align-items: flex-end;
+			.popup-layout-transition-slider{
+				transform: translate3d(0,100%,0);
+			}
+		}
+		.popup-layout-content{
+			background-color: #fff;
+			z-index: 2;
+			height: 100%;
+			width: 100%;
+			display: flex;
+			flex-flow: row nowrap;
+			justify-content: center;
+			align-items: center;
+			transform: translate3d(0,0,0) scale(1);
+			opacity: 1;
+			transition: transform .3s ease-in-out,opacity .3s ease-in-out;
+			&.popup-layout-transition-fade{
+				transform: translate3d(0,0,0) scale(0.3);
+				opacity: 0;
+			}
+		}
+		.popup-layout-mask{
+			position: absolute;
+			transition:all 1s ;
+			z-index: 1;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			height: 100%;
+			width: 100%;
+			background-color: rgba(#000, 0.6);
+		}
+	}
+	/***省市区选择器***/
+	.link-address-wrap{
+		height: 100%;
+		width: 100%;
+		background: #fff;
+	}
+	.link-address-wrap .link-adress-content{
+		margin:8px 10px 10px 10px;
+		.head-wrap{
+			padding-bottom: 5px;
+			display: flex;
+			flex-direction: row;
+			position: relative;	
+			.cancel{
+				color: #999;
+			}
+			.confirm{
+				position: absolute;
+				right: 0px;
+			}
+		}
+		.head-selected{
+			text-align: center;
+			color: #ccc;
+			font-size: 17px;
+		}
+		.operation-wrap{
+			.operation-container{
+				display: flex;
+				flex-direction: row;
+				flex-wrap: wrap;
+				.operation-content{
+					display: flex;
+					flex-direction: column;
+					width: 33.333%;
+					.province{
+						//scroll-view区域的固定高度
+						height: 420rpx;
+						font-size: 17px;	
+						.province-txt{
+							margin: 18px 12px;
+							overflow: hidden;
+							text-overflow:ellipsis;
+							white-space: nowrap;
+						}
+						.province-txt-click{
+							margin: 18px 12px;
+							overflow: hidden;
+							text-overflow:ellipsis;
+							white-space: nowrap;
+							color: red;
+							font-size: 20px;
+							display: flex;
+							flex-direction: row;
+							.pic{
+								padding-left: 15rpx;
+								width: 30rpx;
+								height: 30rpx;
+								display: flex;
+								justify-content: center;
+								text-align: center;
+								margin: auto 0;
+								image{
+									width: 100%;
+									height: auto;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/main.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/main.js
index 84bd8923d..d2881dae9 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/main.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/main.js	
@@ -5,6 +5,8 @@ import store from '@/common/store.js'
 import mixins from '@/common/mixins.js'
 import '@/components/learun-mpui'
 
+// import '@/common/css/common.less';
+
 moment.locale('zh-cn')
 
 Vue.mixin(mixins)
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json
index 5d59763e8..29bada559 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json	
@@ -172,13 +172,14 @@
             "mode" : "hash",
             "base" : ""
         },
-        "title" : "力软敏捷开发框架",
+        "title" : "数字化智慧校园",
         "template" : "index.html",
         "optimization" : {
             "treeShaking" : {
                 "enable" : false
             }
-        }
+        },
+        "domain" : "testapp.bjquanjiang.com"
     },
     "mp-qq" : {
         "uniStatistics" : {
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 199fa4d71..7d4284706 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
@@ -358,15 +358,16 @@
 		},
 		// 考勤记录
 		{
-			"path": "pages/LogisticsManagement/ADR_Record/list",
+			"path": "pages/ADRRecord/list",
 			"style": {
-				"navigationBarTitleText": "考勤里列表"
+				"navigationBarTitleText": "考勤记录"
 			}
 		},
+		// 考勤打卡
 		{
-			"path": "pages/LogisticsManagement/ADR_Record/single",
+			"path": "pages/AttendanceCard/list",
 			"style": {
-				"navigationBarTitleText": "考勤详情"
+				"navigationBarTitleText": "考勤打卡"
 			}
 		},
 		//班级自诊打卡
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ADR_Record/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ADRRecord/list.vue
similarity index 79%
rename from Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ADR_Record/list.vue
rename to Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ADRRecord/list.vue
index cf2f19074..810e39b77 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ADR_Record/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ADRRecord/list.vue	
@@ -3,7 +3,7 @@
     <!-- 主列表页 --> 
     <view :class="sideOpen ? 'show' : ''" class="mainpage" style="padding-top: 80rpx;"> 
       <!-- 顶部条目/分页信息栏 --> 
-      <l-customlist-banner @buttonClick="sideOpen = true">{{ tips }}</l-customlist-banner> 
+      <l-customlist-banner >{{ tips }}</l-customlist-banner> 
   
       <!-- 滚动列表，跨端支持上拉/下拉 --> 
       <l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list"> 
@@ -12,22 +12,22 @@
           <view class="customlist-item" v-for="item of list" :key="item.ID"> 
   
             <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">文本框：</text> 
-              {{ displayListItem(item, 'ADDate') }} 
+              <text class="customlist-item-field-title">打卡时间：</text> 
+              {{ displayListItem(item, 'ClockTime') }} 
             </view> 
   
             <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">下拉框：</text> 
-              {{ displayListItem(item, 'ClockStatus') }} 
+              <text class="customlist-item-field-title">考勤类型：</text> 
+              {{ showADTypeFormat(item, 'ADType') }} 
             </view> 
   
             <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">日期框：</text> 
-              {{ displayListItem(item, 'ADTime') }} 
+              <text class="customlist-item-field-title">打卡结果：</text> 
+              {{ displayListItem(item, 'ClockStatus') }} 
             </view> 
   
   
-            <l-customlist-action showEdit @edit="action('edit', item.ID)" showDelete @delete="action('delete', item.ID)" @view="action('view', item.ID)" /> 
+            <!-- <l-customlist-action showEdit @edit="action('edit', item.ID)" showDelete @delete="action('delete', item.ID)" @view="action('view', item.ID)" /> -->
           </view> 
         </l-customlist> 
       </l-scroll-list> 
@@ -71,7 +71,7 @@
       </view> 
     </scroll-view> 
   
-    <l-customlist-add v-if="!sideOpen" @click="action('add')" /> 
+    <!-- <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
   
   </view> 
 </template> 
@@ -105,22 +105,22 @@ export default {
     return { 
       // 数据项的数据类型、结构 
       scheme: { 
-        ADDate: { type: 'text' }, 
-        ClockStatus: { type: 'select', itemCode: 'DbFieldType', dataSource: '0' }, 
-        ADTime: { type: 'datetime', dateformat: '0' }, 
+        ClockTime: { type: 'datetime' }, 
+        ADType: { type: 'text' }, 
+        ClockStatus: { type: 'select', itemCode: 'ADStatus', dataSource: '0' }, 
       }, 
   
       // 查询条件 
       searchData: {}, 
       defaultQueryData: {}, 
       queryData: { 
-        ADDate: '', 
+        ClockTime: '', 
         ClockStatus: '', 
       }, 
   
       // 数据源 
       dataSource: { 
-        ClockStatus: Object.values(this.GET_GLOBAL('dataDictionary').DbFieldType).map(t => ({ value: t.value, text: t.text })), 
+        ClockStatus: Object.values(this.GET_GLOBAL('dataDictionary').ADStatus).map(t => ({ value: t.value, text: t.text })), 
       }, 
   
       // 时间查询参数 
@@ -143,13 +143,13 @@ export default {
     await this.init() 
   }, 
   onUnload() { 
-    this.OFF('LogisticsManagementADR_Record-list-change') 
+    this.OFF('ADRRecord-list-change') 
   }, 
   
   methods: { 
     // 页面初始化 
     async init() { 
-      this.ON('LogisticsManagementADR_Record-list-change', this.refreshList) 
+      this.ON('ADRRecord-list-change', this.refreshList) 
   
       // 拉取加载列表和数据源 
       await Promise.all([ 
@@ -166,13 +166,16 @@ export default {
     // 拉取列表 
     async fetchList() { 
       if (this.page > this.total) { return } 
+	
+		let userInfo = this.GET_GLOBAL('loginUser');
+		this.searchData.UserNo=userInfo.account; 
   
       const result = await this.HTTP_GET( 
-        '/LogisticsManagement/ADR_Record/pagelist', 
+        'learun/adms/attendance/getrecordpagelist', 
         { 
           // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
           // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'ID', sord: 'DESC' }, 
+          pagination: { rows: 10, page: this.page, sidx: 'ClockTime', sord: 'DESC' }, 
           queryJson: JSON.stringify(this.searchData) 
         }, 
         '加载数据时出错'
@@ -249,7 +252,7 @@ export default {
             return
           } 
   
-          this.HTTP_POST('/LogisticsManagement/ADR_Record/delete', id, '删除失败').then(success => { 
+          this.HTTP_POST('learun/adms/LogisticsManagement/ADR_Record/delete', id, '删除失败').then(success => { 
             if(!success) { return } 
             this.TOAST('删除成功', 'success') 
             this.refreshList() 
@@ -283,11 +286,46 @@ export default {
   
         case 'datetime': 
           if (!value) { return '' } 
-          return moment(value).format(Number(fieldItem.dateformat) === 0 ? 'YYYY年 M月 D日' : 'YYYY-MM-DD HH:mm') 
+          return moment(value).format(Number(fieldItem.dateformat) === 0 ? 'YYYY年 M月 D日' : 'YYYY-MM-DD HH:mm:ss') 
   
         default: return value === null || value === undefined ? '' : value 
       } 
-    } 
+    }, 
+	
+	//显示考勤类型格式化
+	showADTypeFormat(item,field){
+		const ADType = item[field] 
+		var type = '';
+		if(ADType=='0'){
+			type='未定义';
+		}else if(ADType=='1')
+			{
+				type='上班';
+			}else if(ADType=='2')
+			{
+				type='下班';
+			}else if(ADType=='3')
+			{
+				type='开始休息';
+			}else if(ADType=='4')
+			{
+				type='结束休息';
+			}else if(ADType=='5')
+			{
+				type='开始加班';
+			}else if(ADType=='6')
+			{
+				type='结束加班';
+			}else if(ADType=='7')
+			{
+				type='中午上班';
+			}else if(ADType=='8')
+			{
+				type='中午下班';
+			}
+		return type;
+		
+	}
   
   } 
 } 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ADR_Record/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ADRRecord/single.vue
similarity index 94%
rename from Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ADR_Record/single.vue
rename to Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ADRRecord/single.vue
index 552f99003..2b228cabf 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ADR_Record/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ADRRecord/single.vue	
@@ -128,7 +128,7 @@ export default {
       if (this.mode === 'create') { 
         this.origin = await this.getDefaultForm() 
       } else { 
-        const result = await this.HTTP_GET('/LogisticsManagement/ADR_Record/form', this.id) 
+        const result = await this.HTTP_GET('learun/adms/LogisticsManagement/ADR_Record/form', this.id) 
         this.origin = await this.formatFormData(result) 
       } 
       this.current = this.COPY(this.origin) 
@@ -160,7 +160,7 @@ export default {
           this.LOADING('正在提交...') 
           const postData = await this.getPostData() 
   
-          this.HTTP_POST('/LogisticsManagement/ADR_Record/save', postData, '表单提交保存失败').then(success => { 
+          this.HTTP_POST('learun/adms/LogisticsManagement/ADR_Record/save', postData, '表单提交保存失败').then(success => { 
             this.HIDE_LOADING() 
             if (!success) { 
               return
@@ -178,7 +178,7 @@ export default {
           } 
   
           this.LOADING('提交删除中...') 
-          this.HTTP_POST('/LogisticsManagement/ADR_Record/delete', this.id, '删除失败').then(success => { 
+          this.HTTP_POST('learun/adms/LogisticsManagement/ADR_Record/delete', this.id, '删除失败').then(success => { 
             this.HIDE_LOADING() 
             if (!success) { 
               return
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Ask/from.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Ask/from.vue
new file mode 100644
index 000000000..9559c654c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Ask/from.vue	
@@ -0,0 +1,352 @@
+<template>
+	<view class="page">
+		<view class="inSecTitle">{{ title }}</view>
+		<view class="inSecTime">{{ time }}</view>
+		<view class="index_box">
+			<view class="signSec2Box" v-for="(items, i) in dataList" :key="items.QTitle">
+				<view v-if="items.QType == 1">
+					<view class="shenInput">
+						<view class="shenInputBox">
+							<view class="signTxt" :class="redEva[i]? 'redEva' : ''">{{ items.QTitle }}</view>
+							<view class="inputRadioRow">
+								<view v-for="(item, j) in items.Ask_QuestionItems" :key="item.IID">
+									<view class="inputRadioCol4">
+										<view class="inputRadio checkBoxs" :class="answer[i].list.indexOf(j) > -1 ? 'active' : ''" @click="tapRadio(i, j, item.QShowText)"></view>
+										<text>{{ item.ITitle }}</text>
+									</view>
+								</view>
+							</view>
+							<view v-show="answer[i].QShowText" class="shenInput3" style="margin-top: 10px;">
+								<l-textarea v-model="UText[i]" title="其他" class="" placeholder="请填写备注..." />
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="items.QType == 2">
+					<view class="signTextarea">
+						<view class="signTextareaBox">
+							<view class="signTxt" :class="redEva[i]? 'redEva' : ''">{{ items.QTitle }}</view>
+							<view class="inputRadioRow">
+								<view v-for="(item, j) in items.Ask_QuestionItems" :key="item.IID">
+									<view class="inputRadioCol2">
+										<view class="inputCheck checkBoxs" :class="answer[i].list.indexOf(j) > -1 ? 'active' : ''" @click="tapCheck(i, j)"></view>
+										<text>{{ item.ITitle }}</text>
+									</view>
+								</view>
+							</view>
+							<view v-show="answer[i].QShowText" class="shenInput3" style="margin-top: 10px;">
+								<l-textarea v-model="UText[i]" title="其他" class="" placeholder="请填写备注..." />
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="shenRow"><view class="shenBtn" @click="tapbtn">保&nbsp;&nbsp;存</view></view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			title: '',
+			time: '',
+			dataList: [],
+			answer: [],
+			pageInfo: null,
+			redEva: [],
+			qmustFlag: false,
+			redEvaCopy: [],
+			flag: false,
+			UText: []
+		};
+	},
+	methods: {
+		init() {
+			this.pageInfo = this.GET_PARAM(); //获取页面传递参数
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET(
+					'/learun/ask/paper',
+					{
+						VID: _this.pageInfo.VID
+					},
+					'加载数据时出错'
+				)
+				.then(data => {
+					this.HIDE_LOADING();
+					// console.log(data)
+					if (data) {
+						_this.title = data.VTitle;
+						_this.time = data.VStartTime + '-' + data.VStopTime;
+						_this.dataList = data.Ask_Questions;
+						console.log(_this.dataList);
+						_this.dataList.forEach((n, i) => {
+							_this.answer.push({
+								list: [],
+								QShowText: false
+							});
+							_this.redEva.push(false);
+							_this.UText.push('');
+						});
+						_this.redEvaCopy = this.COPY(this.redEva);
+					}
+				});
+		},
+		tapbtn() {
+			let _this = this;
+			_this.redEva = this.COPY(this.redEvaCopy);
+			_this.qmustFlag = false;
+			_this.flag = false;
+			let jsons = {
+				VID: _this.pageInfo.VID,
+				LessonNo: _this.pageInfo.LessonNo,
+				EmpNo: _this.pageInfo.EmpNo,
+				postarray: []
+			};
+			_this.dataList.forEach((n, i) => {
+				let len = _this.answer[i].list.length;
+				var qmin = n.QMin == null? 0 : n.QMin;
+				var qmax = n.QMust == null? 1 : n.QMust;
+				if(n.QMust && len == 0){
+					_this.redEva[i] = true;
+					_this.qmustFlag = true;
+				}
+				if((qmin && len < qmin) || (qmax && len > qmax)){
+					_this.redEva[i] = true;
+					_this.flag = true;
+				}
+				if(_this.qmustFlag){
+					this.TOAST('有必选项未选择', 'success');
+					return
+				}
+				if(_this.flag){
+					this.TOAST('有选择项少选或多选', 'success');
+					return
+				}
+				_this.answer[i].list.forEach((m, j) => {
+					jsons.postarray.push({
+						QID: n.QID, 
+						IID: n.Ask_QuestionItems[m].IID, 
+						UText: _this.answer[i].QShowText? _this.UText[i] : ''
+					})
+				})
+				_this.LOADING('保存数据中…')
+				// console.log(jsons)
+				// return
+				_this.HTTP_GET('/learun/ask/savepaper', jsons, '加载数据时出错').then(res => {
+					_this.HIDE_LOADING();
+					console.log(res);
+					this.TOAST('操作成功', 'success');
+					this.EMIT('askList')
+					this.NAV_BACK()
+				});
+			})
+		},
+		tapCheck(i, num) {
+			let ind = this.answer[i].list.indexOf(num);
+			let len = this.answer[i].list.length;
+			if (ind > -1) {
+				let QMin = this.dataList[i].QMin == null ? 0 : this.dataList[i].QMin;
+				if (len <= QMin) {
+					this.TOAST(`该选项最少选择 ${QMin} 项`, 'success');
+					return;
+				}
+				this.answer[i].list.splice(ind, 1);
+			} else {
+				let QMax = this.dataList[i].QMax == null ? 1 : this.dataList[i].QMax;
+				if (len >= QMax) {
+					this.TOAST(`该选项最多选择 ${QMax} 项`, 'success');
+					return;
+				}
+				this.answer[i].list.push(num);
+			}
+			this.answer[i].QShowText = false;
+			this.answer[i].list.forEach((n, j) => {
+				if (this.dataList[i].Ask_QuestionItems[n].QShowText) {
+					this.answer[i].QShowText = true;
+				}
+			});
+		},
+		tapRadio(i, num, flag) {
+			this.answer[i].list.length = 0;
+			this.answer[i].list.push(num);
+			this.answer[i].QShowText = flag;
+		}
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+/deep/ .cu-form-group {
+	min-height: 30px;
+	border: 0;
+}
+/deep/ .cu-form-group uni-textarea {
+	border: 1px solid #cbcbcb;
+	padding: 5px 10px;
+}
+.page {
+	background-color: #fff;
+	padding-top: 1px;
+	padding-bottom: 30px;
+	padding: 1px 15px 30px;
+}
+.inSecTitle {
+	font-size: 20px;
+	text-align: center;
+	margin: 20px 0 0px;
+}
+.inSecTime {
+	font-size: 12px;
+	text-align: center;
+}
+.shenInput {
+	margin-top: 15px;
+	font-size: 14px;
+	line-height: 24px;
+}
+.shenInput3 {
+	// display: none;
+}
+.shenInput:before,
+.shenInput:after {
+	display: table;
+	content: ' ';
+}
+.shenInput:after {
+	clear: both;
+}
+.signTxt {
+	line-height: 24px;
+	font-size: 14px;
+	position: relative;
+}
+.shenInputBox {
+	position: relative;
+}
+.shenInputBox1 {
+	margin-left: 60px;
+}
+.inputRadioRow {
+	overflow: hidden;
+}
+.inputRadioCol4 {
+	margin-top: 8px;
+}
+.inputRadio {
+	border-radius: 50%;
+}
+.inputCheck {
+	border-radius: 2px;
+}
+.inputRadio.active:after {
+	content: '';
+	width: 12px;
+	height: 12px;
+	background: #0c86d8;
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	top: 0;
+	margin: auto;
+	border-radius: 50%;
+}
+.inputCheck.active:after {
+	content: '';
+	width: 12px;
+	height: 12px;
+	background: #0c86d8;
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	top: 0;
+	margin: auto;
+	border-radius: 2px;
+}
+.inputRadio,
+.inputCheck {
+	font-style: normal;
+	display: inline-block;
+	vertical-align: middle;
+	width: 20px;
+	height: 20px;
+	border: 1px solid #cbcbcb;
+	margin: 0 10px;
+	position: relative;
+	cursor: pointer;
+}
+
+.shenInputBox > .span,
+.inputRadioCol4 .span,
+.inputRadioCol3 .span,
+.inputRadioCol2 .span {
+	display: inline-block;
+	vertical-align: middle;
+}
+.shenInput > .span {
+	display: block;
+	float: left;
+	width: 60px;
+	text-align: right;
+	padding: 4px 8px 4px 0px;
+	line-height: 24px;
+}
+.shenInputBox .inputTxt {
+	width: 100%;
+	display: block;
+	height: 32px;
+	line-height: 20px;
+	border: 1px solid #cbcbcb;
+	padding: 6px 10px;
+	font-size: 14px;
+}
+.shenBtnBox .signTxt {
+	margin-top: 30px;
+	margin-left: 30px;
+}
+.shenBtn {
+	width: 74%;
+	background: #0c86d8;
+	text-align: center;
+	line-height: 40px;
+	margin: 20px auto 20px;
+	font-size: 17px;
+	color: #fff;
+	border-radius: 2px;
+	cursor: pointer;
+	border-radius: 4px;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+.signTextareaBox {
+	margin-top: 20px;
+	position: relative;
+}
+.inputRadioRow {
+	overflow: hidden;
+}
+.inputRadioCol2 {
+	margin-top: 8px;
+}
+.inputCheck image {
+	width: 100%;
+	display: none;
+}
+.signTextarea {
+	margin-top: 15px;
+	font-size: 14px;
+	line-height: 24px;
+}
+.redEva {
+	color: red !important;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Ask/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Ask/list.vue
new file mode 100644
index 000000000..a1bdf4795
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Ask/list.vue	
@@ -0,0 +1,179 @@
+<template>
+	<view class="page">
+		<view class="mainpage" :class="sideOpen ? 'show' : ''" style="padding-top: 40px;">
+			<!-- <l-customlist-banner></l-customlist-banner> -->
+			<view class="records">共 {{ records }} 条数据</view>
+			<l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="data">
+				<l-customlist :tips="loadState" showTips>
+					<view></view>
+					<view class="pageBox customlist-item" showDelete="true" v-for="(item, ind) in data" :key="item.MakeDate" @click="tapClick(item)">
+						<view class="">
+							<text>问卷编号:</text>
+							{{ item.VSerial }}
+						</view>
+						<view class="">
+							<text>标题:</text>
+							{{ item.VTitle }}
+						</view>
+						<view class="">
+							<text>开始时间:</text>
+							{{ item.VStartTime }}
+						</view>
+						<view class="">
+							<text>结束时间:</text>
+							{{ item.VStopTime }}
+						</view>
+						<view class="">
+							<text>考核学年:</text>
+							{{ item.AcademicYearNo }}
+						</view>
+						<view class="">
+							<text>考核学期:</text>
+							{{ item.Semester }}
+						</view>
+						<view class="">
+							<text>考核评分:</text>
+							{{ item.TotalScore }}
+						</view>
+						<view class="">
+							<text>提交时间:</text>
+							{{ item.CreateDate }}
+						</view>
+						<view class="">
+							<text>是否交卷:</text>
+							{{ item.IsAnswer != undefined && item.IsAnswer === true ? "已交" : "未交" }}
+						</view>
+					</view>
+				</l-customlist>
+			</l-scroll-list>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			weekChina: ['一', '二', '三', '四', '五', '六', '日'],
+			user: null,
+			data: [],
+			total: 1,
+			records: 0,
+			ready: false,
+			page: 1,
+			rows: 10,
+			multipleData: {},
+			sideOpen: false,
+			loadState: '向下翻以加载更多'
+		};
+	},
+	onUnload() {
+		this.OFF('askList');
+	},
+	methods: {
+		init() {
+			this.ON('askList', this.refreshList);
+			// 拉取加载列表和数据源
+			Promise.all([() => {}]);
+			var _this = this;
+			this.user = this.GET_GLOBAL('loginUser');
+			this.fetchList();
+			this.ready = true;
+		},
+		// 拉取列表
+		async fetchList() {
+			if (this.page > this.total) {
+				return;
+			}
+			let _this = this;
+			let _postParam = {
+				pagination: {
+					rows: _this.rows,
+					page: _this.page
+				},
+				queryJson: JSON.stringify(_this.multipleData)
+			};
+			
+			_this.LOADING('加载数据中…')
+			_this.HTTP_GET('/learun/ask/studentlist', _postParam, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				console.log(res);
+				this.data = this.data.concat(res.rows);
+				_this.total = res.total;
+				_this.records = res.records;
+				this.page = res.page + 1;
+				this.loadState = res.page >= res.total ? '已加载所有项目' : '向下翻以加载更多';
+				// console.log(_this.data);
+			});
+		},
+		// 列表下拉
+		pullDown() {
+			this.refreshList().then(() => {
+				this.$refs.data.stopPullDown();
+			});
+		},
+		async refreshList() {
+			this.page = 1;
+			this.total = 1;
+			this.data = [];
+
+			this.fetchList();
+		},
+		tapClick(item) {
+			if (item.IsAnswer === true || item.IsAnswer === 'true') {
+				this.TOAST('当前项目已交卷!', 'success');
+			    return;
+			}
+			this.NAV_TO('./from', { VID: item.VID }, true);
+		}
+	},
+	computed:{
+		
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/common/css/sidepage.less';
+@import '~@/common/css/customlist.less';
+.page {
+	background-color: #fff;
+}
+.page-content {
+	margin-top: 39px;
+}
+.records {
+	color: #8f8f94;
+	background: #ffffff;
+	padding: 10px 12px;
+	width: 100%;
+	vertical-align: middle;
+	border-bottom: 0.5px solid #ddd;
+	position: fixed;
+	top: var(--window-top);
+	z-index: 1024;
+	border-bottom: 0.5px solid #ddd;
+	height: 40px;
+	width: 100%;
+	box-shadow: 0 0.5px 3px rgba(0, 0, 0, 0.1);
+	// background: #f1f1f1;
+}
+.pageBox {
+	// margin-top: 34px;
+	padding: 5px 15px;
+	line-height: 24px;
+	border-bottom: 5px solid #f5f5f5;
+}
+.delbtn {
+	position: absolute;
+	right: 15px;
+	bottom: 7px;
+	padding: 3px 10px;
+	background: #dd524d;
+	color: #fff;
+	border-radius: 3px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/from.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/from.vue
new file mode 100644
index 000000000..9ba870f16
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/from.vue	
@@ -0,0 +1,124 @@
+<template>
+	<view class="">
+		<l-select v-model="queryData.AResult" :range="dataSource.AResult" title="盘点结果" placeholder="请选择" />
+		<l-textarea v-model="queryData.ARemark" title="备注" placeholder="输入点什么..." />
+		<l-select v-model="queryData.AAddress" :range="dataSource.StorageData" title="现存放地点" placeholder="请选择" />
+		<view class="btn" @click="tapBtn">提交</view>
+	</view>
+</template>
+
+<script>
+import moment from 'moment';
+import get from 'lodash/get';
+import set from 'lodash/set';
+export default{
+	data() {
+		return {
+			pageInfo: {},
+			scheme: {
+				StorageData: {
+					type: 'select',
+					dataSource: '1',
+					dataSourceId: 'Ass_StorageData,sname,sid'
+				}
+			},
+			dataSource: {
+				StorageData:[],
+				AResult: Object.values(this.GET_GLOBAL('dataDictionary').InventoryResult).map(t => ({ value: t.value, text: t.text }))
+			},
+			queryData: {
+				AAddress: '',
+				ARemark: '',
+				AResult: '0'
+			}
+		}
+	},
+	methods:{
+		init() {
+			var _this = this;
+			this.pageInfo = _this.GET_PARAM(); //获取页面传递参数
+			Promise.all([
+				this.FETCH_DATASOURCE('Ass_StorageData').then(data => {
+					// console.log(data)
+					this.dataSource.StorageData = data.data.map(t => ({
+						text: t.sname,
+						value: t.sid
+					}));
+				}),
+			
+				() => {}
+			]);
+			// console.log(this.dataSource)
+			// console.log(this.pageInfo)
+			if(this.pageInfo.acode){
+				_this.LOADING('加载数据中…');
+				//接口没有带回来初始化需要得到数据
+				_this.HTTP_GET('learun/AssetManagementSystem/InventoryItem/formbycode', this.pageInfo.acode, '加载数据时出错').then(res => {
+					_this.HIDE_LOADING();
+					// console.log(res);
+					this.pageInfo.AAIId = res.Ass_InventoryItemApply.AAIId;
+				});
+			}
+			
+		}, 
+		tapBtn() {
+			let _this = this;
+			let _postData = {
+				keyValue: this.pageInfo.AAIId,
+				strEntity: JSON.stringify(this.queryData)
+			}
+			console.log(_postData)
+			_this.LOADING('保存数据中…');
+			_this.HTTP_POST('learun/AssetManagementSystem/InventoryItem/save', _postData, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				console.log(res);
+				if(res){
+					this.EMIT('Ass_InventoryItemList')
+					this.NAV_BACK()
+				}
+			});
+		},
+		// 显示列表中的标题项
+		displayListItem(item, field) {
+			// console.log(this.scheme)
+			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;
+			}
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style></style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/list.vue
new file mode 100644
index 000000000..124c1de3c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/list.vue	
@@ -0,0 +1,267 @@
+<template>
+	<view class="page">
+		<view class="mainpage" :class="sideOpen ? 'show' : ''" style="padding-top: 40px;">
+			<!-- <l-customlist-banner></l-customlist-banner> -->
+			<view class="records">共 {{ records }} 条数据</view>
+			<l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="data">
+				<l-customlist :tips="loadState" showTips>
+					<view></view>
+					<view class="pageBox customlist-item" showDelete="true" v-for="(item, ind) in data" :key="item.MakeDate" @click="tapClick(item)">
+						<view class="">
+							<text>资产编号:</text>
+							{{ item.AAICode }}
+						</view>
+						<view class="">
+							<text>名字:</text>
+							{{ item.AAIName }}
+						</view>
+						<view class="">
+							<text>资产类别:</text>
+							{{ displayListItem(item, 'AAITId') }}
+						</view>
+						<view class="">
+							<text>资产英文名:</text>
+							{{ item.AAIEName }}
+						</view>
+						<view class="">
+							<text>是否盘点:</text>
+							{{ item.AISCHECK }}
+						</view>
+						<view class="delbtn" @click.stop="delTap(item)">删除</view>
+					</view>
+				</l-customlist>
+			</l-scroll-list>
+		</view>
+		<l-customlist-add v-if="!sideOpen" @click="tapBtn()" />
+	</view>
+</template>
+
+<script>
+import moment from 'moment';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import scanCodeFun from '@/common/js/scanCodeFun.js';
+export default {
+	data() {
+		return {
+			scheme: {
+				AAITId: {
+					type: 'select',
+					dataSource: '1',
+					dataSourceId: 'Ass_AssetsType,aname,atid'
+				}
+			},
+			weekChina: ['一', '二', '三', '四', '五', '六', '日'],
+			user: null,
+			data: [],
+			total: 1,
+			records: 0,
+			ready: false,
+			page: 1,
+			rows: 10,
+			multipleData: null,
+			sideOpen: false,
+			loadState: '向下翻以加载更多',
+			pageInfo: {},
+			dataSource: {
+				AAITId:[],
+			}
+		};
+	},
+	onUnload() {
+		this.OFF('Ass_InventoryItemList');
+	},
+	methods: {
+		init() {
+			this.ON('Ass_InventoryItemList', this.refreshList);
+			// 拉取加载列表和数据源
+			var _this = this;
+			this.pageInfo = _this.GET_PARAM(); //获取页面传递参数
+			this.user = this.GET_GLOBAL('loginUser');
+			Promise.all([
+				this.FETCH_DATASOURCE('Ass_AssetsType').then(data => {
+					// console.log(data)
+					this.dataSource.AAITId = data.data.map(t => ({
+						text: t.aname,
+						value: t.atid
+					}));
+				}),
+			
+				() => {}
+			]);
+			this.fetchList();
+			this.ready = true;
+		},
+		// 拉取列表
+		async fetchList() {
+			if (this.page > this.total) {
+				return;
+			}
+			let _this = this;
+			let _postParam = {
+			    pagination: {
+			        rows: _this.rows,
+			        page: _this.page,
+			        sidx: 'AAIId',
+			        sord: 'DESC'
+			    },
+			    queryJson: '{}'
+			};
+			if (this.pageInfo.ITID) {
+			    _postParam.queryJson = JSON.stringify({
+			        AAId: this.pageInfo.ITID
+			    });
+			}
+			
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('learun/AssetManagementSystem/InventoryItem/pagelist', _postParam, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				// console.log(res);
+				this.data = this.data.concat(res.rows);
+				_this.total = res.total;
+				_this.records = res.records;
+				this.page = res.page + 1;
+				this.loadState = res.page >= res.total ? '已加载所有项目' : '向下翻以加载更多';
+				// console.log(_this.data);
+			});
+		},
+		// 列表下拉
+		pullDown() {
+			this.refreshList().then(() => {
+				this.$refs.data.stopPullDown();
+			});
+		},
+		async refreshList() {
+			this.page = 1;
+			this.total = 1;
+			this.data = [];
+
+			this.fetchList();
+		},
+		tapClick(data) {
+			this.NAV_TO('./from', data, true);
+		},
+		delTap(item) {
+			let _this = this;
+			this.CONFIRM('数字化校园提示', '确定要删除该条数据吗？', true).then(res => {
+				if (res) {
+					_this.LOADING('正在删除…');
+					_this.HTTP_POST('learun/AssetManagementSystem/InventoryItem/delete', item.AAIId, '加载数据时出错').then(data => {
+						_this.HIDE_LOADING();
+						// console.log(data);
+						if (data) {
+							// 成功
+							_this.refreshList();
+							_this.TOAST(info);
+						}
+					});
+				}
+			});
+		},
+		tapBtn() {
+			let _this = this;
+			scanCodeFun.scanCodeFun().then(res => {
+				// console.log(res);
+				if(!res) return
+				_this.LOADING('请等待…'); 
+				_this.HTTP_GET('learun/AssetManagementSystem/InventoryItem/formbycode', res.result, '加载数据时出错').then(res => {
+					_this.HIDE_LOADING(); 
+					// console.log(res)
+					if (res.Ass_InventoryItemApply) {
+						_this.NAV_TO('./from', {acode: res.result}, true);
+					} else {
+						_this.TOAST('未匹配');
+					}
+				})
+			})
+		},
+		// 显示列表中的标题项
+		displayListItem(item, field) {
+			// console.log(this.scheme)
+			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;
+			}
+		}
+	},
+	computed: {},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/common/css/sidepage.less';
+@import '~@/common/css/customlist.less';
+.page {
+	background-color: #fff;
+}
+.page-content {
+	margin-top: 39px;
+}
+.records {
+	color: #8f8f94;
+	background: #ffffff;
+	padding: 10px 12px;
+	width: 100%;
+	vertical-align: middle;
+	border-bottom: 0.5px solid #ddd;
+	position: fixed;
+	top: var(--window-top);
+	z-index: 1024;
+	border-bottom: 0.5px solid #ddd;
+	height: 40px;
+	width: 100%;
+	box-shadow: 0 0.5px 3px rgba(0, 0, 0, 0.1);
+	// background: #f1f1f1;
+}
+.pageBox {
+	// margin-top: 34px;
+	padding: 5px 15px;
+	line-height: 24px;
+	border-bottom: 5px solid #f5f5f5;
+	color: #333;
+}
+.pageBox text {
+	color: #8f8f94;
+	margin-right: 5px;
+}
+.delbtn {
+	position: absolute;
+	right: 15px;
+	bottom: 7px;
+	padding: 3px 10px;
+	background: #dd524d;
+	color: #fff;
+	border-radius: 3px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryList/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryList/list.vue
new file mode 100644
index 000000000..ecc8c2df2
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryList/list.vue	
@@ -0,0 +1,180 @@
+<template>
+	<view class="page">
+		<view class="mainpage" :class="sideOpen ? 'show' : ''" style="padding-top: 40px;">
+			<!-- <l-customlist-banner></l-customlist-banner> -->
+			<view class="records">共 {{ records }} 条数据</view>
+			<l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="data">
+				<l-customlist :tips="loadState" showTips>
+					<view></view>
+					<view class="pageBox customlist-item" showDelete="true" v-for="(item, ind) in data" :key="item.MakeDate" @click="tapClick(item)">
+						<view class="">
+							<text>盘点单编号:</text>
+							{{ item.ITNo }}
+						</view>
+						<view class="">
+							<text>盘点单主题:</text>
+							{{ item.ITTeame }}
+						</view>
+						<view class="">
+							<text>状态:</text>
+							{{ item.ITStatus }}
+						</view>
+						<view class="">
+							<text>盘点说明:</text>
+							{{ item.ITExplain }}
+						</view>
+						<view class="delbtn" @click.stop="delTap(item)">删除</view>
+					</view>
+				</l-customlist>
+			</l-scroll-list>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			weekChina: ['一', '二', '三', '四', '五', '六', '日'],
+			user: null,
+			data: [],
+			total: 1,
+			records: 0,
+			ready: false,
+			page: 1,
+			rows: 10,
+			multipleData: null,
+			sideOpen: false,
+			loadState: '向下翻以加载更多'
+		};
+	},
+	onUnload() {
+		this.OFF('Ass_InventoryList');
+	},
+	methods: {
+		init() {
+			this.ON('Ass_InventoryList', this.refreshList);
+			// 拉取加载列表和数据源
+			Promise.all([() => {}]);
+			var _this = this;
+			this.user = this.GET_GLOBAL('loginUser');
+			this.fetchList();
+			this.ready = true;
+		},
+		// 拉取列表
+		async fetchList() {
+			if (this.page > this.total) {
+				return;
+			}
+			let _this = this;
+			let _postParam = {
+				pagination: {
+					rows: _this.rows,
+					page: _this.page,
+					sidx: '',
+					sord: 'DESC'
+				},
+				queryJson: '{}'
+			};
+			_postParam.queryJson = JSON.stringify({ StartTime: '', EndTime: '' });
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('learun/AssetManagementSystem/Inventory/pagelist', _postParam, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				// console.log(res);
+				this.data = this.data.concat(res.rows);
+				_this.total = res.total;
+				_this.records = res.records;
+				this.page = res.page + 1;
+				this.loadState = res.page >= res.total ? '已加载所有项目' : '向下翻以加载更多';
+				// console.log(_this.data);
+			});
+		},
+		// 列表下拉
+		pullDown() {
+			this.refreshList().then(() => {
+				this.$refs.data.stopPullDown();
+			});
+		},
+		async refreshList() {
+			this.page = 1;
+			this.total = 1;
+			this.data = [];
+
+			this.fetchList();
+		},
+		tapClick(data) {
+			this.NAV_TO('../Ass_InventoryItemList/list', data, true);
+		},
+		delTap(item) {
+			// console.log(item)
+			let _this = this;
+			this.CONFIRM('数字化校园提示', '确定要删除该条数据吗？', true).then(res => {
+				if (res) {
+					_this.LOADING('正在删除…');
+					_this.HTTP_POST('learun/AssetManagementSystem/Inventory/delete', item.ITID, '加载数据时出错').then(data => {
+						_this.HIDE_LOADING();
+						console.log(data);
+						if (data) {
+							// 成功
+							_this.refreshList();
+							_this.TOAST(info);
+							// item.pageType =
+						}
+					});
+				}
+			});
+		}
+	},
+	computed: {},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/common/css/sidepage.less';
+@import '~@/common/css/customlist.less';
+.page {
+	background-color: #fff;
+}
+.page-content {
+	margin-top: 39px;
+}
+.records {
+	color: #8f8f94;
+	background: #ffffff;
+	padding: 10px 12px;
+	width: 100%;
+	vertical-align: middle;
+	border-bottom: 0.5px solid #ddd;
+	position: fixed;
+	top: var(--window-top);
+	z-index: 1024;
+	border-bottom: 0.5px solid #ddd;
+	height: 40px;
+	width: 100%;
+	box-shadow: 0 0.5px 3px rgba(0, 0, 0, 0.1);
+	// background: #f1f1f1;
+}
+.pageBox {
+	// margin-top: 34px;
+	padding: 5px 15px;
+	line-height: 24px;
+	border-bottom: 5px solid #f5f5f5;
+	color: #333;
+}
+.pageBox text {
+	color: #8f8f94;
+	margin-right: 5px;
+}
+.delbtn {
+	position: absolute;
+	right: 15px;
+	bottom: 7px;
+	padding: 3px 10px;
+	background: #dd524d;
+	color: #fff;
+	border-radius: 3px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue
new file mode 100644
index 000000000..3532cab08
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue	
@@ -0,0 +1,191 @@
+<template> 
+  
+    <view v-if="ready" class="contentBox"> 
+		<view class="content" id="attendContent">
+			<view id="show">{{now}}</view>
+			<div class="pen" @click="action('dk')">
+				 <img id="attimg" :src="imgsrc" alt="" width="100%">
+			</div>
+		</view>
+		<view class="footer">
+			<img src="../../common/images/2.png" alt="" width="100%">
+		</view>  
+	
+	
+    </view> 
+</template> 
+  
+  
+<script> 
+/* 
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2022-03-10 15:30 
+ * 描  述：考勤打卡 
+ */
+  
+/** 
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/AttendanceCard/list", "style": { "navigationBarTitleText": "考勤打卡" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
+import get from 'lodash/get'
+import set from 'lodash/set'
+import moment from 'moment'
+import customPageMixins from '@/common/custompage.js'
+//导入图片
+import dk from '../../common/images/dk.png'
+import dkred from '../../common/images/dkred.png'
+import dkyellow from '../../common/images/dkyellow.png'
+  
+export default { 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      now: null, 
+	  imgsrc:dk,
+      ready: false, 
+	  
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.LOADING('加载数据中...') 
+  
+      this.now = this.getCurrentTime()
+	  setInterval(this.getCurrentTime,1000)
+	  
+	  await this.judgeIsDK()
+	  
+      this.ready = true
+      this.HIDE_LOADING() 
+    },
+	
+    // 点击 「打卡」按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'dk': 
+			if(this.imgsrc == "dkred"){
+				return
+			}
+			
+			this.HTTP_POST('learun/adms/attendance/clockin', {}, '打卡失败').then(success => { 
+				if(!success) { 
+					this.TOAST('打卡失败') 
+					return
+				} 
+				this.TOAST('打卡成功','success') 
+				setTimeout(this.back,1000)
+			    
+			}) 
+			return
+		  
+        default: break
+      } 
+    },
+	//判断当前时间是否可以打卡
+	async judgeIsDK(){
+		this.HTTP_GET('learun/adms/attendance/IsAttendance',{},'判断当前时间是否可以打卡失败').then(success=>{
+			if(!success){return}
+			if (success.data == "red") {
+				this.imgsrc=dkred;
+			} else if (success.data == "yellow") {
+				this.imgsrc=dkyellow;
+			}else {
+				this.imgsrc=dk;
+			}
+			
+		})
+		
+	},
+	//返回
+	back(){
+		this.NAV_BACK()
+	},
+	//获取当前时间
+	 getCurrentTime() {
+		 let nowDate = new Date();
+	 　　let hh = nowDate.getHours();
+	 　　let mf = nowDate.getMinutes()<10 ? '0'+nowDate.getMinutes() : nowDate.getMinutes();
+	 　　let ss = nowDate.getSeconds()<10 ? '0'+nowDate.getSeconds() : nowDate.getSeconds();
+	 　　this.now = hh+':'+mf+':'+ss;
+	 }
+  
+  } 
+} 
+</script> 
+
+<style lang="less">	
+uni-page-body{
+	height: 100%;
+	width: 100%;
+	background-color: #fff;
+}
+  .content {
+	width: 48%;
+	height: 50%;
+	position: absolute;
+	top: 15%;
+	left: 50%;
+	transform: translate(-50%, 10%);
+}
+
+#show {
+	text-align: center;
+	height: 200rpx;
+	font-size: 56rpx;
+}
+
+.pen {
+	height: 48%;
+	border-radius: 50%;
+	background-color: #e7f5ff;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.pen2 {
+	width: 91%;
+	height: 91%;
+	border-radius: 50%;
+	background-color: #bde4ff;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.pen3 {
+	width: 84%;
+	height: 84%;
+	border-radius: 50%;
+	background-color: #0c86d8;
+	text-align: center;
+	font-size: 68rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: #ffff;
+}
+
+.footer {
+	width: 100%;
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	overflow: hidden;
+}
+</style>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/DemoLeaveForm.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/DemoLeaveForm.vue
index a791db1f8..b49e40701 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/DemoLeaveForm.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/DemoLeaveForm.vue	
@@ -152,9 +152,9 @@ export default {
     async fetchForm() {
       // 此处处理旧版无外层表结构的表单格式
       const formData = {}
-      formData.lr_demo_formleave = await this.HTTP_GET('/demo/wfsys/form', this.processId)
+      formData.lr_demo_formleave = await this.HTTP_GET('learun/adms/demo/wfsys/form', this.processId)
       // 原版：
-      // const formData = await this.HTTP_GET('/demo/wfsys/form', this.processId)
+      // const formData = await this.HTTP_GET('learun/adms/demo/wfsys/form', this.processId)
 
       if (['again', 'child', 'create'].includes(this.type)) {
         this.origin = await this.getDefaultForm()
@@ -183,7 +183,7 @@ export default {
           }
 
           this.LOADING(`提交${actionText}中…`)
-          this.HTTP_POST(`/newwf${actionUrl}`, actionData, `提交${actionText}失败`).then(success => {
+          this.HTTP_POST(`learun/adms/newwf${actionUrl}`, actionData, `提交${actionText}失败`).then(success => {
             this.HIDE_LOADING()
             if (success) {
               this.EMIT('task-list-change')
@@ -200,7 +200,7 @@ export default {
 
           this.LOADING('正在提交草稿…')
           const draftPostData = await this.getPostData(this.processId)
-          const pdSuccess = await this.HTTP_POST('/demo/wfsys/save', draftPostData, '提交表单失败')
+          const pdSuccess = await this.HTTP_POST('learun/adms/demo/wfsys/save', draftPostData, '提交表单失败')
           if (!pdSuccess) {
             return
           }
@@ -210,7 +210,7 @@ export default {
             processId: this.processId,
             formreq: JSON.stringify({})
           }
-          const draftSuccess = await this.HTTP_POST('/newwf/draft', draftWorkflowInfo, '提交草稿失败')
+          const draftSuccess = await this.HTTP_POST('learun/adms/newwf/draft', draftWorkflowInfo, '提交草稿失败')
           if (!draftSuccess) {
             return
           }
@@ -235,7 +235,7 @@ export default {
           this.LOADING('正在提交…')
           const postKv = ['create'].includes(this.type) ? '' : this.processId
           const postData = await this.getPostData(postKv)
-          const pSuccess = await this.HTTP_POST('/demo/wfsys/save', postData, '表单提交失败')
+          const pSuccess = await this.HTTP_POST('learun/adms/demo/wfsys/save', postData, '表单提交失败')
           if (!pSuccess) {
             return
           }
@@ -255,10 +255,10 @@ export default {
             workflowInfo.parentTaskId = this.currentTask.F_TaskId
           }
           const postUrl = {
-            create: '/newwf/create',
-            draft: '/newwf/draft',
-            again: '/newwf​/againcreate',
-            child: '/newwf/createchildflow'
+            create: 'learun/adms/newwf/create',
+            draft: 'learun/adms/newwf/draft',
+            again: 'learun/adms/newwf​/againcreate',
+            child: 'learun/adms/newwf/createchildflow'
           }[this.type]
           const success = await this.HTTP_POST(postUrl, workflowInfo, '流程提交失败')
           if (!success) {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeLessonTermAttemper/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeLessonTermAttemper/list.vue
index 9d243fd37..0b3e61278 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeLessonTermAttemper/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeLessonTermAttemper/list.vue	
@@ -1,475 +1,428 @@
-<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.Id"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">调度类型：</text> 
-              {{ displayListItem(item, 'AttemperType') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">调度时限：</text> 
-              {{ displayListItem(item, 'AttemperTimeType') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">调度时间：</text> 
-              {{ showField(item, 'AttemperStartTime') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">学年学期：</text> 
-              {{ showField(item, 'AcademicYearNo') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">系部：</text> 
-              {{ displayListItem(item, 'DeptNo') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">专业：</text> 
-              {{ displayListItem(item, 'MajorNo') }} 
-            </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, 'TeachClassNo') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">教师：</text> 
-              {{ displayListItem(item, 'EmpNo') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">教室：</text> 
-              {{ displayListItem(item, 'ClassroomNo') }} 
-            </view> 
-  
-<view v-show="item.AttemperType!= '02'">
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">新系部：</text> 
-              {{ displayListItem(item, 'NewDeptNo') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">新专业：</text> 
-              {{ displayListItem(item, 'NewMajorNo') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">新课程：</text> 
-              {{ displayListItem(item, 'NewLessonNo') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">新班级：</text> 
-              {{ displayListItem(item, 'NewTeachClassNo') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">新教师：</text> 
-              {{ displayListItem(item, 'NewEmpNo') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">新教室：</text> 
-              {{ displayListItem(item, 'NewClassroomNo') }} 
-            </view> 
-</view>
-  
-  
-          </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-select 
-          v-model="queryData.AttemperType"
-          @change="searchChange"
-          :range="dataSource.AttemperType"
-          title ="调度类型"
-          placeholder="按调度类型查询"
-        /> 
-        <l-input 
-          v-model="queryData.AcademicYearNo"
-          @change="searchChange"
-          title ="学年学期"
-          placeholder="按学年学期查询"
-        /> 
-        <l-select 
-          v-model="queryData.DeptNo"
-          @change="searchChange"
-          :range="dataSource.DeptNo"
-          title ="系部"
-          placeholder="按系部查询"
-        /> 
-        <l-select 
-          v-model="queryData.MajorNo"
-          @change="searchChange"
-          :range="dataSource.MajorNo"
-          title ="专业"
-          placeholder="按专业查询"
-        /> 
-        <l-select 
-          v-model="queryData.LessonNo"
-          @change="searchChange"
-          :range="dataSource.LessonNo"
-          title ="课程"
-          placeholder="按课程查询"
-        /> 
-        <l-select 
-          v-model="queryData.TeachClassNo"
-          @change="searchChange"
-          :range="dataSource.TeachClassNo"
-          title ="班级信息"
-          placeholder="按班级信息查询"
-        /> 
-        <l-select 
-          v-model="queryData.EmpNo"
-          @change="searchChange"
-          :range="dataSource.EmpNo"
-          title ="教师"
-          placeholder="按教师查询"
-        /> 
-  
-        <!-- 重置查询条件按钮 --> 
-        <view class="padding-tb"> 
-          <l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button> 
-        </view> 
-      </view> 
-    </scroll-view> 
-  
-  
-  </view> 
-</template> 
-  
-  
-<script> 
-/* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-20 14:32 
- * 描  述：调度信息 
- */
-  
-/** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/ArrangeLessonTermAttemper/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: { 
-        AttemperType: { type: 'select', itemCode: 'AttemperType', dataSource: '0' }, 
-        AttemperTimeType: { type: 'select', itemCode: 'AttemperTimeType', dataSource: '0' }, 
-        AttemperStartTime: { type: 'text' }, 
-        AcademicYearNo: { type: 'text' }, 
-        DeptNo: { type: 'select', dataSource: '1', dataSourceId: 'CdDeptInfo,deptname,deptno' }, 
-        MajorNo: { type: 'select', dataSource: '1', dataSourceId: 'CdMajorInfo,majorname,majorno' }, 
-        LessonNo: { type: 'select', dataSource: '1', dataSourceId: 'LessonInfo,lessonname,lessonno' }, 
-        TeachClassNo: { type: 'select', dataSource: '1', dataSourceId: 'bjsj,classname,classno' }, 
-        EmpNo: { type: 'select', dataSource: '1', dataSourceId: 'EmpInfo,empname,empno' }, 
-        ClassroomNo: { type: 'select', dataSource: '1', dataSourceId: 'ClassRoomInfo,classroomname,classroomno' }, 
-        NewDeptNo: { type: 'select', dataSource: '1', dataSourceId: 'CdDeptInfo,deptname,deptno' }, 
-        NewMajorNo: { type: 'select', dataSource: '1', dataSourceId: 'CdMajorInfo,majorname,majorno' }, 
-        NewLessonNo: { type: 'select', dataSource: '1', dataSourceId: 'LessonInfo,lessonname,lessonno' }, 
-        NewTeachClassNo: { type: 'select', dataSource: '1', dataSourceId: 'bjsj,classname,classno' }, 
-        NewEmpNo: { type: 'select', dataSource: '1', dataSourceId: 'EmpInfo,empname,empno' }, 
-        NewClassroomNo: { type: 'select', dataSource: '1', dataSourceId: 'ClassRoomInfo,classroomname,classroomno' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-        AttemperType: '', 
-        AcademicYearNo: '', 
-        DeptNo: '', 
-        MajorNo: '', 
-        LessonNo: '', 
-        TeachClassNo: '', 
-        EmpNo: '', 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        AttemperType: Object.values(this.GET_GLOBAL('dataDictionary').AttemperType).map(t => ({ value: t.value, text: t.text })), 
-        AttemperTimeType: Object.values(this.GET_GLOBAL('dataDictionary').AttemperTimeType).map(t => ({ value: t.value, text: t.text })), 
-        DeptNo: [], 
-        MajorNo: [], 
-        LessonNo: [], 
-        TeachClassNo: [], 
-        EmpNo: [], 
-        ClassroomNo: [], 
-        NewDeptNo: [], 
-        NewMajorNo: [], 
-        NewLessonNo: [], 
-        NewTeachClassNo: [], 
-        NewEmpNo: [], 
-        NewClassroomNo: [], 
-      }, 
-  
-      // 时间查询参数 
-      dateRange: null, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('EducationalAdministrationArrangeLessonTermAttemper-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('EducationalAdministrationArrangeLessonTermAttemper-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-        this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-          this.dataSource.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
-        }), 
-        this.FETCH_DATASOURCE('CdMajorInfo').then(result => { 
-          this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
-        }), 
-        this.FETCH_DATASOURCE('LessonInfo').then(result => { 
-          this.dataSource.LessonNo = result.data.map(t => ({ text: t.lessonname, value: t.lessonno })) 
-        }), 
-        this.FETCH_DATASOURCE('bjsj').then(result => { 
-          this.dataSource.TeachClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
-        }), 
-        this.FETCH_DATASOURCE('EmpInfo').then(result => { 
-          this.dataSource.EmpNo = result.data.map(t => ({ text: t.empname, value: t.empno })) 
-        }), 
-        this.FETCH_DATASOURCE('ClassRoomInfo').then(result => { 
-          this.dataSource.ClassroomNo = result.data.map(t => ({ text: t.classroomname, value: t.classroomno })) 
-        }), 
-        this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-          this.dataSource.NewDeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
-        }), 
-        this.FETCH_DATASOURCE('CdMajorInfo').then(result => { 
-          this.dataSource.NewMajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
-        }), 
-        this.FETCH_DATASOURCE('LessonInfo').then(result => { 
-          this.dataSource.NewLessonNo = result.data.map(t => ({ text: t.lessonname, value: t.lessonno })) 
-        }), 
-        this.FETCH_DATASOURCE('bjsj').then(result => { 
-          this.dataSource.NewTeachClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
-        }), 
-        this.FETCH_DATASOURCE('EmpInfo').then(result => { 
-          this.dataSource.NewEmpNo = result.data.map(t => ({ text: t.empname, value: t.empno })) 
-        }), 
-        this.FETCH_DATASOURCE('ClassRoomInfo').then(result => { 
-          this.dataSource.NewClassroomNo = result.data.map(t => ({ text: t.classroomname, value: t.classroomno })) 
-        }), 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/EducationalAdministration/ArrangeLessonTermAttemper/pagelist', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    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('/EducationalAdministration/ArrangeLessonTermAttemper/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 
-      } 
-    },
-    showField(item,field){
-        switch(field){
-            case 'AttemperStartTime':
-                return (item.AttemperStartTime == null ? "-" : item.AttemperStartTime) + "到" + (item.AttemperEndTime == null ? "-" : item.AttemperEndTime)
-            case 'AcademicYearNo':
-                return item.AcademicYearNo + "学年第" + item.Semester + "学期"
-        }
-    }
-  
-  } 
-} 
-</script> 
-  
-  
-<style lang="less" scoped> 
-@import '~@/common/css/sidepage.less'; 
-@import '~@/common/css/customlist.less'; 
-</style> 
\ No newline at end of file
+<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.Id">
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">调度类型：</text>
+							{{ displayListItem(item, 'AttemperType') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">调度时限：</text>
+							{{ displayListItem(item, 'AttemperTimeType') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">调度时间：</text>
+							{{ showField(item, 'AttemperStartTime') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">学年学期：</text>
+							{{ showField(item, 'AcademicYearNo') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">系部：</text>
+							{{ displayListItem(item, 'DeptNo') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">专业：</text>
+							{{ displayListItem(item, 'MajorNo') }}
+						</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, 'TeachClassNo') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">教师：</text>
+							{{ displayListItem(item, 'EmpNo') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">教室：</text>
+							{{ displayListItem(item, 'ClassroomNo') }}
+						</view>
+
+						<view v-show="item.AttemperType != '02'">
+							<view class="customlist-item-field">
+								<text class="customlist-item-field-title">新系部：</text>
+								{{ displayListItem(item, 'NewDeptNo') }}
+							</view>
+
+							<view class="customlist-item-field">
+								<text class="customlist-item-field-title">新专业：</text>
+								{{ displayListItem(item, 'NewMajorNo') }}
+							</view>
+
+							<view class="customlist-item-field">
+								<text class="customlist-item-field-title">新课程：</text>
+								{{ displayListItem(item, 'NewLessonNo') }}
+							</view>
+
+							<view class="customlist-item-field">
+								<text class="customlist-item-field-title">新班级：</text>
+								{{ displayListItem(item, 'NewTeachClassNo') }}
+							</view>
+
+							<view class="customlist-item-field">
+								<text class="customlist-item-field-title">新教师：</text>
+								{{ displayListItem(item, 'NewEmpNo') }}
+							</view>
+
+							<view class="customlist-item-field">
+								<text class="customlist-item-field-title">新教室：</text>
+								{{ displayListItem(item, 'NewClassroomNo') }}
+							</view>
+						</view>
+					</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-select v-model="queryData.AttemperType" @change="searchChange" :range="dataSource.AttemperType" title="调度类型" placeholder="按调度类型查询" />
+				<l-input v-model="queryData.AcademicYearNo" @change="searchChange" title="学年学期" placeholder="按学年学期查询" />
+				<l-select v-model="queryData.DeptNo" @change="searchChange" :range="dataSource.DeptNo" title="系部" placeholder="按系部查询" />
+				<l-select v-model="queryData.MajorNo" @change="searchChange" :range="dataSource.MajorNo" title="专业" placeholder="按专业查询" />
+				<l-select v-model="queryData.LessonNo" @change="searchChange" :range="dataSource.LessonNo" title="课程" placeholder="按课程查询" />
+				<l-select v-model="queryData.TeachClassNo" @change="searchChange" :range="dataSource.TeachClassNo" title="班级信息" placeholder="按班级信息查询" />
+				<l-select v-model="queryData.EmpNo" @change="searchChange" :range="dataSource.EmpNo" title="教师" placeholder="按教师查询" />
+
+				<!-- 重置查询条件按钮 -->
+				<view class="padding-tb"><l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button></view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2020-10-20 14:32
+ * 描  述：调度信息
+ */
+
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/EducationalAdministration/ArrangeLessonTermAttemper/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: {
+				AttemperType: { type: 'select', itemCode: 'AttemperType', dataSource: '0' },
+				AttemperTimeType: { type: 'select', itemCode: 'AttemperTimeType', dataSource: '0' },
+				AttemperStartTime: { type: 'text' },
+				AcademicYearNo: { type: 'text' },
+				DeptNo: { type: 'select', dataSource: '1', dataSourceId: 'CdDeptInfo,deptname,deptno' },
+				MajorNo: { type: 'select', dataSource: '1', dataSourceId: 'CdMajorInfo,majorname,majorno' }, //code  name  id
+				LessonNo: { type: 'select', dataSource: '1', dataSourceId: 'LessonInfo,lessonname,lessonno' },
+				TeachClassNo: { type: 'select', dataSource: '1', dataSourceId: 'bjsj,classname,classno' },
+				EmpNo: { type: 'select', dataSource: '1', dataSourceId: 'EmpInfo,empname,empno' },
+				ClassroomNo: { type: 'select', dataSource: '1', dataSourceId: 'ClassRoomInfo,classroomname,classroomno' },
+				NewDeptNo: { type: 'select', dataSource: '1', dataSourceId: 'CdDeptInfo,deptname,deptno' },
+				NewMajorNo: { type: 'select', dataSource: '1', dataSourceId: 'CdMajorInfo,majorname,majorno' },
+				NewLessonNo: { type: 'select', dataSource: '1', dataSourceId: 'LessonInfo,lessonname,lessonno' },
+				NewTeachClassNo: { type: 'select', dataSource: '1', dataSourceId: 'bjsj,classname,classno' },
+				NewEmpNo: { type: 'select', dataSource: '1', dataSourceId: 'EmpInfo,empname,empno' },
+				NewClassroomNo: { type: 'select', dataSource: '1', dataSourceId: 'ClassRoomInfo,classroomname,classroomno' }
+			},
+
+			// 查询条件
+			searchData: {},
+			defaultQueryData: {},
+			queryData: {
+				AttemperType: '',
+				AcademicYearNo: '',
+				DeptNo: '',
+				MajorNo: '',
+				LessonNo: '',
+				TeachClassNo: '',
+				EmpNo: ''
+			},
+
+			// 数据源
+			dataSource: {
+				AttemperType: Object.values(this.GET_GLOBAL('dataDictionary').AttemperType).map(t => ({ value: t.value, text: t.text })),
+				AttemperTimeType: Object.values(this.GET_GLOBAL('dataDictionary').AttemperTimeType).map(t => ({ value: t.value, text: t.text })),
+				DeptNo: [],
+				MajorNo: [],
+				LessonNo: [],
+				TeachClassNo: [],
+				EmpNo: [],
+				ClassroomNo: [],
+				NewDeptNo: [],
+				NewMajorNo: [],
+				NewLessonNo: [],
+				NewTeachClassNo: [],
+				NewEmpNo: [],
+				NewClassroomNo: []
+			},
+
+			// 时间查询参数
+			dateRange: null,
+
+			// 页面相关参数
+			ready: false,
+			tips: '加载中...',
+			loadState: '向下翻以加载更多',
+			sideOpen: false,
+
+			// 列表与分页信息
+			page: 1,
+			total: 2,
+			list: []
+		};
+	},
+
+	async onLoad() {
+		await this.init();
+	},
+	onUnload() {
+		this.OFF('EducationalAdministrationArrangeLessonTermAttemper-list-change');
+	},
+
+	methods: {
+		// 页面初始化
+		async init() {
+			this.ON('EducationalAdministrationArrangeLessonTermAttemper-list-change', this.refreshList);
+
+			// 拉取加载列表和数据源
+			await Promise.all([
+				this.FETCH_DATASOURCE('CdDeptInfo').then(result => {
+					this.dataSource.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno }));
+				}),
+				this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
+					this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno }));
+				}),
+				this.FETCH_DATASOURCE('LessonInfo').then(result => {
+					this.dataSource.LessonNo = result.data.map(t => ({ text: t.lessonname, value: t.lessonno }));
+				}),
+				this.FETCH_DATASOURCE('bjsj').then(result => {
+					this.dataSource.TeachClassNo = result.data.map(t => ({ text: t.classname, value: t.classno }));
+				}),
+				this.FETCH_DATASOURCE('EmpInfo').then(result => {
+					this.dataSource.EmpNo = result.data.map(t => ({ text: t.empname, value: t.empno }));
+				}),
+				this.FETCH_DATASOURCE('ClassRoomInfo').then(result => {
+					this.dataSource.ClassroomNo = result.data.map(t => ({ text: t.classroomname, value: t.classroomno }));
+				}),
+				this.FETCH_DATASOURCE('CdDeptInfo').then(result => {
+					this.dataSource.NewDeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno }));
+				}),
+				this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
+					this.dataSource.NewMajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno }));
+				}),
+				this.FETCH_DATASOURCE('LessonInfo').then(result => {
+					this.dataSource.NewLessonNo = result.data.map(t => ({ text: t.lessonname, value: t.lessonno }));
+				}),
+				this.FETCH_DATASOURCE('bjsj').then(result => {
+					this.dataSource.NewTeachClassNo = result.data.map(t => ({ text: t.classname, value: t.classno }));
+				}),
+				this.FETCH_DATASOURCE('EmpInfo').then(result => {
+					this.dataSource.NewEmpNo = result.data.map(t => ({ text: t.empname, value: t.empno }));
+				}),
+				this.FETCH_DATASOURCE('ClassRoomInfo').then(result => {
+					this.dataSource.NewClassroomNo = result.data.map(t => ({ text: t.classroomname, value: t.classroomno }));
+				}),
+
+				() => {}
+			]);
+			await this.fetchList();
+			// 初始化查询条件
+			this.defaultQueryData = this.COPY(this.queryData);
+			this.ready = true;
+		},
+
+		// 拉取列表
+		async fetchList() {
+			if (this.page > this.total) {
+				return;
+			}
+
+			const result = await this.HTTP_GET(
+				'learun/adms/EducationalAdministration/ArrangeLessonTermAttemper/pagelist',
+				{
+					// 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序)
+					// 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序
+					pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' },
+					queryJson: JSON.stringify(this.searchData)
+				},
+				'加载数据时出错'
+			);
+
+			if (!result) {
+				return;
+			}
+
+			this.total = result.total;
+			this.page = result.page + 1;
+			this.list = this.list.concat(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();
+		},
+
+		// 列表下拉
+		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/ArrangeLessonTermAttemper/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;
+			}
+		},
+		showField(item, field) {
+			switch (field) {
+				case 'AttemperStartTime':
+					return (item.AttemperStartTime == null ? '-' : item.AttemperStartTime) + '到' + (item.AttemperEndTime == null ? '-' : item.AttemperEndTime);
+				case 'AcademicYearNo':
+					return item.AcademicYearNo + '学年第' + item.Semester + '学期';
+			}
+		}
+	}
+};
+</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/BookBorrow/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/BookBorrow/list.vue
index cb3537e4e..28be8e8ff 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/BookBorrow/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/BookBorrow/list.vue	
@@ -1,303 +1,303 @@
 <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.ID"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">借书时间：</text> 
-              {{ displayListItem(item, 'BorrowTime') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">还书时间：</text> 
-              {{ displayListItem(item, 'ReturnTime') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">借书证：</text> 
-              {{ displayListItem(item, 'LibraryCard') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">图书编号：</text> 
-              {{ displayListItem(item, 'BookID') }} 
-            </view> 
-  
-  
-            <!-- <l-customlist-action showEdit @edit="action('edit', item.ID)" showDelete @delete="action('delete', item.ID)" @view="action('view', item.ID)" /> -->
-          </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.LibraryCard"
-          @change="searchChange"
-          title ="借书证"
-          placeholder="按借书证查询"
-        /> 
-        <l-input 
-          v-model="queryData.BookID"
-          @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> 
+  <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.ID"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">借书时间：</text> 
+              {{ displayListItem(item, 'BorrowTime') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">还书时间：</text> 
+              {{ displayListItem(item, 'ReturnTime') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">借书证：</text> 
+              {{ displayListItem(item, 'LibraryCard') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">图书编号：</text> 
+              {{ displayListItem(item, 'BookID') }} 
+            </view> 
+  
+  
+            <!-- <l-customlist-action showEdit @edit="action('edit', item.ID)" showDelete @delete="action('delete', item.ID)" @view="action('view', item.ID)" /> -->
+          </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.LibraryCard"
+          @change="searchChange"
+          title ="借书证"
+          placeholder="按借书证查询"
+        /> 
+        <l-input 
+          v-model="queryData.BookID"
+          @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 
- */
-  
+ * 版 本 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/BookBorrow/list", "style": { "navigationBarTitleText": "表单列表页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/BookBorrow/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: { 
-        BorrowTime: { type: 'text' }, 
-        ReturnTime: { type: 'text' }, 
-        LibraryCard: { type: 'text' }, 
-        BookID: { type: 'text' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-        LibraryCard: '', 
-        BookID: '', 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-      }, 
-  
-      // 时间查询参数 
-      dateRange: null, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('EducationalAdministrationBookBorrow-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('EducationalAdministrationBookBorrow-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/EducationalAdministration/BookBorrow/pagelist', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'ID', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    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('/EducationalAdministration/BookBorrow/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 
-      } 
-    } 
-  
-  } 
+  data() { 
+    return {
+      // 数据项的数据类型、结构 
+      scheme: { 
+        BorrowTime: { type: 'text' }, 
+        ReturnTime: { type: 'text' }, 
+        LibraryCard: { type: 'text' }, 
+        BookID: { type: 'text' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+        LibraryCard: '', 
+        BookID: '', 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+      }, 
+  
+      // 时间查询参数 
+      dateRange: null, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('EducationalAdministrationBookBorrow-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('EducationalAdministrationBookBorrow-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/EducationalAdministration/BookBorrow/pagelist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'ID', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    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/BookBorrow/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'; 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue
index 33bab2269..c8175b3ba 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue	
@@ -1,55 +1,55 @@
 <template>
-    <view class="page">
-        <view v-if="ready">
-            <l-date-picker
+    <view class="page">
+        <view v-if="ready">
+            <l-date-picker
         @input="setValue('EmpInfo.Birthday', $event)"
         :value="getValue('EmpInfo.Birthday')"
         :disabled="!edit"
         title="出生日期"
       />
-            <l-select
+            <l-select
         @input="setValue('EmpInfo.PartyFaceNo', $event)"
         :value="getValue('EmpInfo.PartyFaceNo')"
         :disabled="!edit"
         :range="dataSource.EmpInfo.PartyFaceNo"
         title="政治面貌"
       />
-            <l-select
+            <l-select
         @input="setValue('EmpInfo.NationalityNo', $event)"
         :value="getValue('EmpInfo.NationalityNo')"
         :disabled="!edit"
         :range="dataSource.EmpInfo.NationalityNo"
         title="民族"
       />
-            <l-upload-file
+            <l-upload-file
         @input="setValue('EmpInfo.Photo', $event)"
         :value="getValue('EmpInfo.Photo')"
         :readonly="!edit"
         :number="1"
         title="照片上传"
       />
-            <l-input
+            <l-input
         @input="setValue('EmpInfo.mobile', $event)"
         :value="getValue('EmpInfo.mobile')"
         :disabled="!edit"
         title="电话"
         required
       />
-            <l-input
+            <l-input
         @input="setValue('EmpInfo.EMail', $event)"
         :value="getValue('EmpInfo.EMail')"
         :disabled="!edit"
         title="邮箱"
         required
       />
-          </view
+          </view
     >
-           <view
+           <view
       v-if="ready"
       class="bg-white margin-tb padding"
       style="padding-top: 0; overflow: hidden"
     >
-            <l-button
+            <l-button
         v-if="edit"
         @click="action('save')"
         size="lg"
@@ -57,9 +57,9 @@
         class="block margin-top"
         block
       >
-                提交保存       </l-button
+                提交保存       </l-button
       >
-            <l-button
+            <l-button
         v-if="!edit && mode !== 'create'"
         @click="action('edit')"
         size="lg"
@@ -67,9 +67,9 @@
         class="block margin-top"
         block
       >
-                编辑本页       </l-button
+                编辑本页       </l-button
       >
-            <l-button
+            <l-button
         v-if="edit && mode !== 'create'"
         @click="action('reset')"
         size="lg"
@@ -77,22 +77,22 @@
         class="block margin-top"
         block
       >
-                取消编辑       </l-button
+                取消编辑       </l-button
       >
-          </view
+          </view
     >
-      </view
+      </view
   >
 </template> 
-  
-  
+  
+  
 <script>
 /*
  * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
  * Copyright (c) 2013-2020 上海力软信息技术有限公司
  * 创建人：超级管理员
- * 日  期：2020-10-19 11:55
- * 描  述：个人信息
+ * 日  期：2020-10-19 11:55
+ * 描  述：个人信息
  */
 /**
  * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
@@ -166,7 +166,7 @@ export default {
         this.origin = await this.getDefaultForm();
       } else {
         const result = await this.HTTP_GET(
-          "/EducationalAdministration/EmpRegister/formForNo",
+          "learun/adms/EducationalAdministration/EmpRegister/formForNo",
           this.id
         );
         this.id=result.EmpInfo.EmpId;
@@ -202,7 +202,7 @@ export default {
           this.LOADING("正在提交...");
           const postData = await this.getPostData(this.id);
           this.HTTP_POST(
-            "/EducationalAdministration/EmpRegister/save",
+            "learun/adms/EducationalAdministration/EmpRegister/save",
             postData,
             "表单提交保存失败"
           ).then((success) => {
@@ -221,7 +221,7 @@ export default {
           }
           this.LOADING("提交删除中...");
           this.HTTP_POST(
-            "/EducationalAdministration/EmpRegister/delete",
+            "learun/adms/EducationalAdministration/EmpRegister/delete",
             this.id,
             "删除失败"
           ).then((success) => {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue
index 179d1aa3d..805993be7 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue	
@@ -1,252 +1,252 @@
 <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.VID"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">学年：</text> 
-              {{ displayListItem(item, 'AcademicYearNo') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">学期：</text> 
-              {{ displayListItem(item, 'Semester') }} 
-            </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, 'LessonName') }} 
+  <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.VID"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">学年：</text> 
+              {{ displayListItem(item, 'AcademicYearNo') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">学期：</text> 
+              {{ displayListItem(item, 'Semester') }} 
+            </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, 'LessonName') }} 
             </view>
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">评教状态：</text> 
-              {{ displayListItem(item, 'UID') }} 
-            </view> 
-  
-  
-            <l-customlist-action @view="action('view', item)" /> 
-          </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"> 
-  
-  
-        <!-- 重置查询条件按钮 --> 
-        <view class="padding-tb"> 
-          <l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button> 
-        </view> 
-      </view> 
-    </scroll-view> 
-  
-  
-  </view> 
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">评教状态：</text> 
+              {{ displayListItem(item, 'UID') }} 
+            </view> 
+  
+  
+            <l-customlist-action @view="action('view', item)" /> 
+          </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"> 
+  
+  
+        <!-- 重置查询条件按钮 --> 
+        <view class="padding-tb"> 
+          <l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button> 
+        </view> 
+      </view> 
+    </scroll-view> 
+  
+  
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-16 15:39 
- * 描  述：工作日志 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-16 15:39 
+ * 描  述：工作日志 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/Journal/list", "style": { "navigationBarTitleText": "表单列表页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/Journal/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: { 
-        AcademicYearNo: { type: 'text' }, 
-        Semester: { type: 'text'}, 
-        EmpName: { type: 'text'}, 
-        LessonName: { type: 'text' }, 
-        UID: { type: 'bit' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        JTypeId: [], 
-      }, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('EducationalAdministrationJournalSend-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('EducationalAdministrationJournalSend-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/eval/studentlist', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: '', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    pullDown() { 
-      this.refreshList().then(() => { 
-        this.$refs.list.stopPullDown() 
-      }) 
-    }, 
-  
-    // 设置搜索条件 
-    async searchChange() { 
-      const result = {} 
-  
-      // 将其他查询项添加到查询 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.queryData = this.COPY(this.defaultQueryData) 
-      this.searchChange() 
-    }, 
-  
-    // 点击「编辑」、「查看」、「添加」、「删除」按钮 
-    async action(type, item) { 
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        AcademicYearNo: { type: 'text' }, 
+        Semester: { type: 'text'}, 
+        EmpName: { type: 'text'}, 
+        LessonName: { type: 'text' }, 
+        UID: { type: 'bit' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        JTypeId: [], 
+      }, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('EducationalAdministrationJournalSend-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('EducationalAdministrationJournalSend-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/eval/studentlist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: '', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    pullDown() { 
+      this.refreshList().then(() => { 
+        this.$refs.list.stopPullDown() 
+      }) 
+    }, 
+  
+    // 设置搜索条件 
+    async searchChange() { 
+      const result = {} 
+  
+      // 将其他查询项添加到查询 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.queryData = this.COPY(this.defaultQueryData) 
+      this.searchChange() 
+    }, 
+  
+    // 点击「编辑」、「查看」、「添加」、「删除」按钮 
+    async action(type, item) { 
     this.NAV_TO(`./single?type=view&id=${item.VID}&EmpNo=${item.EmpNo}&LessonNo=${item.LessonNo}`) 
-    }, 
-  
-    // 显示列表中的标题项 
-    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') 
+    }, 
+  
+    // 显示列表中的标题项 
+    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') 
         case 'bit':
             return (value != undefined && value!== '') ? "已评" : "未评"
-  
-        default: return value === null || value === undefined ? '' : value 
-      } 
-    } 
-  
-  } 
+  
+        default: return value === null || value === undefined ? '' : value 
+      } 
+    } 
+  
+  } 
 } 
 </script> 
-  
-  
+  
+  
 <style lang="less" scoped> 
 @import '~@/common/css/sidepage.less'; 
 @import '~@/common/css/customlist.less'; 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue
index d10005a84..b0163ef76 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue	
@@ -1,217 +1,217 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-input 
-        @input="setValue('JournalSend.JTitle', $event)"
-        :value="getValue('JournalSend.JTitle')"
-        :disabled="!edit"
-        title="上课是否迟到"
-      /> 
-      <l-select 
-        @input="setValue('JournalSend.JTypeId', $event)"
-        :value="getValue('JournalSend.JTypeId')"
-        :disabled="!edit"
-        :range="dataSource.JournalSend.JTypeId"
-        title="是否拖堂"
-      /> 
-      <l-organize-picker 
-        @input="setValue('JournalSend.JReceiveId', $event)"
-        :value="getValue('JournalSend.JReceiveId')"
-        :readonly="!edit"
-        type="user"
-        title="作业量是否合理"
-      /> 
-      <l-textarea 
-        @input="setValue('JournalSend.JContent', $event)"
-        :value="getValue('JournalSend.JContent')"
-        :readonly="!edit"
-        title="对老师还有什么建议"
-      /> 
-    </view> 
-  
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> 
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-input 
+        @input="setValue('JournalSend.JTitle', $event)"
+        :value="getValue('JournalSend.JTitle')"
+        :disabled="!edit"
+        title="上课是否迟到"
+      /> 
+      <l-select 
+        @input="setValue('JournalSend.JTypeId', $event)"
+        :value="getValue('JournalSend.JTypeId')"
+        :disabled="!edit"
+        :range="dataSource.JournalSend.JTypeId"
+        title="是否拖堂"
+      /> 
+      <l-organize-picker 
+        @input="setValue('JournalSend.JReceiveId', $event)"
+        :value="getValue('JournalSend.JReceiveId')"
+        :readonly="!edit"
+        type="user"
+        title="作业量是否合理"
+      /> 
+      <l-textarea 
+        @input="setValue('JournalSend.JContent', $event)"
+        :value="getValue('JournalSend.JContent')"
+        :readonly="!edit"
+        title="对老师还有什么建议"
+      /> 
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-16 15:39 
- * 描  述：工作日志 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-16 15:39 
+ * 描  述：工作日志 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/JournalSend/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/JournalSend/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        JournalSend: { 
-          JTitle: { type: 'text', title: '日志主题' }, 
-          JTypeId: { type: 'select', title: '日志类型', dataSource: '0' }, 
-          JReceiveId: { type: 'organize', title: '接收人', dataType: 'user' }, 
-          JContent: { type: 'textarea', title: '日志内容' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        JournalSend: { 
-          JTypeId: [], 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/eval/paper', {VID:this.id}) 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        JournalSend: { 
+          JTitle: { type: 'text', title: '日志主题' }, 
+          JTypeId: { type: 'select', title: '日志类型', dataSource: '0' }, 
+          JReceiveId: { type: 'organize', title: '接收人', dataType: 'user' }, 
+          JContent: { type: 'textarea', title: '日志内容' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        JournalSend: { 
+          JTypeId: [], 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/eval/paper', {VID:this.id}) 
 console.log(result);
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/EducationalAdministration/Journal/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationJournalSend-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/EducationalAdministration/Journal/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationJournalSend-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/EducationalAdministration/Journal/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationJournalSend-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/EducationalAdministration/Journal/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationJournalSend-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue
index 4ac6a73d3..53a913d5a 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue	
@@ -1,272 +1,272 @@
 <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.JournalSendId"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">日志主题：</text> 
-              {{ displayListItem(item, 'JTitle') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">日志类型：</text> 
-              {{ displayListItem(item, 'JTypeId') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">接收人：</text> 
-              {{ displayListItem(item, 'JReceiveId') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">日志内容：</text> 
-              {{ displayListItem(item, 'JContent') }} 
-            </view> 
-  
-  
-            <l-customlist-action showEdit @edit="action('edit', item.JournalSendId)" showDelete @delete="action('delete', item.JournalSendId)" @view="action('view', item.JournalSendId)" /> 
-          </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"> 
-  
-  
-        <!-- 重置查询条件按钮 --> 
-        <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> 
+  <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.JournalSendId"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">日志主题：</text> 
+              {{ displayListItem(item, 'JTitle') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">日志类型：</text> 
+              {{ displayListItem(item, 'JTypeId') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">接收人：</text> 
+              {{ displayListItem(item, 'JReceiveId') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">日志内容：</text> 
+              {{ displayListItem(item, 'JContent') }} 
+            </view> 
+  
+  
+            <l-customlist-action showEdit @edit="action('edit', item.JournalSendId)" showDelete @delete="action('delete', item.JournalSendId)" @view="action('view', item.JournalSendId)" /> 
+          </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"> 
+  
+  
+        <!-- 重置查询条件按钮 --> 
+        <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-16 15:39 
- * 描  述：工作日志 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-16 15:39 
+ * 描  述：工作日志 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/Journal/list", "style": { "navigationBarTitleText": "表单列表页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/Journal/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: { 
-        JTitle: { type: 'text' }, 
-        JTypeId: { type: 'select', dataSource: '0' }, 
-        JReceiveId: { type: 'organize', dataType: 'user' }, 
-        JContent: { type: 'textarea' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        JTypeId: [], 
-      }, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('EducationalAdministrationJournalSend-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('EducationalAdministrationJournalSend-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/EducationalAdministration/Journal/pagelist', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'JournalSendId', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    pullDown() { 
-      this.refreshList().then(() => { 
-        this.$refs.list.stopPullDown() 
-      }) 
-    }, 
-  
-    // 设置搜索条件 
-    async searchChange() { 
-      const result = {} 
-  
-      // 将其他查询项添加到查询 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.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('/EducationalAdministration/Journal/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 
-      } 
-    } 
-  
-  } 
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        JTitle: { type: 'text' }, 
+        JTypeId: { type: 'select', dataSource: '0' }, 
+        JReceiveId: { type: 'organize', dataType: 'user' }, 
+        JContent: { type: 'textarea' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        JTypeId: [], 
+      }, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('EducationalAdministrationJournalSend-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('EducationalAdministrationJournalSend-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/EducationalAdministration/Journal/pagelist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'JournalSendId', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    pullDown() { 
+      this.refreshList().then(() => { 
+        this.$refs.list.stopPullDown() 
+      }) 
+    }, 
+  
+    // 设置搜索条件 
+    async searchChange() { 
+      const result = {} 
+  
+      // 将其他查询项添加到查询 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.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/Journal/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'; 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue
index d0a989e55..9ef35f666 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue	
@@ -1,216 +1,216 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-input 
-        @input="setValue('JournalSend.JTitle', $event)"
-        :value="getValue('JournalSend.JTitle')"
-        :disabled="!edit"
-        title="日志主题"
-      /> 
-      <l-select 
-        @input="setValue('JournalSend.JTypeId', $event)"
-        :value="getValue('JournalSend.JTypeId')"
-        :disabled="!edit"
-        :range="dataSource.JournalSend.JTypeId"
-        title="日志类型"
-      /> 
-      <l-organize-picker 
-        @input="setValue('JournalSend.JReceiveId', $event)"
-        :value="getValue('JournalSend.JReceiveId')"
-        :readonly="!edit"
-        type="user"
-        title="接收人"
-      /> 
-      <l-textarea 
-        @input="setValue('JournalSend.JContent', $event)"
-        :value="getValue('JournalSend.JContent')"
-        :readonly="!edit"
-        title="日志内容"
-      /> 
-    </view> 
-  
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> 
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-input 
+        @input="setValue('JournalSend.JTitle', $event)"
+        :value="getValue('JournalSend.JTitle')"
+        :disabled="!edit"
+        title="日志主题"
+      /> 
+      <l-select 
+        @input="setValue('JournalSend.JTypeId', $event)"
+        :value="getValue('JournalSend.JTypeId')"
+        :disabled="!edit"
+        :range="dataSource.JournalSend.JTypeId"
+        title="日志类型"
+      /> 
+      <l-organize-picker 
+        @input="setValue('JournalSend.JReceiveId', $event)"
+        :value="getValue('JournalSend.JReceiveId')"
+        :readonly="!edit"
+        type="user"
+        title="接收人"
+      /> 
+      <l-textarea 
+        @input="setValue('JournalSend.JContent', $event)"
+        :value="getValue('JournalSend.JContent')"
+        :readonly="!edit"
+        title="日志内容"
+      /> 
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-16 15:39 
- * 描  述：工作日志 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-16 15:39 
+ * 描  述：工作日志 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/JournalSend/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/JournalSend/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        JournalSend: { 
-          JTitle: { type: 'text', title: '日志主题' }, 
-          JTypeId: { type: 'select', title: '日志类型', dataSource: '0' }, 
-          JReceiveId: { type: 'organize', title: '接收人', dataType: 'user' }, 
-          JContent: { type: 'textarea', title: '日志内容' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        JournalSend: { 
-          JTypeId: [], 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/EducationalAdministration/Journal/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/EducationalAdministration/Journal/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationJournalSend-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/EducationalAdministration/Journal/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationJournalSend-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        JournalSend: { 
+          JTitle: { type: 'text', title: '日志主题' }, 
+          JTypeId: { type: 'select', title: '日志类型', dataSource: '0' }, 
+          JReceiveId: { type: 'organize', title: '接收人', dataType: 'user' }, 
+          JContent: { type: 'textarea', title: '日志内容' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        JournalSend: { 
+          JTypeId: [], 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/EducationalAdministration/Journal/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/EducationalAdministration/Journal/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationJournalSend-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/EducationalAdministration/Journal/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationJournalSend-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/from.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/from.vue
new file mode 100644
index 000000000..cbf6555fd
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/from.vue	
@@ -0,0 +1,111 @@
+<template>
+	<view class="page">
+		<l-input title="学年" placeholder="请填写学年" :value="data.AcademicYearNo" disabled right />
+		<l-input title="学期" placeholder="请填写学期" :value="data.Semester" disabled right />
+		<l-input title="课程名称" placeholder="请填写课程名称" :value="data.LessonName" disabled right />
+		<view class="txt">课程简介：</view>
+		<view class="remarks">
+		  <!-- <l-textarea class="remarks" title="课程简介" :value="data.Introduction" placeholder="输入点什么..." readonly="readonly" /> -->
+		   <textarea disabled auto-height='true' :value="data.Introduction" />
+		</view>
+		<l-input title="上课节次" placeholder="请填写上课节次" :value="data.LessonSection" disabled right />
+		<l-input title="上课时间" placeholder="请填写上课时间" :value="data.LessonTime" disabled right />
+		<l-input title="学分" placeholder="请填写学分" :value="data.StudyScore" disabled right />
+		<l-input title="教师姓名" placeholder="请填写教师姓名" :value="data.EmpName" disabled right />
+		<!-- <view class="txt">教师简介：</view>
+		<view class="bg-white">
+		  <l-textarea :value="data.resume" disabled placeholder="输入点什么..." readonly="readonly" />
+		</view> -->
+		<view class="txt">教师简介：</view>
+		<view class="remarks">
+		  <!-- <l-textarea class="remarks" title="课程简介" :value="data.Introduction" placeholder="输入点什么..." readonly="readonly" /> -->
+		   <textarea disabled auto-height='true' :value="data.resume" />
+		</view>
+		<l-input title="教室名称" placeholder="请填写教室名称" :value="data.ClassRoomName" disabled right />
+		<!-- <l-input title="姓名" placeholder="请填写姓名" :value="data.AcademicYearNo" disabled right /> -->
+		<l-input title="人数上限" placeholder="请填写人数上限" :value="data.StuNumMax" disabled right />
+		<l-input title="已报名人数" placeholder="请填写已报名人数" :value="data.StuNum" disabled right />
+		<view class="btn" @click="fromBtn">报名</view>
+	</view>
+</template>
+
+<script>
+export default{
+	data() {
+		return {
+			weekChina: ["一", "二", "三", "四", "五", "六", "日"],
+			keyValue: '',
+			data: {}
+		}
+	},
+	methods:{
+		init() {
+			this.keyValue = this.GET_PARAM(); //获取页面传递参数
+			// console.log(this.keyValue);
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/form', _this.keyValue, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				// console.log(res);
+				_this.data = res.JournalReceive;
+			});
+		},
+		fromBtn() {
+			var _postData = {}
+			let _this = this;
+			let user = this.GET_GLOBAL('loginUser');;
+			_postData.keyValue = this.keyValue;
+			_postData.StuNo = user.account;
+			_this.LOADING('正在提交…');
+			_this.HTTP_POST('learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/SignInByMobile', _postData, '加载数据时出错').then((res,info, code) => {
+				// this.HIDE_LOADING();
+				console.log(res);
+				// console.log(info);
+				// console.log(code);
+				if (res) {// 表单数据保存成功
+				    //判断队列结果
+				    let timer = setInterval(function () {
+						// _this.LOADING('正在提交…');
+						_this.HTTP_POST('learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/GetApplyResult', _postData, '加载数据时出错').then((dataresult) => {
+							_this.HIDE_LOADING();
+							console.log(dataresult)
+							clearInterval(timer);
+							_this.EMIT('OpenLessonPlanOfElectiveStudent')
+							_this.TOAST(dataresult.msg);
+							// _this.NAV_BACK()
+						});
+				    }, 5000);
+				}
+			});
+			
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+.txt{
+	line-height: 24px;
+	font-size: 15px;
+	background-color: #fff;
+	padding: 10px 0 10px 15px;
+}
+.page{
+	background-color: #fff;
+	padding-bottom: 1px;
+}
+/deep/ .cu-form-group uni-textarea{
+	height: auto;
+}
+.remarks{
+	    border-bottom: 0.5px solid #eee;
+		padding-bottom: 10px;
+}
+.remarks textarea{
+	width: 100%;
+	padding: 0 15px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/list.vue
new file mode 100644
index 000000000..f7a0c9843
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/list.vue	
@@ -0,0 +1,237 @@
+<template>
+	<view class="page">
+		<view class="mainpage" :class="sideOpen ? 'show' : ''" style="padding-top: 40px;">
+			<!-- <l-customlist-banner></l-customlist-banner> -->
+			<view class="records">共 {{ records }} 条数据</view>
+			<l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="data">
+				<l-customlist :tips="loadState" showTips>
+					<view class="pageBox customlist-item" showDelete="true" v-for="(item, ind) in data" :key="item.MakeDate" @click="tapClick(item)">
+						<view class="">
+							<text>学年:</text>
+							{{ item.AcademicYearNo }}
+						</view>
+						<view class="">
+							<text>学期:</text>
+							{{ item.Semester }}
+						</view>
+						<view class="">
+							<text>课程名称:</text>
+							{{ item.LessonName }}
+						</view>
+						<view class="">
+							<text>上课节次:</text>
+							{{ jieci(item.LessonSection) }}
+						</view>
+						<view class="">
+							<text>上课时间:</text>
+							{{ item.LessonTime }}
+						</view>
+						<view class="">
+							<text>学分:</text>
+							{{ item.StudyScore }}
+						</view>
+						<view class="">
+							<text>教师姓名:</text>
+							{{ item.EmpName }}
+						</view>
+						<view class="">
+							<text>教室名称:</text>
+							{{ item.ClassRoomNo }}
+						</view>
+						<view class="">
+							<text>人数上限:</text>
+							{{ item.StuNumMax }}
+						</view>
+						<view class="">
+							<text>已报名人数:</text>
+							{{ item.StuNumOfApplyPre }}
+						</view>
+						<view class="pageType">{{ typePd(item.StatusPre) }}</view>
+						<view class="delbtn" @click.stop="delTap(item)">取消报名</view>
+					</view>
+				</l-customlist>
+			</l-scroll-list>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			weekChina: ['一', '二', '三', '四', '五', '六', '日'],
+			user: null,
+			data: [],
+			total: 1,
+			records: 0,
+			ready: false,
+			page: 1,
+			rows: 10,
+			multipleData: null,
+			sideOpen: false,
+			loadState: '向下翻以加载更多'
+		};
+	},
+	onUnload() {
+		this.OFF('OpenLessonPlanOfElectiveStudent');
+	},
+	methods: {
+		init() {
+			this.ON('OpenLessonPlanOfElectiveStudent', this.refreshList);
+			// 拉取加载列表和数据源
+			Promise.all([() => {}]);
+			var _this = this;
+			this.user = this.GET_GLOBAL('loginUser');
+			this.fetchList();
+			this.ready = true;
+		},
+		// 拉取列表
+		async fetchList() {
+			if (this.page > this.total) {
+				return;
+			}
+			let _this = this;
+			let _postParam = {
+				pagination: {
+					rows: _this.rows,
+					page: _this.page,
+					sidx: 'LessonNo',
+					sord: 'asc'
+				},
+				queryJson: '{}'
+			};
+			if (true) {
+				_postParam.queryJson = JSON.stringify({
+					StuNo: _this.user.account,
+					StuMajorNo: _this.user.majorno,
+					StuGrade: _this.user.grade
+				});
+			}
+			// console.log(_this.user)
+			_this.LOADING('加载数据中…')
+			_this.HTTP_GET('learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/pagelist', _postParam, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				// console.log(res);
+				this.data = this.data.concat(res.rows);
+				_this.total = res.total;
+				_this.records = res.records;
+				this.page = res.page + 1;
+				this.loadState = res.page >= res.total ? '已加载所有项目' : '向下翻以加载更多';
+				// console.log(_this.data);
+			});
+		},
+		// 列表下拉
+		pullDown() {
+			this.refreshList().then(() => {
+				this.$refs.data.stopPullDown();
+			});
+		},
+		async refreshList() {
+			this.page = 1;
+			this.total = 1;
+			this.data = [];
+
+			this.fetchList();
+		},
+		tapClick(data) {
+			this.NAV_TO('./from', data.Id, true);
+		},
+		delTap (item) {
+			// console.log(item)
+			let _this = this;
+			this.CONFIRM('数字化校园提示', '确定要取消报名吗？', true).then( res => {
+				if(res){
+					let _postData = {
+						keyValue: item.Id,
+						StuNo: _this.user.account
+					}
+					_this.LOADING('正在取消报名…')
+					_this.HTTP_POST(
+					  'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/Cancel',
+					  _postData,
+					  '加载数据时出错'
+					).then( data => { 
+						_this.HIDE_LOADING()
+						console.log(data)
+						if (data) {// 成功
+						    this.TOAST('取消报名成功！');
+						    this.refreshList()
+						}
+					})
+				}
+			})
+		}
+	},
+	computed: {
+		jieci() {
+			return str => {
+				let ls = '';
+				if (str.indexOf(',') == -1) ls = '星期' + this.weekChina[str.slice(0, 1) - 1] + '第' + str.slice(1) + '节';
+				else ls = '星期' + this.weekChina[str.slice(0, 1) - 1] + '第' + str.slice(1, 2) + '、' + str.slice(4) + '节';
+
+				return ls;
+			};
+		},
+		typePd() {
+			return num => {
+				let txt = '';
+				if (num == 1) {
+					txt = '审核中';
+				} else if (num == 2) {
+					txt = '报名成功';
+				} else if (num == 3) {
+					txt = '报名失败';
+				} else {
+					txt = '未报名';
+				}
+				return txt;
+			};
+		}
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/common/css/sidepage.less';
+@import '~@/common/css/customlist.less';
+.page {
+	background-color: #fff;
+}
+.page-content {
+	margin-top: 39px;
+}
+.records {
+	color: #8f8f94;
+	background: #ffffff;
+	padding: 10px 12px;
+	width: 100%;
+	vertical-align: middle;
+	border-bottom: 0.5px solid #ddd;
+	position: fixed;
+	top: var(--window-top);
+	z-index: 1024;
+	border-bottom: 0.5px solid #ddd;
+	height: 40px;
+	width: 100%;
+	box-shadow: 0 0.5px 3px rgba(0, 0, 0, 0.1);
+	// background: #f1f1f1;
+}
+.pageBox {
+	// margin-top: 34px;
+	padding: 5px 15px;
+	line-height: 24px;
+	border-bottom: 5px solid #f5f5f5;
+}
+.delbtn {
+	position: absolute;
+	right: 15px;
+	bottom: 7px;
+	padding: 3px 10px;
+	background: #dd524d;
+	color: #fff;
+	border-radius: 3px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/from.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/from.vue
new file mode 100644
index 000000000..9885c9735
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/from.vue	
@@ -0,0 +1,99 @@
+<template>
+	<view class="page">
+		<l-input title="学年" placeholder="请填写学年" :value="data.AcademicYearNo" disabled right />
+		<l-input title="学期" placeholder="请填写学期" :value="data.Semester" disabled right />
+		<l-input title="课程名称" placeholder="请填写课程名称" :value="data.LessonName" disabled right />
+		<view class="txt">课程简介：</view>
+		<view class="remarks">
+		  <!-- <l-textarea class="remarks" title="课程简介" :value="data.Introduction" placeholder="输入点什么..." readonly="readonly" /> -->
+		   <textarea disabled auto-height='true' :value="data.Introduction" />
+		</view>
+		<l-input title="上课节次" placeholder="请填写上课节次" :value="data.LessonSection" disabled right />
+		<l-input title="上课时间" placeholder="请填写上课时间" :value="data.LessonTime" disabled right />
+		<l-input title="学分" placeholder="请填写学分" :value="data.StudyScore" disabled right />
+		<l-input title="教师姓名" placeholder="请填写教师姓名" :value="data.EmpName" disabled right />
+		<!-- <view class="txt">教师简介：</view>
+		<view class="bg-white">
+		  <l-textarea :value="data.resume" disabled placeholder="输入点什么..." readonly="readonly" />
+		</view> -->
+		<view class="txt">教师简介：</view>
+		<view class="remarks">
+		  <!-- <l-textarea class="remarks" title="课程简介" :value="data.Introduction" placeholder="输入点什么..." readonly="readonly" /> -->
+		   <textarea disabled auto-height='true' :value="data.resume" />
+		</view>
+		<l-input title="教室名称" placeholder="请填写教室名称" :value="data.ClassRoomName" disabled right />
+		<!-- <l-input title="姓名" placeholder="请填写姓名" :value="data.AcademicYearNo" disabled right /> -->
+		<l-input title="人数上限" placeholder="请填写人数上限" :value="data.StuNumMax" disabled right />
+		<l-input title="已报名人数" placeholder="请填写已报名人数" :value="data.StuNum" disabled right />
+		<view class="btn" @click="fromBtn">报名</view>
+	</view>
+</template>
+
+<script>
+export default{
+	data() {
+		return {
+			weekChina: ["一", "二", "三", "四", "五", "六", "日"],
+			keyValue: '',
+			data: {}
+		}
+	},
+	methods:{
+		init() {
+			this.keyValue = this.GET_PARAM(); //获取页面传递参数
+			console.log(this.keyValue);
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/form', _this.keyValue, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				_this.data = res.JournalReceive;
+			});
+		},
+		fromBtn() {
+			var _postData = {}
+			let _this = this;
+			let user = this.GET_GLOBAL('loginUser');;
+			_postData.keyValue = this.keyValue;
+			_postData.StuNo = user.account;
+			_this.LOADING('提交数据中…');
+			_this.HTTP_POST('learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/SignInPre', _postData, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				if(res){
+					this.TOAST('提交成功');
+					this.EMIT('OpenLessonPlanOfElectiveStudentPre')
+					this.NAV_BACK()
+				}
+			});
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+.txt{
+	line-height: 24px;
+	font-size: 15px;
+	background-color: #fff;
+	padding: 10px 0 10px 15px;
+}
+.page{
+	background-color: #fff;
+	padding-bottom: 1px;
+}
+/deep/ .cu-form-group uni-textarea{
+	height: auto;
+}
+.remarks{
+	    border-bottom: 0.5px solid #eee;
+		padding-bottom: 10px;
+}
+.remarks textarea{
+	width: 100%;
+	padding: 0 15px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/list.vue
new file mode 100644
index 000000000..8459c70f7
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/list.vue	
@@ -0,0 +1,238 @@
+<template>
+	<view class="page">
+		<view class="mainpage" :class="sideOpen ? 'show' : ''" style="padding-top: 40px;">
+			<!-- <l-customlist-banner></l-customlist-banner> -->
+			<view class="records">共 {{ records }} 条数据</view>
+			<l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="data">
+				<l-customlist :tips="loadState" showTips>
+					<view class="pageBox customlist-item" showDelete="true" v-for="(item, ind) in data" :key="item.MakeDate" @click="tapClick(item)">
+						<view class="">
+							<text>学年:</text>
+							{{ item.AcademicYearNo }}
+						</view>
+						<view class="">
+							<text>学期:</text>
+							{{ item.Semester }}
+						</view>
+						<view class="">
+							<text>课程名称:</text>
+							{{ item.LessonName }}
+						</view>
+						<view class="">
+							<text>上课节次:</text>
+							{{ jieci(item.LessonSection) }}
+						</view>
+						<view class="">
+							<text>上课时间:</text>
+							{{ item.LessonTime }}
+						</view>
+						<view class="">
+							<text>学分:</text>
+							{{ item.StudyScore }}
+						</view>
+						<view class="">
+							<text>教师姓名:</text>
+							{{ item.EmpName }}
+						</view>
+						<view class="">
+							<text>教室名称:</text>
+							{{ item.ClassRoomNo }}
+						</view>
+						<view class="">
+							<text>人数上限:</text>
+							{{ item.StuNumMax }}
+						</view>
+						<view class="">
+							<text>已报名人数:</text>
+							{{ item.StuNumOfApplyPre }}
+						</view>
+						<view class="pageType">{{ typePd(item.StatusPre) }}</view>
+						<view class="delbtn" @click.stop="delTap(item)">取消报名</view>
+					</view>
+				</l-customlist>
+			</l-scroll-list>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			weekChina: ['一', '二', '三', '四', '五', '六', '日'],
+			user: null,
+			data: [],
+			total: 1,
+			records: 0,
+			ready: false,
+			page: 1,
+			rows: 10,
+			multipleData: null,
+			sideOpen: false,
+			loadState: '向下翻以加载更多'
+		};
+	},
+	onUnload() {
+		this.OFF('OpenLessonPlanOfElectiveStudentPre');
+	},
+	methods: {
+		init() {
+			this.ON('OpenLessonPlanOfElectiveStudentPre', this.refreshList);
+			// 拉取加载列表和数据源
+			Promise.all([() => {}]);
+			var _this = this;
+			this.user = this.GET_GLOBAL('loginUser');
+			this.fetchList();
+			this.ready = true;
+		},
+		// 拉取列表
+		async fetchList() {
+			if (this.page > this.total) {
+				return;
+			}
+			let _this = this;
+			let _postParam = {
+				pagination: {
+					rows: _this.rows,
+					page: _this.page,
+					sidx: 'LessonNo',
+					sord: 'asc'
+				},
+				queryJson: '{}'
+			};
+			if (true) {
+				_postParam.queryJson = JSON.stringify({
+					StuNo: _this.user.account,
+					StuMajorNo: _this.user.majorno,
+					StuGrade: _this.user.grade
+				});
+			}
+			_this.LOADING('加载数据中…')
+			_this.HTTP_GET('learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/pagelist', _postParam, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				// console.log(res);
+				this.data = this.data.concat(res.rows);
+				_this.total = res.total;
+				_this.records = res.records;
+				this.page = res.page + 1;
+				this.loadState = res.page >= res.total ? '已加载所有项目' : '向下翻以加载更多';
+				// console.log(_this.data);
+			});
+		},
+		// 列表下拉
+		pullDown() {
+			this.refreshList().then(() => {
+				this.$refs.data.stopPullDown();
+			});
+		},
+		async refreshList() {
+			this.page = 1;
+			this.total = 1;
+			this.data = [];
+
+			this.fetchList();
+		},
+		tapClick(data) {
+			this.NAV_TO('./from', data.Id, true);
+		},
+		delTap (item) {
+			// console.log(item)
+			let _this = this;
+			this.CONFIRM('数字化校园提示', '确定要取消报名吗？', true).then( res => {
+				if(res){
+					let _postData = {
+						keyValue: item.Id,
+						StuNo: _this.user.account
+					}
+					_this.LOADING('正在取消报名…')
+					console.log(123);
+					_this.HTTP_POST(
+					  'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/CancelPre',
+					  _postData,
+					  '加载数据时出错'
+					).then( (data) => { 
+						_this.HIDE_LOADING()
+						console.log(data)
+						if (data) {// 成功
+						    _this.TOAST('取消报名成功！');
+							this.refreshList()
+						    // item.pageType = 
+						}
+					})
+				}
+			})
+		}
+	},
+	computed: {
+		jieci() {
+			return str => {
+				let ls = '';
+				if (str.indexOf(',') == -1) ls = '星期' + this.weekChina[str.slice(0, 1) - 1] + '第' + str.slice(1) + '节';
+				else ls = '星期' + this.weekChina[str.slice(0, 1) - 1] + '第' + str.slice(1, 2) + '、' + str.slice(4) + '节';
+
+				return ls;
+			};
+		},
+		typePd() {
+			return num => {
+				let txt = '';
+				if (num == 1) {
+					txt = '审核中';
+				} else if (num == 2) {
+					txt = '报名成功';
+				} else if (num == 3) {
+					txt = '报名失败';
+				} else {
+					txt = '未报名';
+				}
+				return txt;
+			};
+		}
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/common/css/sidepage.less';
+@import '~@/common/css/customlist.less';
+.page {
+	background-color: #fff;
+}
+.page-content {
+	margin-top: 39px;
+}
+.records {
+	color: #8f8f94;
+	background: #ffffff;
+	padding: 10px 12px;
+	width: 100%;
+	vertical-align: middle;
+	border-bottom: 0.5px solid #ddd;
+	position: fixed;
+	top: var(--window-top);
+	z-index: 1024;
+	border-bottom: 0.5px solid #ddd;
+	height: 40px;
+	width: 100%;
+	box-shadow: 0 0.5px 3px rgba(0, 0, 0, 0.1);
+	// background: #f1f1f1;
+}
+.pageBox {
+	// margin-top: 34px;
+	padding: 5px 15px;
+	line-height: 24px;
+	border-bottom: 5px solid #f5f5f5;
+}
+.delbtn {
+	position: absolute;
+	right: 15px;
+	bottom: 7px;
+	padding: 3px 10px;
+	background: #dd524d;
+	color: #fff;
+	border-radius: 3px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentSelected/from.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentSelected/from.vue
new file mode 100644
index 000000000..ec6324fc8
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentSelected/from.vue	
@@ -0,0 +1,83 @@
+<template>
+	<view class="page">
+		<l-input title="学年" placeholder="请填写学年" :value="data.AcademicYearNo" disabled right />
+		<l-input title="学期" placeholder="请填写学期" :value="data.Semester" disabled right />
+		<l-input title="课程名称" placeholder="请填写课程名称" :value="data.LessonName" disabled right />
+		<view class="txt">课程简介：</view>
+		<view class="remarks">
+		  <!-- <l-textarea class="remarks" title="课程简介" :value="data.Introduction" placeholder="输入点什么..." readonly="readonly" /> -->
+		   <textarea disabled auto-height='true' :value="data.Introduction" />
+		</view>
+		<l-input title="上课节次" placeholder="请填写上课节次" :value="data.LessonSection" disabled right />
+		<l-input title="上课时间" placeholder="请填写上课时间" :value="data.LessonTime" disabled right />
+		<l-input title="学分" placeholder="请填写学分" :value="data.StudyScore" disabled right />
+		<l-input title="教师姓名" placeholder="请填写教师姓名" :value="data.EmpName" disabled right />
+		<!-- <view class="txt">教师简介：</view>
+		<view class="bg-white">
+		  <l-textarea :value="data.resume" disabled placeholder="输入点什么..." readonly="readonly" />
+		</view> -->
+		<view class="txt">教师简介：</view>
+		<view class="remarks">
+		  <!-- <l-textarea class="remarks" title="课程简介" :value="data.Introduction" placeholder="输入点什么..." readonly="readonly" /> -->
+		   <textarea disabled auto-height='true' :value="data.resume" />
+		</view>
+		<l-input title="教室名称" placeholder="请填写教室名称" :value="data.ClassRoomName" disabled right />
+		<!-- <l-input title="姓名" placeholder="请填写姓名" :value="data.AcademicYearNo" disabled right /> -->
+		<l-input title="人数上限" placeholder="请填写人数上限" :value="data.StuNumMax" disabled right />
+		<l-input title="已报名人数" placeholder="请填写已报名人数" :value="data.StuNum" disabled right />
+		<!-- <view class="btn" @click="fromBtn">报名</view> -->
+	</view>
+</template>
+
+<script>
+export default{
+	data() {
+		return {
+			weekChina: ["一", "二", "三", "四", "五", "六", "日"],
+			keyValue: '',
+			data: {}
+		}
+	},
+	methods:{
+		init() {
+			this.keyValue = this.GET_PARAM(); //获取页面传递参数
+			console.log(this.keyValue);
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/form', _this.keyValue, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				_this.data = res.JournalReceive;
+			});
+		},
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+.txt{
+	line-height: 24px;
+	font-size: 15px;
+	background-color: #fff;
+	padding: 10px 0 10px 15px;
+}
+.page{
+	background-color: #fff;
+	padding-bottom: 1px;
+}
+/deep/ .cu-form-group uni-textarea{
+	height: auto;
+}
+.remarks{
+	    border-bottom: 0.5px solid #eee;
+		padding-bottom: 10px;
+}
+.remarks textarea{
+	width: 100%;
+	padding: 0 15px;
+}
+</style>
+
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentSelected/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentSelected/list.vue
new file mode 100644
index 000000000..93722987f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentSelected/list.vue	
@@ -0,0 +1,199 @@
+<template>
+	<view class="page">
+		<view class="mainpage" :class="sideOpen ? 'show' : ''" style="padding-top: 40px;">
+			<!-- <l-customlist-banner></l-customlist-banner> -->
+			<view class="records">共 {{ records }} 条数据</view>
+			<l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="data">
+				<l-customlist :tips="loadState" showTips>
+					<view></view>
+					<view class="pageBox customlist-item" v-for="(item, ind) in data" :key="item.MakeDate" @click="tapClick(item)">
+						<view class="">
+							<text>学年:</text>
+							{{ item.AcademicYearNo }}
+						</view>
+						<view class="">
+							<text>学期:</text>
+							{{ item.Semester }}
+						</view>
+						<view class="">
+							<text>课程名称:</text>
+							{{ item.LessonName }}
+						</view>
+						<view class="">
+							<text>上课节次:</text>
+							{{ jieci(item.LessonSection) }}
+						</view>
+						<view class="">
+							<text>上课时间:</text>
+							{{ item.LessonTime }}
+						</view>
+						<view class="">
+							<text>学分:</text>
+							{{ item.StudyScore }}
+						</view>
+						<view class="">
+							<text>教师姓名:</text>
+							{{ item.EmpName }}
+						</view>
+						<view class="">
+							<text>教室名称:</text>
+							{{ item.ClassRoomNo }}
+						</view>
+						<view class="">
+							<text>人数上限:</text>
+							{{ item.StuNumMax }}
+						</view>
+						<view class="">
+							<text>已报名人数:</text>
+							{{ item.StuNumOfApplyPre }}
+						</view>
+						<view class="pageType">{{ typePd(item.Status) }}</view>
+					</view>
+				</l-customlist>
+			</l-scroll-list>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			weekChina: ['一', '二', '三', '四', '五', '六', '日'],
+			user: null,
+			data: [],
+			total: 1,
+			records: 0,
+			ready: false,
+			page: 1,
+			rows: 10,
+			multipleData: null,
+			sideOpen: false,
+			loadState: '向下翻以加载更多'
+		};
+	},
+	onUnload() {
+		this.OFF('EducationalAdministrationBookBorrow-list-change');
+	},
+	methods: {
+		init() {
+			this.ON('EducationalAdministrationBookBorrow-list-change', this.refreshList);
+			// 拉取加载列表和数据源
+			Promise.all([() => {}]);
+			var _this = this;
+			this.user = this.GET_GLOBAL('loginUser');
+			this.fetchList();
+			this.ready = true;
+		},
+		// 拉取列表
+		async fetchList() {
+			if (this.page > this.total) {
+				return;
+			}
+			let _this = this;
+			let _postParam = {
+				pagination: {
+					rows: _this.rows,
+					page: _this.page,
+					sidx: 'LessonNo',
+					sord: 'asc'
+				},
+				queryJson: '{}'
+			};
+			if (true) {
+				_postParam.queryJson = JSON.stringify({
+					StuNo: _this.user.account
+				});
+			}
+			_this.LOADING('加载数据中…')
+			_this.HTTP_GET('learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/studentpagelist', _postParam, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				// console.log(res);
+				this.data = this.data.concat(res.rows);
+				_this.total = res.total;
+				_this.records = res.records;
+				this.page = res.page + 1;
+				this.loadState = res.page >= res.total ? '已加载所有项目' : '向下翻以加载更多';
+				// console.log(_this.data);
+			});
+		},
+		// 列表下拉
+		pullDown() {
+			this.refreshList().then(() => {
+				this.$refs.data.stopPullDown();
+			});
+		},
+		async refreshList() {
+			this.page = 1;
+			this.total = 1;
+			this.data = [];
+
+			this.fetchList();
+		},
+		tapClick(data) {
+			this.NAV_TO('./from', data.OLPEId, true);
+		}
+	},
+	computed: {
+		jieci() {
+			return str => {
+				let ls = '';
+				if (str.indexOf(',') == -1) ls = '星期' + this.weekChina[str.slice(0, 1) - 1] + '第' + str.slice(1) + '节';
+				else ls = '星期' + this.weekChina[str.slice(0, 1) - 1] + '第' + str.slice(1, 2) + '、' + str.slice(4) + '节';
+
+				return ls;
+			};
+		},
+		typePd() {
+			return num => {
+				let txt = '';
+				if (num == 1) {
+					txt = '审核中';
+				} else if (num == 2) {
+					txt = '报名成功';
+				} else if (num == 3) {
+					txt = '报名失败';
+				} else {
+					txt = '未报名';
+				}
+				return txt;
+			};
+		}
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/common/css/sidepage.less';
+@import '~@/common/css/customlist.less';
+.page {
+	background-color: #fff;
+}
+.page-content {
+	margin-top: 39px;
+}
+.records {
+	color: #8f8f94;
+	background: #ffffff;
+	padding: 10px 12px;
+	width: 100%;
+	vertical-align: middle;
+	border-bottom: 0.5px solid #ddd;
+	position: fixed;
+	top: var(--window-top);
+	z-index: 1024;
+	border-bottom: 0.5px solid #ddd;
+	height: 40px;
+	width: 100%;
+	box-shadow: 0 0.5px 3px rgba(0, 0, 0, 0.1);
+}
+.pageBox {
+	padding: 5px 15px;
+	line-height: 24px;
+	border-bottom: 5px solid #f5f5f5;
+	background-color: #fff;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/R_EnterBuilding/from.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/R_EnterBuilding/from.vue
new file mode 100644
index 000000000..48d48ea8a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/R_EnterBuilding/from.vue	
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/R_EnterBuilding/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/R_EnterBuilding/list.vue
new file mode 100644
index 000000000..3ba2de9fa
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/R_EnterBuilding/list.vue	
@@ -0,0 +1,50 @@
+<template>
+	<view class=""><view class="btn" @click="tabCode">扫码</view></view>
+</template>
+
+<script>
+import scanCodeFun from '@/common/js/scanCodeFun.js';
+export default {
+	data() {
+		return {};
+	},
+	methods: {
+		init() {
+			let _this = this;
+			// 允许从相机和相册扫码
+			scanCodeFun.scanCodeFun().then(res => {
+				console.log(res);
+				if(!res) return 
+				let param = {};
+				param.keyValue = '';
+				param.strEntity = JSON.stringify({
+					SId: _this.GET_GLOBAL('loginUser').account,
+					BId: res.result
+				});
+				_this.LOADING('正在提交数据…');
+				_this.HTTP_POST('learun/EducationalAdministration/R_EnterBuilding/save', param, '加载数据时出错').then(res => {
+					_this.HIDE_LOADING();
+					console.log(res);
+					if(res){
+						_this.TOAST('扫描成功'); 
+						setTimeout(function(){
+							_this.NAV_BACK() 
+						}, 500)
+					}
+				})
+			})
+		},
+		tabCode() {
+			this.init();
+		}
+	},
+	mounted() {
+		let _this = this;
+		setTimeout(function() {
+			_this.init();
+		}, 100);
+	}
+};
+</script>
+
+<style></style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/R_EnterSchool/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/R_EnterSchool/list.vue
new file mode 100644
index 000000000..f24c9d0d2
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/R_EnterSchool/list.vue	
@@ -0,0 +1,42 @@
+<template>
+	<view class=""><view class="btn" @click="tabCode">扫码</view></view>
+</template>
+
+<script>
+import scanCodeFun from '@/common/js/scanCodeFun.js';
+export default {
+	data() {
+		return {};
+	},
+	methods: {
+		init() {
+			let _this = this;
+			// 允许从相机和相册扫码
+			scanCodeFun.scanCodeFun().then(res => {
+				//console.log(res);
+				if(!res) return
+				_this.LOADING('正在提交数据…'); 
+				_this.HTTP_GET('learun/adms/EducationalAdministration/StuInfoBasic/stuinfo', res.result, '加载数据时出错').then(res => {
+					_this.HIDE_LOADING();
+					//console.log(res);
+					if(res){
+						let url = res.HealthStatus == '0'? '../StudentQRCode/Normal/list' : res.HealthStatus == '1'? '../StudentQRCode/AbNormalWeak/list' : res.HealthStatus == '2'? '../StudentQRCode/AbNormalSerious/list' : '../StudentQRCode/Normal/list';
+						_this.NAV_TO(url, {stuNo:res.StuNo}, true);
+					}
+				})
+			})
+		},
+		tabCode() {
+			this.init();
+		}
+	},
+	mounted() {
+		let _this = this;
+		setTimeout(function() {
+			_this.init();
+		}, 100);
+	}
+};
+</script>
+
+<style></style>
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 e983e46a2..947aaa8eb 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	
@@ -1,216 +1,216 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-input 
-        @input="setValue('SYS_ReceiveMessage.SENDER', $event)"
-        :value="getValue('SYS_ReceiveMessage.SENDER')"
-        :disabled="!edit"
-        title="发件人"
-      /> 
-      <l-input 
-        @input="setValue('SYS_ReceiveMessage.TITLE', $event)"
-        :value="getValue('SYS_ReceiveMessage.TITLE')"
-        :disabled="!edit"
-        title="主题"
-      /> 
-      <l-select 
-        @input="setValue('SYS_ReceiveMessage.READFLAG', $event)"
-        :value="getValue('SYS_ReceiveMessage.READFLAG')"
-        :disabled="!edit"
-        :range="dataSource.SYS_ReceiveMessage.READFLAG"
-        title="状态"
-      /> 
-      <l-date-picker 
-        @input="setValue('SYS_ReceiveMessage.SENDTIME', $event)"
-        :value="getValue('SYS_ReceiveMessage.SENDTIME')"
-        :disabled="!edit"
-        title="收件时间"
-      /> 
-      <l-upload-file 
-        @input="setValue('SYS_ReceiveMessage.URL', $event)"
-        :value="getValue('SYS_ReceiveMessage.URL')"
-        :readonly="!edit"
-        :number="9"
-        title="附件上传"
-      /> 
-      <l-textarea 
-        @input="setValue('SYS_ReceiveMessage.CONTENTS', $event)"
-        :value="getValue('SYS_ReceiveMessage.CONTENTS')"
-        :readonly="!edit"
-        title="邮件内容"
-      /> 
-    </view> 
-  
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-input 
+        @input="setValue('SYS_ReceiveMessage.SENDER', $event)"
+        :value="getValue('SYS_ReceiveMessage.SENDER')"
+        :disabled="!edit"
+        title="发件人"
+      /> 
+      <l-input 
+        @input="setValue('SYS_ReceiveMessage.TITLE', $event)"
+        :value="getValue('SYS_ReceiveMessage.TITLE')"
+        :disabled="!edit"
+        title="主题"
+      /> 
+      <l-select 
+        @input="setValue('SYS_ReceiveMessage.READFLAG', $event)"
+        :value="getValue('SYS_ReceiveMessage.READFLAG')"
+        :disabled="!edit"
+        :range="dataSource.SYS_ReceiveMessage.READFLAG"
+        title="状态"
+      /> 
+      <l-date-picker 
+        @input="setValue('SYS_ReceiveMessage.SENDTIME', $event)"
+        :value="getValue('SYS_ReceiveMessage.SENDTIME')"
+        :disabled="!edit"
+        title="收件时间"
+      /> 
+      <l-upload-file 
+        @input="setValue('SYS_ReceiveMessage.URL', $event)"
+        :value="getValue('SYS_ReceiveMessage.URL')"
+        :readonly="!edit"
+        :number="9"
+        title="附件上传"
+      /> 
+      <l-textarea 
+        @input="setValue('SYS_ReceiveMessage.CONTENTS', $event)"
+        :value="getValue('SYS_ReceiveMessage.CONTENTS')"
+        :readonly="!edit"
+        title="邮件内容"
+      /> 
+    </view> 
+  
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-19 17:58 
- * 描  述：收件箱 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-19 17:58 
+ * 描  述：收件箱 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/SYS_ReceiveMessage/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/SYS_ReceiveMessage/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        SYS_ReceiveMessage: { 
-          SENDER: { type: 'text', title: '发件人' }, 
-          TITLE: { type: 'text', title: '主题' }, 
-          READFLAG: { type: 'select', title: '状态', dataSource: '0' }, 
-          SENDTIME: { type: 'datetime', title: '收件时间', dateformat: '0' }, 
-          URL: { type: 'upload', title: '附件上传' }, 
-          CONTENTS: { type: 'textarea', title: '邮件内容' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        SYS_ReceiveMessage: { 
-          READFLAG: [], 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/EducationalAdministration/SYS_ReceiveMessage/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/EducationalAdministration/SYS_ReceiveMessage/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationSYS_ReceiveMessage-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/EducationalAdministration/SYS_ReceiveMessage/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationSYS_ReceiveMessage-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        SYS_ReceiveMessage: { 
+          SENDER: { type: 'text', title: '发件人' }, 
+          TITLE: { type: 'text', title: '主题' }, 
+          READFLAG: { type: 'select', title: '状态', dataSource: '0' }, 
+          SENDTIME: { type: 'datetime', title: '收件时间', dateformat: '0' }, 
+          URL: { type: 'upload', title: '附件上传' }, 
+          CONTENTS: { type: 'textarea', title: '邮件内容' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        SYS_ReceiveMessage: { 
+          READFLAG: [], 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/EducationalAdministration/SYS_ReceiveMessage/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/EducationalAdministration/SYS_ReceiveMessage/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationSYS_ReceiveMessage-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/EducationalAdministration/SYS_ReceiveMessage/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationSYS_ReceiveMessage-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/single.vue
index c56731e7d..bcdee1878 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/single.vue	
@@ -1,350 +1,350 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.AcademicYearNo', $event)"
-        :value="getValue('StuAttendanceLeave.AcademicYearNo')"
-        :disabled="!edit"
-        title="学年度"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.Semester', $event)"
-        :value="getValue('StuAttendanceLeave.Semester')"
-        :disabled="!edit"
-        title="学期"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.StuNo', $event)"
-        :value="getValue('StuAttendanceLeave.StuNo')"
-        :disabled="!edit"
-        title="学号"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.StuName', $event)"
-        :value="getValue('StuAttendanceLeave.StuName')"
-        :disabled="!edit"
-        title="姓名"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.Grade', $event)"
-        :value="getValue('StuAttendanceLeave.Grade')"
-        :disabled="!edit"
-        title="年级"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.EmpNo', $event)"
-        :value="getValue('StuAttendanceLeave.EmpNo')"
-        :disabled="!edit"
-        title="教师号"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.DeptNo', $event)"
-        :value="getValue('StuAttendanceLeave.DeptNo')"
-        :disabled="!edit"
-        title="系所码"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.DeptName', $event)"
-        :value="getValue('StuAttendanceLeave.DeptName')"
-        :disabled="!edit"
-        title="系名"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.MajorNo', $event)"
-        :value="getValue('StuAttendanceLeave.MajorNo')"
-        :disabled="!edit"
-        title="专业码"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.MajorName', $event)"
-        :value="getValue('StuAttendanceLeave.MajorName')"
-        :disabled="!edit"
-        title="专业名"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.ClassNo', $event)"
-        :value="getValue('StuAttendanceLeave.ClassNo')"
-        :disabled="!edit"
-        title="所在行政班号"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.ClassName', $event)"
-        :value="getValue('StuAttendanceLeave.ClassName')"
-        :disabled="!edit"
-        title="班级名称"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.LessonNo', $event)"
-        :value="getValue('StuAttendanceLeave.LessonNo')"
-        :disabled="!edit"
-        title="课程号"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.LessonName', $event)"
-        :value="getValue('StuAttendanceLeave.LessonName')"
-        :disabled="!edit"
-        title="课程名称"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.LessonSortNo', $event)"
-        :value="getValue('StuAttendanceLeave.LessonSortNo')"
-        :disabled="!edit"
-        title="课程类别码"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.LessonSortName', $event)"
-        :value="getValue('StuAttendanceLeave.LessonSortName')"
-        :disabled="!edit"
-        title="课程类别"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.LessonDate', $event)"
-        :value="getValue('StuAttendanceLeave.LessonDate')"
-        :disabled="!edit"
-        title="原上课日期"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.LessonTime', $event)"
-        :value="getValue('StuAttendanceLeave.LessonTime')"
-        :disabled="!edit"
-        title="上课时间"
-      /> 
-      <l-input 
-        @input="setValue('StuAttendanceLeave.PlanWeek', $event)"
-        :value="getValue('StuAttendanceLeave.PlanWeek')"
-        :disabled="!edit"
-        title="教学周次"
-      /> 
-      <l-select 
-        @input="setValue('StuAttendanceLeave.LeaveType', $event)"
-        :value="getValue('StuAttendanceLeave.LeaveType')"
-        :disabled="!edit"
-        :range="dataSource.StuAttendanceLeave.LeaveType"
-        title="请假类型"
-      /> 
-      <l-textarea 
-        @input="setValue('StuAttendanceLeave.Remark', $event)"
-        :value="getValue('StuAttendanceLeave.Remark')"
-        :readonly="!edit"
-        title="备注"
-      /> 
-      <l-select 
-        @input="setValue('StuAttendanceLeave.IsCheck', $event)"
-        :value="getValue('StuAttendanceLeave.IsCheck')"
-        :disabled="!edit"
-        :range="dataSource.StuAttendanceLeave.IsCheck"
-        title="下拉框"
-      /> 
-      <l-textarea 
-        @input="setValue('StuAttendanceLeave.TecRemark', $event)"
-        :value="getValue('StuAttendanceLeave.TecRemark')"
-        :readonly="!edit"
-        title="备注"
-      /> 
-    </view> 
-  
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> 
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.AcademicYearNo', $event)"
+        :value="getValue('StuAttendanceLeave.AcademicYearNo')"
+        :disabled="!edit"
+        title="学年度"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.Semester', $event)"
+        :value="getValue('StuAttendanceLeave.Semester')"
+        :disabled="!edit"
+        title="学期"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.StuNo', $event)"
+        :value="getValue('StuAttendanceLeave.StuNo')"
+        :disabled="!edit"
+        title="学号"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.StuName', $event)"
+        :value="getValue('StuAttendanceLeave.StuName')"
+        :disabled="!edit"
+        title="姓名"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.Grade', $event)"
+        :value="getValue('StuAttendanceLeave.Grade')"
+        :disabled="!edit"
+        title="年级"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.EmpNo', $event)"
+        :value="getValue('StuAttendanceLeave.EmpNo')"
+        :disabled="!edit"
+        title="教师号"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.DeptNo', $event)"
+        :value="getValue('StuAttendanceLeave.DeptNo')"
+        :disabled="!edit"
+        title="系所码"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.DeptName', $event)"
+        :value="getValue('StuAttendanceLeave.DeptName')"
+        :disabled="!edit"
+        title="系名"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.MajorNo', $event)"
+        :value="getValue('StuAttendanceLeave.MajorNo')"
+        :disabled="!edit"
+        title="专业码"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.MajorName', $event)"
+        :value="getValue('StuAttendanceLeave.MajorName')"
+        :disabled="!edit"
+        title="专业名"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.ClassNo', $event)"
+        :value="getValue('StuAttendanceLeave.ClassNo')"
+        :disabled="!edit"
+        title="所在行政班号"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.ClassName', $event)"
+        :value="getValue('StuAttendanceLeave.ClassName')"
+        :disabled="!edit"
+        title="班级名称"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.LessonNo', $event)"
+        :value="getValue('StuAttendanceLeave.LessonNo')"
+        :disabled="!edit"
+        title="课程号"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.LessonName', $event)"
+        :value="getValue('StuAttendanceLeave.LessonName')"
+        :disabled="!edit"
+        title="课程名称"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.LessonSortNo', $event)"
+        :value="getValue('StuAttendanceLeave.LessonSortNo')"
+        :disabled="!edit"
+        title="课程类别码"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.LessonSortName', $event)"
+        :value="getValue('StuAttendanceLeave.LessonSortName')"
+        :disabled="!edit"
+        title="课程类别"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.LessonDate', $event)"
+        :value="getValue('StuAttendanceLeave.LessonDate')"
+        :disabled="!edit"
+        title="原上课日期"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.LessonTime', $event)"
+        :value="getValue('StuAttendanceLeave.LessonTime')"
+        :disabled="!edit"
+        title="上课时间"
+      /> 
+      <l-input 
+        @input="setValue('StuAttendanceLeave.PlanWeek', $event)"
+        :value="getValue('StuAttendanceLeave.PlanWeek')"
+        :disabled="!edit"
+        title="教学周次"
+      /> 
+      <l-select 
+        @input="setValue('StuAttendanceLeave.LeaveType', $event)"
+        :value="getValue('StuAttendanceLeave.LeaveType')"
+        :disabled="!edit"
+        :range="dataSource.StuAttendanceLeave.LeaveType"
+        title="请假类型"
+      /> 
+      <l-textarea 
+        @input="setValue('StuAttendanceLeave.Remark', $event)"
+        :value="getValue('StuAttendanceLeave.Remark')"
+        :readonly="!edit"
+        title="备注"
+      /> 
+      <l-select 
+        @input="setValue('StuAttendanceLeave.IsCheck', $event)"
+        :value="getValue('StuAttendanceLeave.IsCheck')"
+        :disabled="!edit"
+        :range="dataSource.StuAttendanceLeave.IsCheck"
+        title="下拉框"
+      /> 
+      <l-textarea 
+        @input="setValue('StuAttendanceLeave.TecRemark', $event)"
+        :value="getValue('StuAttendanceLeave.TecRemark')"
+        :readonly="!edit"
+        title="备注"
+      /> 
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-20 15:34 
- * 描  述：aaa 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-20 15:34 
+ * 描  述：aaa 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/StuAttendanceLeave/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/StuAttendanceLeave/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        StuAttendanceLeave: { 
-          AcademicYearNo: { type: 'text', title: '学年度' }, 
-          Semester: { type: 'text', title: '学期' }, 
-          StuNo: { type: 'text', title: '学号' }, 
-          StuName: { type: 'text', title: '姓名' }, 
-          Grade: { type: 'text', title: '年级' }, 
-          EmpNo: { type: 'text', title: '教师号' }, 
-          DeptNo: { type: 'text', title: '系所码' }, 
-          DeptName: { type: 'text', title: '系名' }, 
-          MajorNo: { type: 'text', title: '专业码' }, 
-          MajorName: { type: 'text', title: '专业名' }, 
-          ClassNo: { type: 'text', title: '所在行政班号' }, 
-          ClassName: { type: 'text', title: '班级名称' }, 
-          LessonNo: { type: 'text', title: '课程号' }, 
-          LessonName: { type: 'text', title: '课程名称' }, 
-          LessonSortNo: { type: 'text', title: '课程类别码' }, 
-          LessonSortName: { type: 'text', title: '课程类别' }, 
-          LessonDate: { type: 'text', title: '原上课日期' }, 
-          LessonTime: { type: 'text', title: '上课时间' }, 
-          PlanWeek: { type: 'text', title: '教学周次' }, 
-          LeaveType: { type: 'select', title: '请假类型', itemCode: 'LeaveType', dataSource: '0' }, 
-          Remark: { type: 'textarea', title: '备注' }, 
-          IsCheck: { type: 'select', title: '下拉框', itemCode: 'LeaveCheck', dataSource: '0' }, 
-          TecRemark: { type: 'textarea', title: '备注' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        StuAttendanceLeave: { 
-          LeaveType: Object.values(this.GET_GLOBAL('dataDictionary').LeaveType).map(t => ({ value: t.value, text: t.text })), 
-          IsCheck: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({ value: t.value, text: t.text })), 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/EducationalAdministration/StuAttendanceLeave/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/EducationalAdministration/StuAttendanceLeave/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationStuAttendanceLeave-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/EducationalAdministration/StuAttendanceLeave/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationStuAttendanceLeave-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        StuAttendanceLeave: { 
+          AcademicYearNo: { type: 'text', title: '学年度' }, 
+          Semester: { type: 'text', title: '学期' }, 
+          StuNo: { type: 'text', title: '学号' }, 
+          StuName: { type: 'text', title: '姓名' }, 
+          Grade: { type: 'text', title: '年级' }, 
+          EmpNo: { type: 'text', title: '教师号' }, 
+          DeptNo: { type: 'text', title: '系所码' }, 
+          DeptName: { type: 'text', title: '系名' }, 
+          MajorNo: { type: 'text', title: '专业码' }, 
+          MajorName: { type: 'text', title: '专业名' }, 
+          ClassNo: { type: 'text', title: '所在行政班号' }, 
+          ClassName: { type: 'text', title: '班级名称' }, 
+          LessonNo: { type: 'text', title: '课程号' }, 
+          LessonName: { type: 'text', title: '课程名称' }, 
+          LessonSortNo: { type: 'text', title: '课程类别码' }, 
+          LessonSortName: { type: 'text', title: '课程类别' }, 
+          LessonDate: { type: 'text', title: '原上课日期' }, 
+          LessonTime: { type: 'text', title: '上课时间' }, 
+          PlanWeek: { type: 'text', title: '教学周次' }, 
+          LeaveType: { type: 'select', title: '请假类型', itemCode: 'LeaveType', dataSource: '0' }, 
+          Remark: { type: 'textarea', title: '备注' }, 
+          IsCheck: { type: 'select', title: '下拉框', itemCode: 'LeaveCheck', dataSource: '0' }, 
+          TecRemark: { type: 'textarea', title: '备注' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        StuAttendanceLeave: { 
+          LeaveType: Object.values(this.GET_GLOBAL('dataDictionary').LeaveType).map(t => ({ value: t.value, text: t.text })), 
+          IsCheck: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({ value: t.value, text: t.text })), 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/EducationalAdministration/StuAttendanceLeave/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/EducationalAdministration/StuAttendanceLeave/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationStuAttendanceLeave-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/EducationalAdministration/StuAttendanceLeave/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationStuAttendanceLeave-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuConsumption/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuConsumption/list.vue
index f85da7b2f..dd2e7ae08 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuConsumption/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuConsumption/list.vue	
@@ -1,380 +1,380 @@
 <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.SID"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">记录序号：</text> 
-              {{ displayListItem(item, 'ID') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">企业代码：</text> 
-              {{ displayListItem(item, 'ECODE') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">钱包类型：</text> 
-              {{ displayListItem(item, 'NOTECASE') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">一卡通账号：</text> 
-              {{ displayListItem(item, 'CUSTOMERID') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">学工号：</text> 
-              {{ displayListItem(item, 'OUTID') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">持卡序号：</text> 
-              {{ displayListItem(item, 'CARDSN') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">消费卡操作计数：</text> 
-              {{ displayListItem(item, 'OPCOUNT') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">操作时间：</text> 
-              {{ displayListItem(item, 'OPDT') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">余额：</text> 
-              {{ displayListItem(item, 'ODDFARE') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">操作额：</text> 
-              {{ displayListItem(item, 'OPFARE') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">管理费：</text> 
-              {{ displayListItem(item, 'MNGFARE') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">科目代码：</text> 
-              {{ displayListItem(item, 'ACCCODE') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">科目描述：</text> 
-              {{ displayListItem(item, 'DSCRP') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">终端编号：</text> 
-              {{ displayListItem(item, 'TERMID') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">终端记录流水号：</text> 
-              {{ displayListItem(item, 'RECNO') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">上传时间：</text> 
-              {{ displayListItem(item, 'UPLOADDATE') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">SAM卡号：</text> 
-              {{ displayListItem(item, 'SAMCARDNO') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">SAM卡交易流水号：</text> 
-              {{ displayListItem(item, 'SAMTRADENO') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">交易卡类型：</text> 
-              {{ displayListItem(item, 'TRADECARDTYPE') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">验证码：</text> 
-              {{ displayListItem(item, 'TAC') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">卡应用序列号：</text> 
-              {{ displayListItem(item, 'ASN') }} 
-            </view> 
-  
-  
-            <l-customlist-action showEdit @edit="action('edit', item.SID)" showDelete @delete="action('delete', item.SID)" @view="action('view', item.SID)" /> 
-          </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-input 
-          v-model="queryData.OUTID"
-          @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> 
+  <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.SID"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">记录序号：</text> 
+              {{ displayListItem(item, 'ID') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">企业代码：</text> 
+              {{ displayListItem(item, 'ECODE') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">钱包类型：</text> 
+              {{ displayListItem(item, 'NOTECASE') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">一卡通账号：</text> 
+              {{ displayListItem(item, 'CUSTOMERID') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">学工号：</text> 
+              {{ displayListItem(item, 'OUTID') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">持卡序号：</text> 
+              {{ displayListItem(item, 'CARDSN') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">消费卡操作计数：</text> 
+              {{ displayListItem(item, 'OPCOUNT') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">操作时间：</text> 
+              {{ displayListItem(item, 'OPDT') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">余额：</text> 
+              {{ displayListItem(item, 'ODDFARE') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">操作额：</text> 
+              {{ displayListItem(item, 'OPFARE') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">管理费：</text> 
+              {{ displayListItem(item, 'MNGFARE') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">科目代码：</text> 
+              {{ displayListItem(item, 'ACCCODE') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">科目描述：</text> 
+              {{ displayListItem(item, 'DSCRP') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">终端编号：</text> 
+              {{ displayListItem(item, 'TERMID') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">终端记录流水号：</text> 
+              {{ displayListItem(item, 'RECNO') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">上传时间：</text> 
+              {{ displayListItem(item, 'UPLOADDATE') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">SAM卡号：</text> 
+              {{ displayListItem(item, 'SAMCARDNO') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">SAM卡交易流水号：</text> 
+              {{ displayListItem(item, 'SAMTRADENO') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">交易卡类型：</text> 
+              {{ displayListItem(item, 'TRADECARDTYPE') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">验证码：</text> 
+              {{ displayListItem(item, 'TAC') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">卡应用序列号：</text> 
+              {{ displayListItem(item, 'ASN') }} 
+            </view> 
+  
+  
+            <l-customlist-action showEdit @edit="action('edit', item.SID)" showDelete @delete="action('delete', item.SID)" @view="action('view', item.SID)" /> 
+          </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-input 
+          v-model="queryData.OUTID"
+          @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-16 15:16 
- * 描  述：学生消费信息 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-16 15:16 
+ * 描  述：学生消费信息 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/StuConsumption/list", "style": { "navigationBarTitleText": "表单列表页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/StuConsumption/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: { 
-        ID: { type: 'text' }, 
-        ECODE: { type: 'text' }, 
-        NOTECASE: { type: 'text' }, 
-        CUSTOMERID: { type: 'text' }, 
-        OUTID: { type: 'text' }, 
-        CARDSN: { type: 'text' }, 
-        OPCOUNT: { type: 'text' }, 
-        OPDT: { type: 'datetime', dateformat: '0' }, 
-        ODDFARE: { type: 'text' }, 
-        OPFARE: { type: 'text' }, 
-        MNGFARE: { type: 'text' }, 
-        ACCCODE: { type: 'text' }, 
-        DSCRP: { type: 'text' }, 
-        TERMID: { type: 'text' }, 
-        RECNO: { type: 'text' }, 
-        UPLOADDATE: { type: 'text' }, 
-        SAMCARDNO: { type: 'text' }, 
-        SAMTRADENO: { type: 'text' }, 
-        TRADECARDTYPE: { type: 'text' }, 
-        TAC: { type: 'text' }, 
-        ASN: { type: 'text' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-        OUTID: '', 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-      }, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('EducationalAdministrationStuConsumption-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('EducationalAdministrationStuConsumption-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/EducationalAdministration/StuConsumption/pagelist', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'SID', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    pullDown() { 
-      this.refreshList().then(() => { 
-        this.$refs.list.stopPullDown() 
-      }) 
-    }, 
-  
-    // 设置搜索条件 
-    async searchChange() { 
-      const result = {} 
-  
-      // 将其他查询项添加到查询 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.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('/EducationalAdministration/StuConsumption/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 
-      } 
-    } 
-  
-  } 
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        ID: { type: 'text' }, 
+        ECODE: { type: 'text' }, 
+        NOTECASE: { type: 'text' }, 
+        CUSTOMERID: { type: 'text' }, 
+        OUTID: { type: 'text' }, 
+        CARDSN: { type: 'text' }, 
+        OPCOUNT: { type: 'text' }, 
+        OPDT: { type: 'datetime', dateformat: '0' }, 
+        ODDFARE: { type: 'text' }, 
+        OPFARE: { type: 'text' }, 
+        MNGFARE: { type: 'text' }, 
+        ACCCODE: { type: 'text' }, 
+        DSCRP: { type: 'text' }, 
+        TERMID: { type: 'text' }, 
+        RECNO: { type: 'text' }, 
+        UPLOADDATE: { type: 'text' }, 
+        SAMCARDNO: { type: 'text' }, 
+        SAMTRADENO: { type: 'text' }, 
+        TRADECARDTYPE: { type: 'text' }, 
+        TAC: { type: 'text' }, 
+        ASN: { type: 'text' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+        OUTID: '', 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+      }, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('EducationalAdministrationStuConsumption-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('EducationalAdministrationStuConsumption-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/EducationalAdministration/StuConsumption/pagelist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'SID', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    pullDown() { 
+      this.refreshList().then(() => { 
+        this.$refs.list.stopPullDown() 
+      }) 
+    }, 
+  
+    // 设置搜索条件 
+    async searchChange() { 
+      const result = {} 
+  
+      // 将其他查询项添加到查询 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.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/StuConsumption/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'; 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuConsumption/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuConsumption/single.vue
index 5ca101fe3..062ef3c7a 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuConsumption/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuConsumption/single.vue	
@@ -1,332 +1,332 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-input 
-        @input="setValue('StuConsumption.ID', $event)"
-        :value="getValue('StuConsumption.ID')"
-        :disabled="!edit"
-        title="记录序号"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.ECODE', $event)"
-        :value="getValue('StuConsumption.ECODE')"
-        :disabled="!edit"
-        title="企业代码"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.NOTECASE', $event)"
-        :value="getValue('StuConsumption.NOTECASE')"
-        :disabled="!edit"
-        title="钱包类型"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.CUSTOMERID', $event)"
-        :value="getValue('StuConsumption.CUSTOMERID')"
-        :disabled="!edit"
-        title="一卡通账号"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.OUTID', $event)"
-        :value="getValue('StuConsumption.OUTID')"
-        :disabled="!edit"
-        title="学工号"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.CARDSN', $event)"
-        :value="getValue('StuConsumption.CARDSN')"
-        :disabled="!edit"
-        title="持卡序号"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.OPCOUNT', $event)"
-        :value="getValue('StuConsumption.OPCOUNT')"
-        :disabled="!edit"
-        title="消费卡操作计数"
-      /> 
-      <l-date-picker 
-        @input="setValue('StuConsumption.OPDT', $event)"
-        :value="getValue('StuConsumption.OPDT')"
-        :disabled="!edit"
-        title="操作时间"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.ODDFARE', $event)"
-        :value="getValue('StuConsumption.ODDFARE')"
-        :disabled="!edit"
-        title="余额"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.OPFARE', $event)"
-        :value="getValue('StuConsumption.OPFARE')"
-        :disabled="!edit"
-        title="操作额"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.MNGFARE', $event)"
-        :value="getValue('StuConsumption.MNGFARE')"
-        :disabled="!edit"
-        title="管理费"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.ACCCODE', $event)"
-        :value="getValue('StuConsumption.ACCCODE')"
-        :disabled="!edit"
-        title="科目代码"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.DSCRP', $event)"
-        :value="getValue('StuConsumption.DSCRP')"
-        :disabled="!edit"
-        title="科目描述"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.TERMID', $event)"
-        :value="getValue('StuConsumption.TERMID')"
-        :disabled="!edit"
-        title="终端编号"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.RECNO', $event)"
-        :value="getValue('StuConsumption.RECNO')"
-        :disabled="!edit"
-        title="终端记录流水号"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.UPLOADDATE', $event)"
-        :value="getValue('StuConsumption.UPLOADDATE')"
-        :disabled="!edit"
-        title="上传时间"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.SAMCARDNO', $event)"
-        :value="getValue('StuConsumption.SAMCARDNO')"
-        :disabled="!edit"
-        title="SAM卡号"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.SAMTRADENO', $event)"
-        :value="getValue('StuConsumption.SAMTRADENO')"
-        :disabled="!edit"
-        title="SAM卡交易流水号"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.TRADECARDTYPE', $event)"
-        :value="getValue('StuConsumption.TRADECARDTYPE')"
-        :disabled="!edit"
-        title="交易卡类型"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.TAC', $event)"
-        :value="getValue('StuConsumption.TAC')"
-        :disabled="!edit"
-        title="验证码"
-      /> 
-      <l-input 
-        @input="setValue('StuConsumption.ASN', $event)"
-        :value="getValue('StuConsumption.ASN')"
-        :disabled="!edit"
-        title="卡应用序列号"
-      /> 
-    </view> 
-  
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> 
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-input 
+        @input="setValue('StuConsumption.ID', $event)"
+        :value="getValue('StuConsumption.ID')"
+        :disabled="!edit"
+        title="记录序号"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.ECODE', $event)"
+        :value="getValue('StuConsumption.ECODE')"
+        :disabled="!edit"
+        title="企业代码"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.NOTECASE', $event)"
+        :value="getValue('StuConsumption.NOTECASE')"
+        :disabled="!edit"
+        title="钱包类型"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.CUSTOMERID', $event)"
+        :value="getValue('StuConsumption.CUSTOMERID')"
+        :disabled="!edit"
+        title="一卡通账号"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.OUTID', $event)"
+        :value="getValue('StuConsumption.OUTID')"
+        :disabled="!edit"
+        title="学工号"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.CARDSN', $event)"
+        :value="getValue('StuConsumption.CARDSN')"
+        :disabled="!edit"
+        title="持卡序号"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.OPCOUNT', $event)"
+        :value="getValue('StuConsumption.OPCOUNT')"
+        :disabled="!edit"
+        title="消费卡操作计数"
+      /> 
+      <l-date-picker 
+        @input="setValue('StuConsumption.OPDT', $event)"
+        :value="getValue('StuConsumption.OPDT')"
+        :disabled="!edit"
+        title="操作时间"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.ODDFARE', $event)"
+        :value="getValue('StuConsumption.ODDFARE')"
+        :disabled="!edit"
+        title="余额"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.OPFARE', $event)"
+        :value="getValue('StuConsumption.OPFARE')"
+        :disabled="!edit"
+        title="操作额"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.MNGFARE', $event)"
+        :value="getValue('StuConsumption.MNGFARE')"
+        :disabled="!edit"
+        title="管理费"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.ACCCODE', $event)"
+        :value="getValue('StuConsumption.ACCCODE')"
+        :disabled="!edit"
+        title="科目代码"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.DSCRP', $event)"
+        :value="getValue('StuConsumption.DSCRP')"
+        :disabled="!edit"
+        title="科目描述"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.TERMID', $event)"
+        :value="getValue('StuConsumption.TERMID')"
+        :disabled="!edit"
+        title="终端编号"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.RECNO', $event)"
+        :value="getValue('StuConsumption.RECNO')"
+        :disabled="!edit"
+        title="终端记录流水号"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.UPLOADDATE', $event)"
+        :value="getValue('StuConsumption.UPLOADDATE')"
+        :disabled="!edit"
+        title="上传时间"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.SAMCARDNO', $event)"
+        :value="getValue('StuConsumption.SAMCARDNO')"
+        :disabled="!edit"
+        title="SAM卡号"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.SAMTRADENO', $event)"
+        :value="getValue('StuConsumption.SAMTRADENO')"
+        :disabled="!edit"
+        title="SAM卡交易流水号"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.TRADECARDTYPE', $event)"
+        :value="getValue('StuConsumption.TRADECARDTYPE')"
+        :disabled="!edit"
+        title="交易卡类型"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.TAC', $event)"
+        :value="getValue('StuConsumption.TAC')"
+        :disabled="!edit"
+        title="验证码"
+      /> 
+      <l-input 
+        @input="setValue('StuConsumption.ASN', $event)"
+        :value="getValue('StuConsumption.ASN')"
+        :disabled="!edit"
+        title="卡应用序列号"
+      /> 
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-16 15:16 
- * 描  述：学生消费信息 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-16 15:16 
+ * 描  述：学生消费信息 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/StuConsumption/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/StuConsumption/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        StuConsumption: { 
-          ID: { type: 'text', title: '记录序号' }, 
-          ECODE: { type: 'text', title: '企业代码' }, 
-          NOTECASE: { type: 'text', title: '钱包类型' }, 
-          CUSTOMERID: { type: 'text', title: '一卡通账号' }, 
-          OUTID: { type: 'text', title: '学工号' }, 
-          CARDSN: { type: 'text', title: '持卡序号' }, 
-          OPCOUNT: { type: 'text', title: '消费卡操作计数' }, 
-          OPDT: { type: 'datetime', title: '操作时间', dateformat: '0' }, 
-          ODDFARE: { type: 'text', title: '余额' }, 
-          OPFARE: { type: 'text', title: '操作额' }, 
-          MNGFARE: { type: 'text', title: '管理费' }, 
-          ACCCODE: { type: 'text', title: '科目代码' }, 
-          DSCRP: { type: 'text', title: '科目描述' }, 
-          TERMID: { type: 'text', title: '终端编号' }, 
-          RECNO: { type: 'text', title: '终端记录流水号' }, 
-          UPLOADDATE: { type: 'text', title: '上传时间' }, 
-          SAMCARDNO: { type: 'text', title: 'SAM卡号' }, 
-          SAMTRADENO: { type: 'text', title: 'SAM卡交易流水号' }, 
-          TRADECARDTYPE: { type: 'text', title: '交易卡类型' }, 
-          TAC: { type: 'text', title: '验证码' }, 
-          ASN: { type: 'text', title: '卡应用序列号' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        StuConsumption: { 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/EducationalAdministration/StuConsumption/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/EducationalAdministration/StuConsumption/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationStuConsumption-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/EducationalAdministration/StuConsumption/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationStuConsumption-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        StuConsumption: { 
+          ID: { type: 'text', title: '记录序号' }, 
+          ECODE: { type: 'text', title: '企业代码' }, 
+          NOTECASE: { type: 'text', title: '钱包类型' }, 
+          CUSTOMERID: { type: 'text', title: '一卡通账号' }, 
+          OUTID: { type: 'text', title: '学工号' }, 
+          CARDSN: { type: 'text', title: '持卡序号' }, 
+          OPCOUNT: { type: 'text', title: '消费卡操作计数' }, 
+          OPDT: { type: 'datetime', title: '操作时间', dateformat: '0' }, 
+          ODDFARE: { type: 'text', title: '余额' }, 
+          OPFARE: { type: 'text', title: '操作额' }, 
+          MNGFARE: { type: 'text', title: '管理费' }, 
+          ACCCODE: { type: 'text', title: '科目代码' }, 
+          DSCRP: { type: 'text', title: '科目描述' }, 
+          TERMID: { type: 'text', title: '终端编号' }, 
+          RECNO: { type: 'text', title: '终端记录流水号' }, 
+          UPLOADDATE: { type: 'text', title: '上传时间' }, 
+          SAMCARDNO: { type: 'text', title: 'SAM卡号' }, 
+          SAMTRADENO: { type: 'text', title: 'SAM卡交易流水号' }, 
+          TRADECARDTYPE: { type: 'text', title: '交易卡类型' }, 
+          TAC: { type: 'text', title: '验证码' }, 
+          ASN: { type: 'text', title: '卡应用序列号' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        StuConsumption: { 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/EducationalAdministration/StuConsumption/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/EducationalAdministration/StuConsumption/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationStuConsumption-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/EducationalAdministration/StuConsumption/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationStuConsumption-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic/list.vue
index f3ce691be..644f20222 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic/list.vue	
@@ -1,367 +1,370 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-date-picker 
-        @input="setValue('StuInfoBasic.Birthday', $event)"
-        :value="getValue('StuInfoBasic.Birthday')"
-        :disabled="!edit"
-        title="出生日期"
-      /> 
-      <l-select 
-        @input="setValue('StuInfoBasic.PartyFaceNo', $event)"
-        :value="getValue('StuInfoBasic.PartyFaceNo')"
-        :disabled="!edit"
-        :range="dataSource.StuInfoBasic.PartyFaceNo"
-        title="政治面貌"
-      /> 
-      <l-select 
-        @input="setValue('StuInfoBasic.NationalityNo', $event)"
-        :value="getValue('StuInfoBasic.NationalityNo')"
-        :disabled="!edit"
-        :range="dataSource.StuInfoBasic.NationalityNo"
-        title="民族"
-      /> 
-      <l-select 
-        @input="setValue('StuInfoBasic.ResidenceNo', $event)"
-        :value="getValue('StuInfoBasic.ResidenceNo')"
-        :disabled="!edit"
-        :range="dataSource.StuInfoBasic.ResidenceNo"
-        title="户口分类"
-      /> 
-      <l-upload-file
-        @input="setValue('StuInfoBasic.Photo', $event)"
-        :value="getValue('StuInfoBasic.Photo')"
-        :readonly="!edit"
-        :number="3"
-        title="照片"
-      /> 
-      <l-input 
-        @input="setValue('StuInfoBasic.mobile', $event)"
-        :value="getValue('StuInfoBasic.mobile')"
-        :disabled="!edit"
-        title="联系电话"
-      /> 
-      <l-input 
-        @input="setValue('StuInfoBasic.EMail', $event)"
-        :value="getValue('StuInfoBasic.EMail')"
-        :disabled="!edit"
-        title="邮箱"
-      /> 
-      <l-input 
-        @input="setValue('StuInfoBasic.MailAddress', $event)"
-        :value="getValue('StuInfoBasic.MailAddress')"
-        :disabled="!edit"
-        title="通信地址"
-      /> 
-      <l-input 
-        @input="setValue('StuInfoBasic.PostalCode', $event)"
-        :value="getValue('StuInfoBasic.PostalCode')"
-        :disabled="!edit"
-        title="邮政编码"
-      /> 
-      <l-input 
-        @input="setValue('StuInfoBasic.FatherUnit', $event)"
-        :value="getValue('StuInfoBasic.FatherUnit')"
-        :disabled="!edit"
-        title="户口所在地"
-      /> 
-      <l-input 
-        @input="setValue('StuInfoBasic.MatherUnit', $event)"
-        :value="getValue('StuInfoBasic.MatherUnit')"
-        :disabled="!edit"
-        title="档案所在地"
-      /> 
-      <l-input 
-        @input="setValue('StuInfoBasic.FatherName', $event)"
-        :value="getValue('StuInfoBasic.FatherName')"
-        :disabled="!edit"
-        title="父亲名字"
-      /> 
-      <l-input 
-        @input="setValue('StuInfoBasic.FatherPhone', $event)"
-        :value="getValue('StuInfoBasic.FatherPhone')"
-        :disabled="!edit"
-        title="父亲电话"
-        required 
-      /> 
-      <l-input 
-        @input="setValue('StuInfoBasic.MatherName', $event)"
-        :value="getValue('StuInfoBasic.MatherName')"
-        :disabled="!edit"
-        title="母亲名字"
-      /> 
-      <l-input 
-        @input="setValue('StuInfoBasic.MatherPhone', $event)"
-        :value="getValue('StuInfoBasic.MatherPhone')"
-        :disabled="!edit"
-        title="母亲电话"
-      /> 
-      <l-select 
-        @input="setValue('StuInfoBasic.FamilyOriginNo', $event)"
-        :value="getValue('StuInfoBasic.FamilyOriginNo')"
-        :disabled="!edit"
-        :range="dataSource.StuInfoBasic.FamilyOriginNo"
-        title="家庭出生"
-      /> 
-      <l-select 
-        @input="setValue('StuInfoBasic.OverseasChineseNo', $event)"
-        :value="getValue('StuInfoBasic.OverseasChineseNo')"
-        :disabled="!edit"
-        :range="dataSource.StuInfoBasic.OverseasChineseNo"
-        title="港澳台侨"
-      /> 
-      <l-select 
-        @input="setValue('StuInfoBasic.GraduateNo', $event)"
-        :value="getValue('StuInfoBasic.GraduateNo')"
-        :disabled="!edit"
-        :range="dataSource.StuInfoBasic.GraduateNo"
-        title="本专科"
-      /> 
-      <l-input 
-        @input="setValue('StuInfoBasic.InSchoolAddress', $event)"
-        :value="getValue('StuInfoBasic.InSchoolAddress')"
-        :disabled="!edit"
-        title="校内地址"
-      /> 
-      <l-input 
-        @input="setValue('StuInfoBasic.InSchoolTelephone', $event)"
-        :value="getValue('StuInfoBasic.InSchoolTelephone')"
-        :disabled="!edit"
-        title="校内电话"
-      /> 
-      <l-input 
-        @input="setValue('StuInfoBasic.QQ', $event)"
-        :value="getValue('StuInfoBasic.QQ')"
-        :disabled="!edit"
-        title="QQ"
-      /> 
-      <l-textarea 
-        @input="setValue('StuInfoBasic.GoodAt', $event)"
-        :value="getValue('StuInfoBasic.GoodAt')"
-        :readonly="!edit"
-        title="特长"
-      /> 
-    </view> 
-  
-    <view v-if="ready" class="bg-white margin-tb padding"  style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> 
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-date-picker 
+        @input="setValue('StuInfoBasic.Birthday', $event)"
+        :value="getValue('StuInfoBasic.Birthday')"
+        :disabled="!edit"
+        title="出生日期"
+      /> 
+      <l-select 
+        @input="setValue('StuInfoBasic.PartyFaceNo', $event)"
+        :value="getValue('StuInfoBasic.PartyFaceNo')"
+        :disabled="!edit"
+        :range="dataSource.StuInfoBasic.PartyFaceNo"
+        title="政治面貌"
+      /> 
+      <l-select 
+        @input="setValue('StuInfoBasic.NationalityNo', $event)"
+        :value="getValue('StuInfoBasic.NationalityNo')"
+        :disabled="!edit"
+        :range="dataSource.StuInfoBasic.NationalityNo"
+        title="民族"
+      /> 
+      <l-select 
+        @input="setValue('StuInfoBasic.ResidenceNo', $event)"
+        :value="getValue('StuInfoBasic.ResidenceNo')"
+        :disabled="!edit"
+        :range="dataSource.StuInfoBasic.ResidenceNo"
+        title="户口分类"
+      /> 
+      <l-upload-file
+        @input="setValue('StuInfoBasic.Photo', $event)"
+        :value="getValue('StuInfoBasic.Photo')"
+        :readonly="!edit"
+        :number="3"
+        title="照片"
+      /> 
+      <l-input 
+        @input="setValue('StuInfoBasic.mobile', $event)"
+        :value="getValue('StuInfoBasic.mobile')"
+        :disabled="!edit"
+        title="联系电话"
+      /> 
+      <l-input 
+        @input="setValue('StuInfoBasic.EMail', $event)"
+        :value="getValue('StuInfoBasic.EMail')"
+        :disabled="!edit"
+        title="邮箱"
+      /> 
+      <l-input 
+        @input="setValue('StuInfoBasic.MailAddress', $event)"
+        :value="getValue('StuInfoBasic.MailAddress')"
+        :disabled="!edit"
+        title="通信地址"
+      /> 
+      <l-input 
+        @input="setValue('StuInfoBasic.PostalCode', $event)"
+        :value="getValue('StuInfoBasic.PostalCode')"
+        :disabled="!edit"
+        title="邮政编码"
+      /> 
+      <l-input 
+        @input="setValue('StuInfoBasic.FatherUnit', $event)"
+        :value="getValue('StuInfoBasic.FatherUnit')"
+        :disabled="!edit"
+        title="户口所在地"
+      /> 
+      <l-input 
+        @input="setValue('StuInfoBasic.MatherUnit', $event)"
+        :value="getValue('StuInfoBasic.MatherUnit')"
+        :disabled="!edit"
+        title="档案所在地"
+      /> 
+      <l-input 
+        @input="setValue('StuInfoBasic.FatherName', $event)"
+        :value="getValue('StuInfoBasic.FatherName')"
+        :disabled="!edit"
+        title="父亲名字"
+      /> 
+      <l-input 
+        @input="setValue('StuInfoBasic.FatherPhone', $event)"
+        :value="getValue('StuInfoBasic.FatherPhone')"
+        :disabled="!edit"
+        title="父亲电话"
+        required 
+      /> 
+      <l-input 
+        @input="setValue('StuInfoBasic.MatherName', $event)"
+        :value="getValue('StuInfoBasic.MatherName')"
+        :disabled="!edit"
+        title="母亲名字"
+      /> 
+      <l-input 
+        @input="setValue('StuInfoBasic.MatherPhone', $event)"
+        :value="getValue('StuInfoBasic.MatherPhone')"
+        :disabled="!edit"
+        title="母亲电话"
+      /> 
+      <l-select 
+        @input="setValue('StuInfoBasic.FamilyOriginNo', $event)"
+        :value="getValue('StuInfoBasic.FamilyOriginNo')"
+        :disabled="!edit"
+        :range="dataSource.StuInfoBasic.FamilyOriginNo"
+        title="家庭出生"
+      /> 
+      <l-select 
+        @input="setValue('StuInfoBasic.OverseasChineseNo', $event)"
+        :value="getValue('StuInfoBasic.OverseasChineseNo')"
+        :disabled="!edit"
+        :range="dataSource.StuInfoBasic.OverseasChineseNo"
+        title="港澳台侨"
+      /> 
+      <l-select 
+        @input="setValue('StuInfoBasic.GraduateNo', $event)"
+        :value="getValue('StuInfoBasic.GraduateNo')"
+        :disabled="!edit"
+        :range="dataSource.StuInfoBasic.GraduateNo"
+        title="本专科"
+      /> 
+      <l-input 
+        @input="setValue('StuInfoBasic.InSchoolAddress', $event)"
+        :value="getValue('StuInfoBasic.InSchoolAddress')"
+        :disabled="!edit"
+        title="校内地址"
+      /> 
+      <l-input 
+        @input="setValue('StuInfoBasic.InSchoolTelephone', $event)"
+        :value="getValue('StuInfoBasic.InSchoolTelephone')"
+        :disabled="!edit"
+        title="校内电话"
+      /> 
+      <l-input 
+        @input="setValue('StuInfoBasic.QQ', $event)"
+        :value="getValue('StuInfoBasic.QQ')"
+        :disabled="!edit"
+        title="QQ"
+      /> 
+      <l-textarea 
+        @input="setValue('StuInfoBasic.GoodAt', $event)"
+        :value="getValue('StuInfoBasic.GoodAt')"
+        :readonly="!edit"
+        title="特长"
+      /> 
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding"  style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-15 10:16 
- * 描  述：个人信息 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-15 10:16 
+ * 描  述：个人信息 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/StuInfoBasic/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/StuInfoBasic/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        StuInfoBasic: { 
-          Birthday: { type: 'text', title: '出生日期', dateformat: '0' }, 
-          PartyFaceNo: { type: 'select', title: '政治面貌', dataSource: '1', dataSourceId: 'BCdPartyFace,partyface,partyfaceno' }, 
-          NationalityNo: { type: 'select', title: '民族', itemCode: 'National', dataSource: '0' }, 
-          ResidenceNo: { type: 'select', title: '户口分类', itemCode: 'ResidenceNo', dataSource: '0' }, 
-          Photo: { type: 'upload', title: '照片' }, 
-          mobile: { type: 'text', title: '联系电话' }, 
-          EMail: { type: 'text', title: '邮箱' }, 
-          MailAddress: { type: 'text', title: '通信地址' }, 
-          PostalCode: { type: 'text', title: '邮政编码' }, 
-          FatherUnit: { type: 'text', title: '户口所在地' }, 
-          MatherUnit: { type: 'text', title: '档案所在地' }, 
-          FatherName: { type: 'text', title: '父亲名字' }, 
-          FatherPhone: { type: 'text', title: '父亲电话', verify: 'PhoneOrNull' }, 
-          MatherName: { type: 'text', title: '母亲名字' }, 
-          MatherPhone: { type: 'text', title: '母亲电话' }, 
-          FamilyOriginNo: { type: 'select', title: '家庭出生', dataSource: '1', dataSourceId: 'BCdFamilyOrigin,familyorigin,familyoriginno' }, 
-          OverseasChineseNo: { type: 'select', title: '港澳台侨', dataSource: '1', dataSourceId: 'BCdOverseasChinese,overseaschinesename,overseaschineseno' }, 
-          GraduateNo: { type: 'select', title: '本专科', itemCode: 'CollegeType', dataSource: '0' }, 
-          InSchoolAddress: { type: 'text', title: '校内地址' }, 
-          InSchoolTelephone: { type: 'text', title: '校内电话' }, 
-          QQ: { type: 'text', title: 'QQ' }, 
-          GoodAt: { type: 'textarea', title: '特长' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        StuInfoBasic: { 
-          PartyFaceNo: [], 
-          NationalityNo: Object.values(this.GET_GLOBAL('dataDictionary').National).map(t => ({ value: t.value, text: t.text })), 
-          ResidenceNo: Object.values(this.GET_GLOBAL('dataDictionary').ResidenceNo).map(t => ({ value: t.value, text: t.text })), 
-          FamilyOriginNo: [], 
-          OverseasChineseNo: [], 
-          GraduateNo: Object.values(this.GET_GLOBAL('dataDictionary').CollegeType).map(t => ({ value: t.value, text: t.text })), 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        StuInfoBasic: { 
+          Birthday: { type: 'text', title: '出生日期', dateformat: '0' }, 
+          PartyFaceNo: { type: 'select', title: '政治面貌', dataSource: '1', dataSourceId: 'BCdPartyFace,partyface,partyfaceno' }, 
+          NationalityNo: { type: 'select', title: '民族', itemCode: 'National', dataSource: '0' }, 
+          ResidenceNo: { type: 'select', title: '户口分类', itemCode: 'ResidenceNo', dataSource: '0' }, 
+          Photo: { type: 'upload', title: '照片' }, 
+          mobile: { type: 'text', title: '联系电话' }, 
+          EMail: { type: 'text', title: '邮箱' }, 
+          MailAddress: { type: 'text', title: '通信地址' }, 
+          PostalCode: { type: 'text', title: '邮政编码' }, 
+          FatherUnit: { type: 'text', title: '户口所在地' }, 
+          MatherUnit: { type: 'text', title: '档案所在地' }, 
+          FatherName: { type: 'text', title: '父亲名字' }, 
+          FatherPhone: { type: 'text', title: '父亲电话', verify: 'PhoneOrNull' }, 
+          MatherName: { type: 'text', title: '母亲名字' }, 
+          MatherPhone: { type: 'text', title: '母亲电话' }, 
+          FamilyOriginNo: { type: 'select', title: '家庭出生', dataSource: '1', dataSourceId: 'BCdFamilyOrigin,familyorigin,familyoriginno' }, 
+          OverseasChineseNo: { type: 'select', title: '港澳台侨', dataSource: '1', dataSourceId: 'BCdOverseasChinese,overseaschinesename,overseaschineseno' }, 
+          GraduateNo: { type: 'select', title: '本专科', itemCode: 'CollegeType', dataSource: '0' }, 
+          InSchoolAddress: { type: 'text', title: '校内地址' }, 
+          InSchoolTelephone: { type: 'text', title: '校内电话' }, 
+          QQ: { type: 'text', title: 'QQ' }, 
+          GoodAt: { type: 'textarea', title: '特长' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        StuInfoBasic: { 
+          PartyFaceNo: [], 
+          NationalityNo: Object.values(this.GET_GLOBAL('dataDictionary').National).map(t => ({ value: t.value, text: t.text })), 
+          ResidenceNo: Object.values(this.GET_GLOBAL('dataDictionary').ResidenceNo).map(t => ({ value: t.value, text: t.text })), 
+          FamilyOriginNo: [], 
+          OverseasChineseNo: [], 
+          GraduateNo: Object.values(this.GET_GLOBAL('dataDictionary').CollegeType).map(t => ({ value: t.value, text: t.text })), 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
 	let account=this.GET_GLOBAL('loginUser').account;
 	console.log(this.GET_GLOBAL('loginUser'));
-	let stuInfo = await this.HTTP_GET('/EducationalAdministration/StuInfoBasic/stuinfo', account)
+	let stuInfo = await this.HTTP_GET('learun/adms/EducationalAdministration/StuInfoBasic/stuinfo', account)
 	id=stuInfo.StuId;
 	
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-        this.FETCH_DATASOURCE('BCdPartyFace').then(result => { 
-          this.dataSource.StuInfoBasic.PartyFaceNo = result.data.map(t => ({ text: t.partyface, value: t.partyfaceno })) 
-        }), 
-        this.FETCH_DATASOURCE('BCdFamilyOrigin').then(result => { 
-          this.dataSource.StuInfoBasic.FamilyOriginNo = result.data.map(t => ({ text: t.familyorigin, value: t.familyoriginno })) 
-        }), 
-        this.FETCH_DATASOURCE('BCdOverseasChinese').then(result => { 
-          this.dataSource.StuInfoBasic.OverseasChineseNo = result.data.map(t => ({ text: t.overseaschinesename, value: t.overseaschineseno })) 
-        }), 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/EducationalAdministration/StuInfoBasic/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/EducationalAdministration/StuInfoBasic/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationStuInfoBasic-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/EducationalAdministration/StuInfoBasic/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationStuInfoBasic-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+    await this.init(type, id) 
+	// this.HTTP_GET('learun/adms/EducationalAdministration/StuInfoBasic/stuinfo', account).then(res => {
+	// 	console.log(res)
+	// })
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+        this.FETCH_DATASOURCE('BCdPartyFace').then(result => { 
+          this.dataSource.StuInfoBasic.PartyFaceNo = result.data.map(t => ({ text: t.partyface, value: t.partyfaceno })) 
+        }), 
+        this.FETCH_DATASOURCE('BCdFamilyOrigin').then(result => { 
+          this.dataSource.StuInfoBasic.FamilyOriginNo = result.data.map(t => ({ text: t.familyorigin, value: t.familyoriginno })) 
+        }), 
+        this.FETCH_DATASOURCE('BCdOverseasChinese').then(result => { 
+          this.dataSource.StuInfoBasic.OverseasChineseNo = result.data.map(t => ({ text: t.overseaschinesename, value: t.overseaschineseno })) 
+        }), 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/EducationalAdministration/StuInfoBasic/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/EducationalAdministration/StuInfoBasic/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationStuInfoBasic-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/EducationalAdministration/StuInfoBasic/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationStuInfoBasic-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/list.vue
new file mode 100644
index 000000000..7e8f1dfb6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/list.vue	
@@ -0,0 +1,259 @@
+<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.ID" @click="tapLi(item)">
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">学号：</text>
+							{{ item.StuNo }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">姓名：</text>
+							{{ item.StuName }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">班级：</text>
+							{{ displayListItem(item, 'ClassNo') }}
+							<!-- {{ item.StuName }} -->
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">线上缴费状态：</text>
+							{{ item.PayFeeStatus == "1" ? "已缴费" : "未缴费" }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">贷款回执码：</text>
+							{{ item.StudentLoan }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">助学贷款状态：</text>
+							{{ item.StudentLoanStatus == "1" ? "已审核" : "未审核" }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">现场缴费状态：</text>
+							{{ displayListItem(item, 'OnsitePayFeeStatus') }}
+						</view>
+
+					</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-input v-model="queryData.StuNo" title="学号" placeholder="请填写学号" right />
+				<l-input v-model="queryData.StuName" title="学生姓名" placeholder="请填写学生姓名" right />
+
+				<!-- 重置查询条件按钮 -->
+				<view class="padding-tb"><l-button @click="searchChange" line="orange" class="block" block>查询</l-button></view>
+			</view>
+		</scroll-view>
+
+	</view>
+</template>
+
+<script>
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2020-10-12 17:22
+ * 描  述：班级自诊打卡
+ */
+
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/EducationalAdministration/Thermography/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: {
+				ClassNo: {
+					type: 'select',
+					dataSource: '1',
+					dataSourceId: 'bjsj,classname,classno'
+				},
+				OnsitePayFeeStatus: {
+					type: 'select',
+					itemCode: 'MeasureTime',
+					dataSource: '0'
+				}
+			},
+
+			defaultQueryData: {},
+			queryData: {
+				StuNo: '',
+				StuName: ''
+			},
+
+			// 数据源
+			dataSource: {
+				ClassNo: [],
+				OnsitePayFeeStatus: Object.values(this.GET_GLOBAL('dataDictionary').OnsitePayStatus).map(t => ({ value: t.value, text: t.text }))
+			},
+
+			// 页面相关参数
+			ready: false,
+			tips: '加载中...',
+			loadState: '向下翻以加载更多',
+			sideOpen: false,
+
+			// 列表与分页信息
+			page: 1,
+			total: 2,
+			rows: 10,
+			list: [],
+		};
+	},
+
+	async onLoad() {
+		await this.init();
+	},
+	onUnload() {
+		this.OFF('stuInfoFreshPayFee');
+	},
+
+	methods: {
+		// 页面初始化
+		async init() {
+			this.ON('stuInfoFreshPayFee', this.refreshList);
+
+			// 拉取加载列表和数据源
+			await Promise.all([
+				this.FETCH_DATASOURCE('bjsj').then(data => {
+					this.dataSource.ClassNo = data.data.map(t => ({
+						text: t.classname,
+						value: t.classno
+					}));
+				}),
+
+				() => {}
+			]);
+			await this.fetchList();
+			// 初始化查询条件
+			this.defaultQueryData = this.COPY(this.queryData);
+			this.ready = true;
+		},
+		tapLi(data) {
+			this.NAV_TO('./single', data, true);
+		},
+		// 拉取列表
+		async fetchList() {
+			if (this.page > this.total) {
+				return;
+			}
+			let _postParam = {
+			    pagination: {
+			        rows: this.rows,
+			        page: this.page,
+			        sidx: 'ClassNo,StuNo',
+			        sord: 'ASC'
+			    },
+			    queryJson: JSON.stringify(this.queryData)
+			};
+			this.LOADING('加载数据中…');
+			await this.HTTP_GET('StuInfoFresh/pageList', _postParam,'加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				// console.log(res)
+				this.total = res.total;
+				this.page = res.page + 1;
+				this.list = this.list.concat(res.rows);
+				
+				this.tips = `已加载 ${Math.min(res.page, res.total)} / ${res.total} 页，共 ${res.records} 项`;
+				this.loadState = res.page >= res.total ? '已加载所有项目' : '向下翻以加载更多';
+			})
+		},
+
+		// 刷新清空列表
+		async refreshList() {
+			this.page = 1;
+			this.total = 2;
+			this.list = [];
+
+			await this.fetchList();
+		},
+
+		// 列表下拉
+		pullDown() {
+			this.refreshList().then(() => {
+				this.$refs.list.stopPullDown();
+			});
+		},
+
+		// 设置搜索条件
+		async searchChange() {
+			this.sideOpen = false
+			await this.refreshList();
+		},
+
+		// 显示列表中的标题项
+		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/StuInfoFresh/PayFee/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/single.vue
new file mode 100644
index 000000000..972c5ea0f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/single.vue	
@@ -0,0 +1,82 @@
+<template>
+	<view class="lr-form-container">
+	    <view>
+			<l-select v-model="queryData.PayFeeStatus" :range="dataSource.PayStatus" title="线上缴费状态" placeholder="请选择" />
+	    </view>
+	    <view>
+			<l-input v-model="queryData.StudentLoan" :disabled="disabled" title="贷款回执码" placeholder="请填写贷款回执码" right />
+	    </view>
+	    <view>
+			<l-select v-model="queryData.OnsitePayFeeStatus" :range="dataSource.OnsitePayStatus" title="现场缴费状态" placeholder="请选择" />
+	    </view>
+		<view class="btn" @click="tapBtn">
+			提交
+		</view>
+	</view>
+</template>
+
+<script>
+export default{
+	data() {
+		return {
+			disabled: false,
+			// 数据源
+			dataSource: {
+				PayStatus: Object.values(this.GET_GLOBAL('dataDictionary').PayStatus).map(t => ({ value: t.value, text: t.text })),
+				OnsitePayStatus: Object.values(this.GET_GLOBAL('dataDictionary').OnsitePayStatus).map(t => ({ value: t.value, text: t.text }))
+			},
+			queryData: {
+				StudentLoan: '',
+				PayFeeStatus: '',
+				OnsitePayFeeStatus: '',
+				StudentLoanStatus: '0'
+			},
+			pageInfo:{}
+		}
+	},
+	methods:{
+		init() {
+			// console.log(this.dataSource)
+			this.pageInfo = this.GET_PARAM(); //获取页面传递参数
+			this.LOADING('加载数据中…');
+			this.HTTP_GET('StuInfoFresh/form', this.pageInfo.ID,'加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				// console.log(res)
+				if(res){
+					let data = res.StuInfoFresh;
+					this.queryData.StudentLoan = data.StudentLoan == null? '' : data.StudentLoan;
+					this.queryData.PayFeeStatus = data.PayFeeStatus == null? '' : data.PayFeeStatus;
+					this.queryData.OnsitePayFeeStatus = data.OnsitePayFeeStatus == null? '' : data.OnsitePayFeeStatus;
+					this.disabled = data.StudentLoanStatus == "1"? true : false;
+				}
+			})
+		},
+		tapBtn() {
+			if(this.queryData.StudentLoan.trim() != ""){
+				this.queryData.StudentLoanStatus = 1;
+			}
+			let _postData = {
+				keyValue: this.pageInfo.ID,
+				strEntity: JSON.stringify(this.queryData)
+			}
+			this.LOADING('提交数据中…');
+			this.HTTP_POST('StuInfoFresh/save', _postData,'加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res)
+				if(res){
+					this.TOAST('提交数据成功');
+					this.EMIT('stuInfoFreshPayFee');
+					this.NAV_BACK()
+				}
+			})
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+</style>
+
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/list.vue
new file mode 100644
index 000000000..c9a233c5b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/list.vue	
@@ -0,0 +1,253 @@
+<template>
+	<view id="sQrCode">
+		<view class="sQrCode">
+			<view class="sQrLogo">
+				<image mode="widthFix" class="sQrLogoBg" src="@/common/images/xcBg.jpg"></image>
+				<view class="sQrLogoImg1">
+					<image mode="widthFix" src="@/common/images/logoXc.png"></image>
+				</view>
+				<view class="sQrLogoImg2">
+					<image mode="widthFix" src="@/common/images/logoXcTxt.png"></image>
+				</view>
+			</view>
+			<view class="sQrBox">
+				<view class="sQrT">健康通行登记</view>
+				<view class="sQrList">
+					<view>
+						<text>姓名</text>
+						<text class="sQrListTxt">{{ data.StuInfoFreshEntity.StuName }}</text>
+					</view>
+					<view>
+						<text>系别</text>
+						<text class="sQrListTxt">{{ data.StuInfoFreshEntity.DeptNo }}</text>
+					</view>
+					<view>
+						<text>专业</text>
+						<text class="sQrListTxt">{{ data.StuInfoFreshEntity.MajorNo }}</text>
+					</view>
+					<view>
+						<text>班级</text>
+						<text class="sQrListTxt">{{ data.StuInfoFreshEntity.ClassNo }}</text>
+					</view>
+					<view>
+						<text>教室</text>
+						<text class="sQrListTxt">{{ data.StuInfoFreshEntity.DefaultClassRoomName }}</text>
+					</view>
+				</view>
+				<view class="sQrText">
+					<view>班主任姓名 
+						<text>{{ data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : "" }}</text>
+					</view>
+					<view>班主任电话 <text>{{ data.StuInfoFreshEntity.ClassDiredctorMobile }}</text></view>
+				</view>
+				<view class="sQrText">
+					<view>辅导员姓名 
+						<text>{{ data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : "" }}</text>
+					</view>
+					<view>辅导员电话 <text>{{ data.StuInfoFreshEntity.ClassTutorMobile }}</text></view>
+				</view>
+				<view id="lr_mycode_qrcode" class="sQrImg">
+					<tki-qrcode
+					ref="qrcode"
+					:val="data.StuInfoFreshEntity.StuNo"
+					:size="size"
+					:onval="true"
+					:loadMake="true"
+					/>
+				</view>
+				<view class="sQrTxt">请持报到二维码到对应教室找班主任、辅导员扫描完成报到。</view>
+				<!-- <view class="sQrText">
+					请持报到二维码到对应教室找班主任、辅导员扫描完成报到。
+				</view> -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue"
+export default{
+	components: {tkiQrcode},
+	data() {
+		return {
+			data: {},
+			size: 300,
+		}
+	},
+	methods:{
+		init() {
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			let userInfo = _this.GET_GLOBAL('loginUser'); //获取登录信息
+			_this.HTTP_GET('StuInfoFresh/stuInfoFreshEntity', userInfo.account, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				_this.data = res;
+				let entity = _this.data["StuInfoFreshEntity"];
+				
+				if (entity.RegisterStatus == "1") {
+				    this.CONFIRM('数字化校园提示', '新生已确认报到').then(res => {
+				    	if(res) this.NAV_BACK()
+				    })
+				}
+				if (entity.IsCompleteInfo == "未完善") {
+					this.CONFIRM('数字化校园提示', '新生未完善个人信息，无法报到').then(res => {
+						if(res) this.NAV_BACK()
+					})
+				    return false;
+				}
+				if (entity.PayFeeStatus != "1" && entity.StudentLoanStatus != "1" && entity.OnsitePayFeeStatus != "1") {
+					this.CONFIRM('新生未缴费，无法报到').then(res => {
+						if(res) this.NAV_BACK()
+					})
+				    return false;
+				}
+				
+			});
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+#sQrCode {
+	height: 100%;
+	background-color: #eef2f3;
+	padding-bottom: 30px;
+}
+
+.sTabBox {
+	line-height: 24px;
+	text-align: center;
+	margin-bottom: 18px;
+	color: #333;
+}
+
+.sTabBox view {
+	display: inline-block;
+	width: 80px;
+	background-color: rgba(255, 255, 255, 0.7);
+	margin: 0 5px;
+	font-size: 14px;
+	border-radius: 2px;
+}
+.sQrLogoBg{
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	width: 100%;
+}
+.sQrLogo {
+	background-size: 100% 100%;
+	text-align: center;
+	line-height: 0;
+	padding: 20px 0 70px;
+	position: relative;
+}
+.sQrLogo view{
+	position: relative;
+	z-index: 2;
+}
+.sQrLogoImg1 image {
+	width: 20%;
+}
+
+.sQrLogoImg1 {
+	margin-bottom: 10px;
+}
+
+.sQrLogoImg2 image {
+	width: 50%;
+}
+
+.sQrBox {
+	position: relative;
+	z-index: 3;
+	margin: -50px 20px 0;
+	background-color: #fff;
+	padding: 30px 10px;
+	border-radius: 10px;
+	-webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+	-moz-box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+	box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+}
+
+.sQrT {
+	font-weight: bold;
+	text-align: center;
+	font-size: 22px;
+	margin-bottom: 20px;
+	color: #000;
+}
+
+.sQrList {
+	background-color: #f8f8f8;
+	margin: 0 10px;
+	padding: 10px 15px;
+	border-radius: 4px;
+}
+
+.sQrList view {
+	padding: 7px 10px;
+	font-size: 14px;
+	color: #000;
+	border-top: 1px solid #d7d7d7;
+}
+
+.sQrList view:first-child {
+	border: 0;
+}
+
+.sQrList view text:first-child {
+	color: #aeaeae;
+	margin-right: 10px;
+}
+
+.sQrImg {
+	width: 145px;
+	height: 145px;
+	line-height: 0;
+	margin: 20px auto;
+}
+
+.sQrImg image {
+	width: 100%;
+}
+
+.sQrTxt {
+	margin:0 10px 10px;
+	text-align: center;
+	font-size: 16px;
+	font-weight: bold;
+	color: #aeaeae;
+}
+
+.sQrListTxt{
+	color: #000;
+	font-weight: bold;
+}
+.sQrText {
+	font-size: 12px;
+	color: #AEAEAE;
+	overflow: hidden;
+	margin: 15px 4px 0;
+}
+.sQrText view{
+	float: left;
+	padding: 0 5px;
+}
+.sQrText view:first-child{
+	width: 45%;
+}
+.sQrText view:last-child{
+	width: 55%;
+}
+.sQrText text{
+	color: #000;
+	margin-left: 5px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/StudentLoan/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/StudentLoan/list.vue
new file mode 100644
index 000000000..d8a56f3e9
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/StudentLoan/list.vue	
@@ -0,0 +1,82 @@
+<template>
+	<view class="welcome">
+	    <view class="welBox">
+	        <view class="welInput">
+	            <!-- <input id="ID" type="hidden"/> -->
+	            <!-- <input id="StudentLoan" type="text" placeholder="请填写贷款回执码" value=""/> -->
+				<l-input v-model="postdata.StudentLoan" title="贷款回执码" placeholder="请填写贷款回执码" right />
+	        </view>
+	    </view>
+	    
+	    <view class="btn" @click="tapBtn">保存</view>
+	</view>
+</template>
+
+<script>
+export default{
+	data() {
+		return {
+			postdata:{
+				StudentLoanStatus: '0',
+				StudentLoan: ''
+			}
+		}
+	},
+	methods:{
+		init() {
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('StuInfoFresh/stuInfoFresh', {}, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				if(res){
+					let data = res.StuInfoFreshEntity;
+					this.postdata.ID = data.ID;
+					this.postdata.StudentLoan = data.StudentLoan;
+					if(data.StudentLoanStatus == "1"){
+						this.CONFIRM('数字化校园提示', '新生助学贷款已审核', true).then(res => {
+							if(res) this.NAV_BACK()
+						})
+					}
+				}
+			});
+		},
+		tapBtn() {
+			if (this.postdata.StudentLoan.trim() != '') {
+			    this.postdata.StudentLoanStatus = "1";
+			}else{
+				this.TOAST('贷款回执码不能为空');
+				return
+			}
+			this.LOADING('保存数据中…');
+			this.HTTP_GET('StuInfoFresh/saveLoan', this.postdata, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				if(res){
+					this.TOAST('保存成功');
+					this.NAV_BACK()
+				}
+			});
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+
+.welcome {
+	// padding: 1px 12px 20px;
+	// background: #fff;
+}
+
+.welCon {
+	padding: 10px;
+	border: 1px solid #efefef;
+	margin-top: 18px;
+	border-radius: 4px;
+	position: relative;
+}
+</style>
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 bef23a3f7..4f123742e 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	
@@ -1,295 +1,295 @@
 <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.Id"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">主题：</text> 
-              {{ displayListItem(item, 'Title') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">内容：</text> 
-              {{ displayListItem(item, 'Content') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">创建时间：</text> 
-              {{ displayListItem(item, 'CreateTime') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">回复时间：</text> 
-              {{ displayListItem(item, 'ReplyTime') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">回复内容：</text> 
-              {{ displayListItem(item, 'ReplyContent') }} 
-            </view> 
-  
-  
-            <l-customlist-action showEdit @edit="action('edit', item.Id)" showDelete @delete="action('delete', item.Id)" @view="action('view', item.Id)" /> 
-          </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"
-        /> 
-  
-  
-        <!-- 重置查询条件按钮 --> 
-        <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> 
+  <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.Id"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">主题：</text> 
+              {{ displayListItem(item, 'Title') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">内容：</text> 
+              {{ displayListItem(item, 'Content') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">创建时间：</text> 
+              {{ displayListItem(item, 'CreateTime') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">回复时间：</text> 
+              {{ displayListItem(item, 'ReplyTime') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">回复内容：</text> 
+              {{ displayListItem(item, 'ReplyContent') }} 
+            </view> 
+  
+  
+            <l-customlist-action showEdit @edit="action('edit', item.Id)" showDelete @delete="action('delete', item.Id)" @view="action('view', item.Id)" /> 
+          </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"
+        /> 
+  
+  
+        <!-- 重置查询条件按钮 --> 
+        <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 12:15 
- * 描  述：校长信箱 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-14 12:15 
+ * 描  述：校长信箱 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/StuMail/list", "style": { "navigationBarTitleText": "表单列表页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/StuMail/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: { 
-        Title: { type: 'text' }, 
-        Content: { type: 'textarea' }, 
-        CreateTime: { type: 'datetime', dateformat: '0' }, 
-        ReplyTime: { type: 'datetime', dateformat: '0' }, 
-        ReplyContent: { type: 'textarea' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-      }, 
-  
-      // 时间查询参数 
-      dateRange: null, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('EducationalAdministrationStuMail-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('EducationalAdministrationStuMail-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/EducationalAdministration/StuMail/pagelistByUserId', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    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('/EducationalAdministration/StuMail/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 
-      } 
-    } 
-  
-  } 
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        Title: { type: 'text' }, 
+        Content: { type: 'textarea' }, 
+        CreateTime: { type: 'datetime', dateformat: '0' }, 
+        ReplyTime: { type: 'datetime', dateformat: '0' }, 
+        ReplyContent: { type: 'textarea' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+      }, 
+  
+      // 时间查询参数 
+      dateRange: null, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('EducationalAdministrationStuMail-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('EducationalAdministrationStuMail-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/EducationalAdministration/StuMail/pagelistByUserId', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    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/StuMail/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'; 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuMail/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuMail/single.vue
index 321364a66..0b0274ec6 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuMail/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuMail/single.vue	
@@ -1,209 +1,209 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-input 
-        @input="setValue('StuMail.Title', $event)"
-        :value="getValue('StuMail.Title')"
-        :disabled="!edit"
-        title="主题"
-      /> 
-      <l-textarea 
-        @input="setValue('StuMail.Content', $event)"
-        :value="getValue('StuMail.Content')"
-        :readonly="!edit"
-        title="内容"
-      /> 
-      <l-textarea 
-        @input="setValue('StuMail.ReplyContent', $event)"
-        :value="getValue('StuMail.ReplyContent')"
-        :readonly="true"
-        title="回复内容"
-      /> 
-    </view> 
-  
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> 
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-input 
+        @input="setValue('StuMail.Title', $event)"
+        :value="getValue('StuMail.Title')"
+        :disabled="!edit"
+        title="主题"
+      /> 
+      <l-textarea 
+        @input="setValue('StuMail.Content', $event)"
+        :value="getValue('StuMail.Content')"
+        :readonly="!edit"
+        title="内容"
+      /> 
+      <l-textarea 
+        @input="setValue('StuMail.ReplyContent', $event)"
+        :value="getValue('StuMail.ReplyContent')"
+        :readonly="true"
+        title="回复内容"
+      /> 
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-14 12:15 
- * 描  述：校长信箱 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-14 12:15 
+ * 描  述：校长信箱 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/StuMail/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/StuMail/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        StuMail: { 
-          Title: { type: 'text', title: '主题' }, 
-          Content: { type: 'textarea', title: '内容' }, 
-          CreateTime: { type: 'datetime', title: '创建时间', dateformat: '0' }, 
-          ReplyTime: { type: 'datetime', title: '回复时间', dateformat: '0' }, 
-          ReplyContent: { type: 'textarea', title: '回复内容' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        StuMail: { 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        StuMail: { 
+          Title: { type: 'text', title: '主题' }, 
+          Content: { type: 'textarea', title: '内容' }, 
+          CreateTime: { type: 'datetime', title: '创建时间', dateformat: '0' }, 
+          ReplyTime: { type: 'datetime', title: '回复时间', dateformat: '0' }, 
+          ReplyContent: { type: 'textarea', title: '回复内容' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        StuMail: { 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
 
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/EducationalAdministration/StuMail/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/EducationalAdministration/StuMail/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationStuMail-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/EducationalAdministration/StuMail/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationStuMail-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/EducationalAdministration/StuMail/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/EducationalAdministration/StuMail/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationStuMail-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/EducationalAdministration/StuMail/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationStuMail-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/AbNormalSerious/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/AbNormalSerious/list.vue
new file mode 100644
index 000000000..f997305a2
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/AbNormalSerious/list.vue	
@@ -0,0 +1,33 @@
+<template>
+	<stuqr-code :stuNo="stuNo" info="异常"></stuqr-code> 
+</template>
+
+<script>
+import stuqrCode from "../components/content2.vue"
+export default{
+	components: {stuqrCode},
+	data() {
+		return {
+			stuNo: ''
+		}
+	},
+	methods:{
+		init() {
+			let _this = this;
+			this.stuNo = _this.GET_PARAM().stuNo; //获取登录信息
+		}
+	},
+	created() {
+		this.init()
+	}
+} 
+</script>
+ 
+<style lang="less" scoped>
+/deep/ .sQrType2 {
+	background-color: #CC0000;
+}
+/deep/ .sQrType2 .sQrTypePhoto {
+	border: 4px solid #CC0000;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/AbNormalWeak/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/AbNormalWeak/list.vue
new file mode 100644
index 000000000..b4fb46ef2
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/AbNormalWeak/list.vue	
@@ -0,0 +1,33 @@
+<template>
+	<stuqr-code :stuNo="stuNo" info="异常"></stuqr-code>
+</template>
+
+<script>
+import stuqrCode from "../components/content2.vue"
+export default{
+	components: {stuqrCode},
+	data() {
+		return {
+			stuNo: ''
+		}
+	},
+	methods:{
+		init() {
+			let _this = this;
+			this.stuNo = _this.GET_PARAM().stuNo; //获取登录信息
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+/deep/ .sQrType2 {
+	background-color: #F8B500;
+}
+/deep/ .sQrType2 .sQrTypePhoto {
+	border: 4px solid #F8B500;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/Normal/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/Normal/list.vue
new file mode 100644
index 000000000..735a77ca5
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/Normal/list.vue	
@@ -0,0 +1,33 @@
+<template>
+	<stuqr-code :stuNo="stuNo" info="正常"></stuqr-code>
+</template>
+
+<script>
+import stuqrCode from "../components/content2.vue"
+export default{
+	components: {stuqrCode},
+	data() {
+		return {
+			stuNo: ''
+		}
+	},
+	methods:{
+		init() {
+			let _this = this;
+			this.stuNo = _this.GET_PARAM().stuNo; //获取登录信息
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+ 
+<style lang="less" scoped>
+/deep/ .sQrType2 {
+	background-color: #21A737;
+}
+/deep/ .sQrType2 .sQrTypePhoto {
+	border: 4px solid #21A737;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/components/content.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/components/content.vue
new file mode 100644
index 000000000..d3c3c7a38
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/components/content.vue	
@@ -0,0 +1,203 @@
+<template>
+	<view id="sQrCode">
+		<view class="sQrCode">
+			<view class="sQrLogo">
+				<image mode="widthFix" class="sQrLogoBg" src="@/common/images/xcBg.jpg"></image>
+				<view class="sQrLogoImg1"><image mode="widthFix" src="@/common/images/logoXc.png"></image></view>
+				<view class="sQrLogoImg2"><image mode="widthFix" src="@/common/images/logoXcTxt.png"></image></view>
+			</view>
+			<view class="sQrBox">
+				<view class="sQrT">健康通行登记</view>
+				<view class="sQrList">
+					<view>
+						<text>姓名</text>
+						<text class="sQrListTxt">{{ data.stuInfo.StuName }}</text>
+					</view>
+					<view>
+						<text>专业</text>
+						<text class="sQrListTxt">{{ data.majorInfo.MajorName }}</text>
+					</view>
+					<view>
+						<text>班级</text>
+						<text class="sQrListTxt">{{ data.classInfo.ClassName }}</text>
+					</view>
+					<view>
+						<text>学号</text>
+						<text class="sQrListTxt">{{ data.stuInfo.StuNo }}</text>
+					</view>
+					<view>
+						<text>宿舍</text>
+						<text style="font-weight: bold;">{{ data.roomInfo }}</text>
+					</view>
+				</view>
+				<view id="lr_mycode_qrcode" class="sQrImg"><tki-qrcode ref="qrcode" :val="data.stuInfo.StuNo" :size="size" :onval="true" :loadMake="true" /></view>
+				<view class="sQrTxt">请使用数字校园扫码并出示通行凭证</view>
+				<view class="sQrText">
+					温馨提示:因疫情防控需要，校园实行封闭管理，目前暂仅限经许可的校内师生员工通行。师生出入学校各个公共场所，请使用数字校园扫码，出示通行凭证接受核验。谢谢配合!
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue';
+export default {
+	name: 'stuqrCode',
+	components: { tkiQrcode },
+	props: {
+		stuNo: {
+			type: String
+		}
+	},
+	data() {
+		return {
+			data: {
+				stuInfo: {},
+				majorInfo: {},
+				classInfo: {}
+			},
+			size: 300
+		};
+	},
+	methods: {
+		init() {
+			let _this = this;
+			console.log(_this.stuNo);
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('learun/adms/EducationalAdministration/StuInfoBasic/stuinfoDetail', _this.stuNo, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				_this.data = res;
+			});
+		}
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+#sQrCode {
+	height: 100%;
+	background-color: #eef2f3;
+	padding-bottom: 30px;
+}
+
+.sTabBox {
+	line-height: 24px;
+	text-align: center;
+	margin-bottom: 18px;
+	color: #333;
+}
+
+.sTabBox view {
+	display: inline-block;
+	width: 80px;
+	background-color: rgba(255, 255, 255, 0.7);
+	margin: 0 5px;
+	font-size: 14px;
+	border-radius: 2px;
+}
+.sQrLogoBg {
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	width: 100%;
+}
+.sQrLogo {
+	background-size: 100% 100%;
+	text-align: center;
+	line-height: 0;
+	padding: 20px 0 70px;
+	position: relative;
+}
+.sQrLogo view {
+	position: relative;
+	z-index: 2;
+}
+.sQrLogoImg1 image {
+	width: 20%;
+}
+
+.sQrLogoImg1 {
+	margin-bottom: 10px;
+}
+
+.sQrLogoImg2 image {
+	width: 50%;
+}
+
+.sQrBox {
+	position: relative;
+	z-index: 3;
+	margin: -50px 20px 0;
+	background-color: #fff;
+	padding: 30px 10px;
+	border-radius: 10px;
+	-webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+	-moz-box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+	box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+}
+
+.sQrT {
+	font-weight: bold;
+	text-align: center;
+	font-size: 22px;
+	margin-bottom: 20px;
+	color: #000;
+}
+
+.sQrList {
+	background-color: #f8f8f8;
+	margin: 0 10px;
+	padding: 10px 15px;
+	border-radius: 4px;
+}
+
+.sQrList view {
+	padding: 7px 10px;
+	font-size: 14px;
+	color: #000;
+	border-top: 1px solid #d7d7d7;
+}
+
+.sQrList view:first-child {
+	border: 0;
+}
+
+.sQrList view text:first-child {
+	color: #aeaeae;
+	margin-right: 10px;
+}
+
+.sQrImg {
+	width: 145px;
+	height: 145px;
+	line-height: 0;
+	margin: 20px auto;
+}
+
+.sQrImg image {
+	width: 100%;
+}
+
+.sQrTxt {
+	margin-bottom: 10px;
+	text-align: center;
+	font-size: 16px;
+	font-weight: bold;
+	color: #aeaeae;
+}
+
+.sQrText {
+	font-size: 14px;
+	color: #aeaeae;
+}
+.sQrListTxt {
+	color: #000;
+	font-weight: bold;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/components/content2.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/components/content2.vue
new file mode 100644
index 000000000..4c8bf8d35
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/components/content2.vue	
@@ -0,0 +1,265 @@
+<template>
+	<view id="sQrCode">
+		<view class="sQrCode">
+			<view class="sQrLogo">
+				<image mode="widthFix" class="sQrLogoBg" src="@/common/images/xcBg.jpg"></image>
+				<view class="sQrLogoImg1"><image mode="widthFix" src="@/common/images/logoXc.png"></image></view>
+				<view class="sQrLogoImg2"><image mode="widthFix" src="@/common/images/logoXcTxt.png"></image></view>
+			</view>
+			<view class="sQrBox">
+				<view class="sQrT">健康通行登记</view>
+				<view class="sQrList">
+					<view>
+						<text>姓名</text>
+						<text class="sQrListTxt">{{ data.stuInfo.StuName }}</text>
+					</view>
+					<view>
+						<text>专业</text>
+						<text class="sQrListTxt">{{ data.majorInfo.MajorName }}</text>
+					</view>
+					<view>
+						<text>班级</text>
+						<text class="sQrListTxt">{{ data.classInfo.ClassName }}</text>
+					</view>
+					<view>
+						<text>学号</text>
+						<text class="sQrListTxt">{{ data.stuInfo.StuNo }}</text>
+					</view>
+					<view>
+						<text>宿舍</text>
+						<text style="font-weight: bold;">{{ data.roomInfo }}</text>
+					</view>
+				</view>
+				
+				<view class="sQrType2">
+				    <view class="sQrTypePhoto">
+				        <view>
+							<image mode="widthFix" :src="imgSrc"></image>
+						</view>
+				    </view>
+				    <view class="sQrTypeCon">
+				        <view class="sQrTypeT">健康信息 ： </view>
+				        <view class="sQrTypeTxt">{{ info }}</view>
+				    </view>
+				    <view class="sQrTypeImg">
+				        <img src="images/xcYc.png" alt="">
+				    </view>
+				</view>
+			</view>
+			<view class="sQrTxt1">温馨提示 :  示:因疫情防控需要，校园实行封闭管理，仅限校内经许可的师生员工通行，敬请理解和配合。 </view>
+		</view>
+	</view>
+</template>
+
+<script>
+import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue';
+export default {
+	name: 'stuqrCode',
+	components: { tkiQrcode },
+	props: {
+		stuNo: {
+			type: String
+		},
+		info: {
+			type: String
+		}
+	},
+	data() {
+		return {
+			data: {
+				stuInfo: {},
+				majorInfo: {},
+				classInfo: {}
+			},
+			imgSrc: '',
+			size: 300
+		};
+	},
+	methods: {
+		init() {
+			let _this = this;
+			console.log(_this);
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('learun/adms/EducationalAdministration/StuInfoBasic/stuinfoDetail', _this.stuNo, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				_this.data = res;
+				_this.imgSrc = _this.API.slice(0,-1) + res.stuInfo.Photo;
+				console.log(_this.imgSrc)
+			});
+		}
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+#sQrCode {
+	height: 100%;
+	background-color: #eef2f3;
+	padding-bottom: 30px;
+}
+.sQrLogoBg {
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	width: 100%;
+}
+.sQrLogo {
+	background-size: 100% 100%;
+	text-align: center;
+	line-height: 0;
+	padding: 20px 0 70px;
+	position: relative;
+}
+.sQrLogo view {
+	position: relative;
+	z-index: 2;
+}
+.sQrLogoImg1 image {
+	width: 20%;
+}
+
+.sQrLogoImg1 {
+	margin-bottom: 10px;
+}
+
+.sQrLogoImg2 image {
+	width: 50%;
+}
+
+.sQrBox {
+	margin: -50px 20px 0;
+	background-color: #fff;
+	padding: 30px 38px;
+	border-radius: 10px;
+	-webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+	-moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+	box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+	/* overflow: hidden; */
+	position: relative;
+	z-index: 99;
+}
+.sQrT {
+    font-weight: bold;
+    text-align: center;
+    font-size: 22px;
+    margin-bottom: 20px;
+    color: #000;
+}
+.sQrT2 {
+	font-weight: bold;
+	text-align: center;
+	font-size: 24px;
+	margin-bottom: 20px;
+	color: #F8B500;
+}
+
+.sQrList {
+	background-color: #F8F8F8;
+	margin: 0 10px;
+	padding: 10px 30px;
+	border-radius: 4px
+}
+
+.sQrList view {
+	padding: 7px 10px;
+	font-size: 14px;
+	color: #000;
+	border-top: 1px solid #D7D7D7;
+}
+
+.sQrList view:first-child {
+	border: 0;
+}
+
+.sQrList view text {
+	color: #AEAEAE;
+	margin-right: 10px;
+}
+
+.sQrType2 {
+	// background-color: #F8B500;
+	padding: 20px 0;
+	text-align: center;
+	color: #fff;
+	margin: 30px -38px -30px;
+	border-radius: 0 0 10px 10px;
+}
+
+.sQrType2>* {
+	display: inline-block;
+	vertical-align: middle;
+	text-align: left;
+}
+
+.sQrTypeT {
+	font-size: 14px;
+}
+
+.sQrTypeTxt {
+	font-size: 24px;
+	font-weight: bold;
+	margin-top: 3px;
+}
+
+.sQrTypeImg {
+	margin-left: 15px;
+	width: 43px;
+	line-height: 0;
+}
+
+.sQrTypeImg image {
+	width: 100%;
+}
+
+.sQrTxt1 {
+	margin: 30px 50px 20px;
+	font-size: 14px;
+	color: #AEAEAE;
+}
+
+.sQrBtn3 {
+	margin: 20px 20px 0;
+	background-color: #CED0D0;
+	/* -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1);
+	-moz-box-shadow: 0 0 10px rgba(0, 0, 0, .1);
+	box-shadow: 0 0 10px rgba(0, 0, 0, .1); */
+	border-radius: 8px;
+	height: 50px;
+	line-height: 50px;
+	font-weight: bold;
+	color: #fff;
+	font-size: 16px;
+	text-align: center;
+}
+
+.sQrBtn3 image {
+	width: 23px;
+	margin-right: 10px;
+	position: relative;
+	top: 2px;
+}
+
+.sQrType2 .sQrTypePhoto {
+	// border: 4px solid #F8B500;
+	border-radius: 4px;
+	width: 85px;
+	margin: -30px 10px -30px 0;
+	background: #fff;
+}
+
+.sQrTypePhoto view {
+	height: 0;
+	overflow: hidden;
+	padding-bottom: 139.516129%;
+	line-height: 0;
+}
+
+.sQrTypePhoto image {
+	width: 100%;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/list.vue
new file mode 100644
index 000000000..0176a9c17
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StudentQRCode/list.vue	
@@ -0,0 +1,29 @@
+<template>
+	<stuqr-code :stuNo="stuNo"></stuqr-code>
+</template>
+
+<script>
+import stuqrCode from "./components/content.vue"
+export default{
+	components: {stuqrCode},
+	data() {
+		return {
+			stuNo: ''
+		}
+	},
+	methods:{
+		init() {
+			// console.log(this)
+			let _this = this;
+			this.stuNo = _this.GET_GLOBAL('loginUser').account; //获取登录信息
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>
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 5a2d04044..4689f37be 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,32 +1,32 @@
 <template>
-    <view class="page">
-        <view v-if="ready">
-            <l-input
+    <view class="page">
+        <view v-if="ready">
+            <l-input
         @input="setValue('Sys_ReceiveFile.Sender', $event)"
         :value="getValue('Sys_ReceiveFile.Sender')"
         :disabled="!edit"
         title="发送人"
       />
-            <l-input
+            <l-input
         @input="setValue('Sys_ReceiveFile.Title', $event)"
         :value="getValue('Sys_ReceiveFile.Title')"
         :disabled="!edit"
         title="主题"
       />
-            <l-date-picker
+            <l-date-picker
         @input="setValue('Sys_ReceiveFile.SendTime', $event)"
         :value="getValue('Sys_ReceiveFile.SendTime')"
         :disabled="!edit"
         title="发送时间"
       />
-            <l-select
+            <l-select
         @input="setValue('Sys_ReceiveFile.SendType', $event)"
         :value="getValue('Sys_ReceiveFile.SendType')"
         :disabled="!edit"
         :range="dataSource.Sys_ReceiveFile.SendType"
         title="接收对象"
       />
-            <l-textarea
+            <l-textarea
         @input="setValue('Sys_ReceiveFile.Contents', $event)"
         :value="getValue('Sys_ReceiveFile.Contents')"
         :disabled="!edit"
@@ -34,20 +34,20 @@
         :range="dataSource.Sys_ReceiveFile.Contents"
         title="内容"
       />
-          </view
+          </view
     >
-      </view
+      </view
   >
 </template> 
-  
-  
+  
+  
 <script>
 /*
  * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
  * Copyright (c) 2013-2020 上海力软信息技术有限公司
  * 创建人：超级管理员
- * 日  期：2020-10-19 09:24
- * 描  述：公文查看
+ * 日  期：2020-10-19 09:24
+ * 描  述：公文查看
  */
 /**
  * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
@@ -118,7 +118,7 @@ export default {
         this.origin = await this.getDefaultForm();
       } else {
         const result = await this.HTTP_GET(
-          "/EducationalAdministration/Sys_ReceiveFile/form",
+          "learun/adms/EducationalAdministration/Sys_ReceiveFile/form",
           this.id
         );
         this.origin = await this.formatFormData(result);
@@ -151,8 +151,8 @@ export default {
           }
           this.LOADING("正在提交...");
           const postData = await this.getPostData(this.id);
-          this.HTTP_POST(
-            "/EducationalAdministration/Sys_ReceiveFile/save",
+          adms(
+            "learun/adms/EducationalAdministration/Sys_ReceiveFile/save",
             postData,
             "表单提交保存失败"
           ).then((success) => {
@@ -171,7 +171,7 @@ export default {
           }
           this.LOADING("提交删除中...");
           this.HTTP_POST(
-            "/EducationalAdministration/Sys_ReceiveFile/delete",
+            "learun/adms/EducationalAdministration/Sys_ReceiveFile/delete",
             this.id,
             "删除失败"
           ).then((success) => {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/measure/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/measure/list.vue
new file mode 100644
index 000000000..72b52976c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/measure/list.vue	
@@ -0,0 +1,532 @@
+<template>
+	<view class="page">
+		<view class="timeTable_sec3">
+			<view class="tSec3Box">
+				<view class="tSec3Time">
+					<l-select v-model="queryData.MeasureTime" :range="MeasureTime" title="" placeholder="选择测温时间段" @change="init" />
+				</view>
+			</view>
+		</view>
+
+		<view class="timeTable_sec4">
+			<view class="tSec4Box">
+				<view class="tSec4T"></view>
+				<view class="tSec4Con">
+					<view class="studSeeSec2Txt" id="shouldArrive">
+					<text class="text-xxl cuIcon cuIcon-friendfavor"></text>测温人：{{ userinfo.realName }}  <text style="margin-left: 10px;" class="text-xxl cuIcon cuIcon-locationfill"></text>班级：{{ className }}
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="statusType">
+			<view>
+				<view class="sStatue1 statusTypeLi">
+					<text></text>
+					未检测
+				</view>
+				<view class="sStatue2 statusTypeLi" style="margin-left: 15px;">
+					<text></text>
+					正常
+				</view>
+				<view class="sStatue3 statusTypeLi">
+					<text></text>
+					异常
+				</view>
+			</view>
+		</view>
+		<!--学生列表-->
+		<view class="timeTable_sec2">
+			<view class="timeTableList">
+				<view class="" v-if="dataList.length == 0">
+					暂时没有信息
+				</view>
+				<view class="timeTableListLi" v-for="(k, i) in dataList" :key="k.PersonBeingMeasuredName" 
+					:class="!k.Status ? 'sStatue1' : k.Status == '0' ? 'sStatue1' : k.Status == '1' ? 'sStatue2' : 'sStatue3'" 
+					@click="studentTap(k, i)"
+				>
+					<view>
+						{{ k.PersonBeingMeasuredName }} <text class="text-xxl cuIcon cuIcon-ellipse"></text>
+				    </view>
+				</view>
+			</view>
+			<view class="submitBtn" v-if="dataList.length != 0" @click="submitBtn">提交测温</view>
+		</view>
+		<!--弹层-->
+		<view class="timeTableAlert" :class="flag? 'active' : ''">
+			<view class="timeTableAlertTop">
+				<view class="timeTableAlertT">{{ layerJson.name }}</view>
+				<view class="timeTableAlertTxt">{{ layerJson.code }}</view>
+			</view>
+			<view class="lr-form-container">
+				<view class="lr-form-row">
+					<l-select class="timeTableAlertS" v-model="queryData.TemperatureMeasure" :range="TemperatureMeasure" title="状态" placeholder="请选择"/>
+				</view>
+				<view class="lr-form-row">
+					<l-input v-model="layerJson.Temperature" title="温度" placeholder="请输入温度(必填)" right />
+				</view>
+				<view class="">
+					<l-textarea title="处理结果" v-model="layerJson.ProcessingResult" placeholder="输入点什么..." />
+				</view>
+				<view class="">
+					<l-textarea title="备注" v-model="layerJson.Remark" placeholder="输入点什么..." />
+				</view>
+			</view>
+			<view class="timeTableBtn" @click="timeTableBtn">确定</view>
+		</view>
+		<view class="timeTableAlertZ" v-show="flag" @click="flag = false"></view>
+	</view>
+</template>
+
+<script>
+export default{
+	data() {
+		return {
+			ind: 0,
+			userinfo: null,
+			className: '',
+			flag: false,
+			MeasureTime: Object.values(this.GET_GLOBAL('dataDictionary').MeasureTime).map(t => ({ value: t.value, text: t.text })),
+			TemperatureMeasure: Object.values(this.GET_GLOBAL('dataDictionary').TemperatureMeasure).map(t => ({ value: t.value, text: t.text })),
+			queryData:{
+				MeasureTime: '0',
+				TemperatureMeasure: '1'
+			},
+			dataList: [],
+			layerJson: {
+				name: '',
+				code: '',
+				Temperature: '',
+				ProcessingResult: '',
+				Remark: ''
+			}
+		}
+	},
+	methods:{
+		init() {
+			let _this = this;
+			let _postParam = {
+			    queryJson: JSON.stringify({
+			        MeasurerID: _this.userinfo.account,
+			        MeasureTime: _this.queryData.MeasureTime
+			    }
+			    )
+			};
+			// console.log(this.TemperatureMeasure)
+			_this.LOADING('加载数据中…');
+			// _this.HIDE_LOADING();
+			_this.HTTP_GET('/learun/adms/EducationalAdministration/Thermography/listOfStudent', _postParam, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				console.log(res)
+				if (res) {
+				    _this.dataList = res;
+				    _this.className = res[0].ClassName;
+				}
+			});
+		},
+		submitBtn() {
+			let _this = this;
+			console.log(this.dataList)
+			this.CONFIRM('数字化校园提示', '是否确认提交测温', true).then(res => {
+				if(res){
+					_this.LOADING('正在提交…');
+					// _this.HIDE_LOADING();
+					_this.HTTP_POST('/learun/adms/EducationalAdministration/Thermography/save2', {
+						measureTime: _this.queryData.MeasureTime,
+						strEntity: JSON.stringify(_this.dataList)
+					}, '加载数据时出错').then(res => {
+						_this.HIDE_LOADING();
+						if (res) {
+							_this.TOAST('提交成功', 'success');
+						    _this.init()
+						}
+					});
+				}
+			})
+		},
+		timeTableBtn () {
+			if( this.layerJson.Temperature == null || this.layerJson.Temperature.length == 0){
+				this.TOAST('温度必须为正数或小数(不能为负数)！', 'success');
+				return
+			}
+			let list = this.dataList[this.ind];
+			list.Status = this.queryData.TemperatureMeasure;
+			list.Temperature = this.layerJson.Temperature;
+			list.ProcessingResult = this.layerJson.ProcessingResult;
+			list.Remark = this.layerJson.Remark;
+			list.MeasureTime = this.queryData.MeasureTime;
+			this.flag = false;
+		},
+		studentTap(jsons, i) {
+			var _this = this;
+			_this.flag = true;
+			_this.ind = i;
+			//console.log(jsons)
+			//未检测时默认为"正常"
+			_this.queryData.TemperatureMeasure = jsons.Status? jsons.Status : '1';
+			_this.layerJson.name = jsons.PersonBeingMeasuredName;
+			_this.layerJson.code = jsons.PersonBeingMeasured;
+			_this.layerJson.Temperature = jsons.Temperature;
+			_this.layerJson.ProcessingResult = jsons.ProcessingResult;
+			_this.layerJson.Remark = jsons.Remark;
+		}
+	},
+	created() {
+		let _this = this;
+		_this.userinfo = _this.GET_GLOBAL('loginUser');
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+/deep/ .tSec3Time .picker {
+	text-align: center;
+}
+/deep/ .tSec3Time .cu-form-group {
+	min-height: 28px;
+	background: transparent;
+	height: 28px;
+	line-height: 28px;
+	text-align: center;
+	font-size: 15px;
+	color: #fff;
+	position: relative;
+	margin: 0 auto;
+	min-height: 28px;
+	border: 0;
+}
+/deep/ .cu-form-group .picker-arrow::after{
+	color: #fff;
+}
+/deep/ .timeTableAlert .cu-form-group{
+	    min-height: 36px;
+}
+.timeTableAlertS{
+	height: 36px;
+}
+.page{
+	padding-bottom: 1px;
+}
+.timeTable_sec2 {
+	// margin-bottom: 30px;
+	background-color: #fff;
+	padding-bottom: 30px;
+}
+
+.noHtml {
+	height: 100%;
+	line-height: 60px;
+	text-align: center;
+	font-size: 14px;
+}
+
+.timeTable_sec3 {
+	padding: 0px 12px 1px;
+	text-align: center;
+	background: #0c86d8;
+	height: 35px;
+}
+
+.tSec3Time {
+	text-align: center;
+	line-height: 24px;
+	font-size: 14px;
+	color: #fff;
+}
+
+.tSec3Time text {
+	display: inline-block;
+	background-color: #b8e2ff;
+	width: 6px;
+	height: 6px;
+	border-radius: 50%;
+	vertical-align: middle;
+	position: relative;
+	top: -2px;
+	margin: 0 10px;
+}
+
+.timeTable_sec4 {
+	padding: 0 12px;
+	/* margin-top: -65px; */
+	margin-bottom: 10px;
+	background: #0075c4;
+}
+
+.tSec4T {
+	/* text-align: center; */
+	margin-bottom: 10px;
+	overflow: hidden;
+	font-size: 16px;
+	color: #fff;
+	padding-top: 10px;
+}
+
+.tSec4Con {
+	padding-bottom: 10px;
+}
+
+
+.studSeeSec2Line {
+	height: 25px;
+	width: 1px;
+	background: #d6dfe2;
+	margin: 0 40px;
+}
+
+.studSeeSec2Txt {
+	color: #4fb1f3;
+	font-size: 14px;
+}
+
+.text-xxl {
+	margin-right: 5px;
+	font-size: 18px;
+}
+
+.studSeeSec2Txt .div {
+	float: right;
+	font-size: 20px;
+	margin-top: -2px;
+}
+
+.textSpan {
+	display: inline-block;
+	line-height: 20px;
+	font-size: 12px;
+	padding: 0 10px;
+	position: relative;
+	background: #4fb1f3;
+	color: #0075c4;
+	border-radius: 2px;
+	top: -3px;
+	margin-right: 5px;
+}
+
+.textSpan:after {
+	content: '';
+	position: absolute;
+	border: 3px solid #4fb1f3;
+	border-right-color: transparent;
+	border-top-color: transparent;
+	border-bottom-color: transparent;
+	right: -6px;
+	top: 50%;
+	margin-top: -3px;
+}
+
+.timeTableList {
+	overflow: hidden;
+	padding: 3px 7px 18px;
+}
+
+.timeTableListLi {
+	width: 33.333333%;
+	float: left;
+	font-size: 14px;
+	line-height: 16px;
+	margin-top: 14px;
+	padding: 0 7px;
+}
+
+.timeTableListLi view {
+	border: 1px solid #daeffd;
+	padding: 13px 0;
+	text-align: center;
+	overflow: hidden;
+}
+
+.timeTableListLi text {
+	color: #fff;
+	font-size: 12px;
+	border: 1px solid #cacaca;
+	border-radius: 50%;
+	height: 14px;
+	width: 14px;
+	line-height: 12px;
+	/* margin-right: 5px; */
+	position: relative;
+	top: -1px;
+	margin-left: 6px;
+}
+
+.timeTableBtn,
+.submitBtn {
+	font-size: 16px;
+	margin: 20px 12px;
+	background: #0c86d8;
+	border-radius: 4px;
+	text-align: center;
+	line-height: 40px;
+	height: 40px;
+	color: #fff;
+	cursor: pointer;
+}
+
+.statusType {
+	padding: 10px 12px;
+	background: #fff;
+	overflow: hidden;
+	margin-bottom: 10px;
+}
+
+.statusTypeLi {
+	width: 16.666667%;
+	float: left;
+	/* text-align: center; */
+	font-size: 14px;
+	line-height: 16px;
+}
+
+.statusType text {
+	display: inline-block;
+	color: #fff;
+	line-height: 14px;
+	font-size: 12px;
+	border: 1px solid #cacaca;
+	border-radius: 50%;
+	height: 9px;
+	width: 9px;
+	line-height: 12px;
+	margin-right: 5px;
+	position: relative;
+	top: 0px;
+}
+
+/*未检测*/
+.sStatue1 text {
+	background: #0089fe;
+	color: #0089fe;
+	border-color: #0089fe;
+}
+
+/*正常*/
+.sStatue2 text {
+	background: #f2b60a;
+	color: #f2b60a;
+	border-color: #f2b60a;
+}
+
+/*异常*/
+.sStatue3 text {
+	background: #e24545;
+	color: #e24545;
+	border-color: #e24545;
+}
+
+/*病假*/
+.sStatue4 text {
+	background: #29cf41;
+	color: #29cf41;
+	border-color: #29cf41;
+}
+
+/*迟到*/
+.sStatue5 text {
+	background: #ad5151;
+	color: #ad5151;
+	border-color: #ad5151;
+}
+
+/*事假*/
+.sStatue6 text {
+	background: #84f193;
+	color: #84f193;
+	border-color: #84f193;
+}
+
+.timeTableAlertZ {
+	width: 100%;
+	height: 100%;
+	z-index: 99;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	// display: none;
+}
+
+.timeTableAlert {
+	z-index: -1;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	margin: auto;
+	width: 80%;
+	height: 70%;
+	background: #fff;
+	border-radius: 4px;
+	filter: alpha(opacity=0);
+	-moz-opacity: 0;
+	-khtml-opacity: 0;
+	opacity: 0;
+	transition: all 0.3s;
+	-moz-transition: all 0.3s;
+	-ms-transition: all 0.3s;
+	-o-transition: all 0.3s;
+	-webkit-transition: all 0.3s;
+	overflow: hidden;
+}
+
+.timeTableAlert.active {
+	z-index: 999;
+	filter: alpha(opacity=100);
+	-moz-opacity: 1;
+	-khtml-opacity: 1;
+	opacity: 1;
+}
+
+.timeTableAlertTop {
+	background-color: #0c86d8;
+	padding: 10px 12px;
+}
+
+.timeTableAlertT {
+	color: #fff;
+	font-size: 16px;
+}
+
+.timeTableAlertTxt {
+	font-size: 14px;
+	color: #b8e2ff;
+	text-align: right;
+	margin-top: 5px;
+}
+
+.timeTableAlertList {
+	overflow: auto;
+	max-height: calc(100% - 62px);
+}
+
+.timeTableAlertLi {
+	line-height: 40px;
+	text-align: center;
+	font-size: 14px;
+	color: #1a1a1a;
+}
+
+.timeTableAlertLi.active {
+	background-color: #d1ecff !important;
+}
+
+.timeTableAlertLi:nth-child(2n) {
+	background-color: #fbfdff;
+}
+
+.timeTableAlertLi:nth-child(2n - 1) {
+	background-color: #ffffff;
+}
+
+#MeasureTime {
+	text-align: center;
+}
+.timeTableAlertText{
+	margin-top: 10px;
+	padding: 0 15px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/single.vue
index 48a7164ec..5d7a49f26 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/single.vue	
@@ -187,7 +187,7 @@ export default {
       if (this.mode === 'create') {
         this.origin = await this.getDefaultForm()
       } else {
-        const result = await this.HTTP_GET('/EducationalAdministration/Thermography/form', this.id)
+        const result = await this.HTTP_GET('learun/adms/EducationalAdministration/Thermography/form', this.id)
         this.origin = await this.formatFormData(result)
       }
       this.current = this.COPY(this.origin)
@@ -219,7 +219,7 @@ export default {
           this.LOADING('正在提交...')
           const postData = await this.getPostData(this.id)
 
-          this.HTTP_POST('/EducationalAdministration/Thermography/save', postData, '表单提交保存失败').then(success => {
+          this.HTTP_POST('learun/adms/EducationalAdministration/Thermography/save', postData, '表单提交保存失败').then(success => {
             this.HIDE_LOADING()
             if (!success) {
               return
@@ -237,7 +237,7 @@ export default {
           }
 
           this.LOADING('提交删除中...')
-          this.HTTP_POST('/EducationalAdministration/Thermography/delete', this.id, '删除失败').then(success => {
+          this.HTTP_POST('learun/adms/EducationalAdministration/Thermography/delete', this.id, '删除失败').then(success => {
             this.HIDE_LOADING()
             if (!success) {
               return
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/list.vue
new file mode 100644
index 000000000..7c7cbe0a1
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/list.vue	
@@ -0,0 +1,286 @@
+<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.F_NewsId"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">公告标题：</text> 
+              {{ displayListItem(item, 'F_FullHead') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">所属类别：</text> 
+              {{ displayListItem(item, 'F_Category') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">发布时间：</text> 
+              {{ displayListItem(item, 'F_CreateDate') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">信息来源：</text> 
+              {{ displayListItem(item, 'F_SourceName') }} 
+            </view> 
+  
+           
+  
+  
+            <l-customlist-action @view="action('view', item)" /> 
+          </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"> 
+  
+  
+        <!-- 重置查询条件按钮 --> 
+        <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-2021 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2021-02-20 11:28 
+ * 描  述：通知公告 
+ */
+  
+/** 
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/LR_Desktop/Notice/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: { 
+        F_FullHead: { type: 'text' }, 
+        F_Category: { type: 'text' }, 
+        F_CreateDate: { type: 'datetime', dateformat: '0' }, 
+        F_SourceName: { type: 'text' }, 
+        F_NewsContent: { type: 'texteditor' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+      }, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('LR_DesktopNotice-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('LR_DesktopNotice-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        '/learun/news/list?F_CategoryId=', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'F_NewsId', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    pullDown() { 
+      this.refreshList().then(() => { 
+        this.$refs.list.stopPullDown() 
+      }) 
+    }, 
+  
+    // 设置搜索条件 
+    async searchChange() { 
+      const result = {} 
+  
+      // 将其他查询项添加到查询 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.queryData = this.COPY(this.defaultQueryData) 
+      this.searchChange() 
+    }, 
+  
+    // 点击「编辑」、「查看」、「添加」、「删除」按钮 
+    async action(type, id = '') { 
+      switch (type) { 
+        case 'view': 
+var param={
+    f_category:id.F_Category,
+    f_content:id.F_NewsContent,
+    f_createdate:id.F_CreateDate,
+    f_createusername:id.F_CreateUserName,
+    f_id:id.F_NewsId,
+    f_time:id.F_ReleaseTime,
+    f_title:'['+id.F_Category+']'+id.F_FullHead
+
+
+}
+          this.NAV_TO(`/pages/home/notice`,param,true) 
+          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('/LR_Desktop/Notice/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> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ListenClassRecord/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ListenClassRecord/list.vue
index 586ef12f6..1b8a1f6a3 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ListenClassRecord/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ListenClassRecord/list.vue	
@@ -1,351 +1,351 @@
 <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.ID"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">讲课老师：</text> 
-              {{ displayListItem(item, 'EmpNo') }} 
-            </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, 'RecordTime') }} 
-            </view> 
-  
-  
-  
-            <l-customlist-action showEdit @edit="action('edit', item.ID)" showDelete @delete="action('delete', item.ID)" @view="action('view', item.ID)" /> 
-          </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-select 
-          v-model="queryData.DeptNo"
-          @change="searchChange"
-          :range="dataSource.DeptNo"
-          title ="系部"
-          placeholder="按系部查询"
-        /> 
-        <l-select 
-          v-model="queryData.MajorNo"
-          @change="searchChange"
-          :range="dataSource.MajorNo"
-          title ="专业"
-          placeholder="按专业查询"
-        /> 
-        <l-select 
-          v-model="queryData.ClassNo"
-          @change="searchChange"
-          :range="dataSource.ClassNo"
-          title ="班级"
-          placeholder="按班级查询"
-        /> 
-        <l-organize-picker 
-          v-model="queryData.EmpNo"
-          @change="searchChange"
-          type="user"
-          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> 
+  <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.ID"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">讲课老师：</text> 
+              {{ displayListItem(item, 'EmpNo') }} 
+            </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, 'RecordTime') }} 
+            </view> 
+  
+  
+  
+            <l-customlist-action showEdit @edit="action('edit', item.ID)" showDelete @delete="action('delete', item.ID)" @view="action('view', item.ID)" /> 
+          </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-select 
+          v-model="queryData.DeptNo"
+          @change="searchChange"
+          :range="dataSource.DeptNo"
+          title ="系部"
+          placeholder="按系部查询"
+        /> 
+        <l-select 
+          v-model="queryData.MajorNo"
+          @change="searchChange"
+          :range="dataSource.MajorNo"
+          title ="专业"
+          placeholder="按专业查询"
+        /> 
+        <l-select 
+          v-model="queryData.ClassNo"
+          @change="searchChange"
+          :range="dataSource.ClassNo"
+          title ="班级"
+          placeholder="按班级查询"
+        /> 
+        <l-organize-picker 
+          v-model="queryData.EmpNo"
+          @change="searchChange"
+          type="user"
+          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-21 10:15 
- * 描  述：听课记录 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-21 10:15 
+ * 描  述：听课记录 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/LogisticsManagement/ListenClassRecord/list", "style": { "navigationBarTitleText": "表单列表页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/LogisticsManagement/ListenClassRecord/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: { 
-        DeptNo: { type: 'select', dataSource: '0' }, 
-        MajorNo: { type: 'select', dataSource: '0' }, 
-        ClassNo: { type: 'select', dataSource: '0' }, 
-        EmpNo: { type: 'organize', dataType: 'user' }, 
-        Address: { type: 'text' }, 
-        LessonName: { type: 'text' }, 
-        RecordTime: { type: 'text' }, 
-        sknryhd: { type: 'textarea' }, 
-        xxmb: { type: 'select', dataSource: '0' }, 
-        xxmbsfkcl: { type: 'select', dataSource: '0' }, 
-        Creater: { type: 'organize', dataType: 'user' }, 
-        xxqjdsj: { type: 'select', dataSource: '0' }, 
-        gzrwdsj: { type: 'select', dataSource: '0' }, 
-        jxhddsj: { type: 'select', dataSource: '0' }, 
-        jxzddfx: { type: 'select', dataSource: '0' }, 
-        gczhdytw: { type: 'select', dataSource: '0' }, 
-        xsdcyhz: { type: 'select', dataSource: '0' }, 
-        xsdsjjn: { type: 'select', dataSource: '0' }, 
-        xsxxxggc: { type: 'select', dataSource: '0' }, 
-        ydyjc: { type: 'textarea' }, 
-        wtyjy: { type: 'textarea' }, 
-        Evaluate: { type: 'select', dataSource: '0' }, 
-        Remark: { type: 'textarea' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-        DeptNo: '', 
-        MajorNo: '', 
-        ClassNo: '', 
-        EmpNo: '', 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        DeptNo: [], 
-        MajorNo: [], 
-        ClassNo: [], 
-        xxmb: [], 
-        xxmbsfkcl: [], 
-        xxqjdsj: [], 
-        gzrwdsj: [], 
-        jxhddsj: [], 
-        jxzddfx: [], 
-        gczhdytw: [], 
-        xsdcyhz: [], 
-        xsdsjjn: [], 
-        xsxxxggc: [], 
-        Evaluate: [], 
-      }, 
-  
-      // 时间查询参数 
-      dateRange: null, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('LogisticsManagementListenClassRecord-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('LogisticsManagementListenClassRecord-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/LogisticsManagement/ListenClassRecord/pagelist', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'ID', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    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('/LogisticsManagement/ListenClassRecord/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 
-      } 
-    } 
-  
-  } 
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        DeptNo: { type: 'select', dataSource: '0' }, 
+        MajorNo: { type: 'select', dataSource: '0' }, 
+        ClassNo: { type: 'select', dataSource: '0' }, 
+        EmpNo: { type: 'organize', dataType: 'user' }, 
+        Address: { type: 'text' }, 
+        LessonName: { type: 'text' }, 
+        RecordTime: { type: 'text' }, 
+        sknryhd: { type: 'textarea' }, 
+        xxmb: { type: 'select', dataSource: '0' }, 
+        xxmbsfkcl: { type: 'select', dataSource: '0' }, 
+        Creater: { type: 'organize', dataType: 'user' }, 
+        xxqjdsj: { type: 'select', dataSource: '0' }, 
+        gzrwdsj: { type: 'select', dataSource: '0' }, 
+        jxhddsj: { type: 'select', dataSource: '0' }, 
+        jxzddfx: { type: 'select', dataSource: '0' }, 
+        gczhdytw: { type: 'select', dataSource: '0' }, 
+        xsdcyhz: { type: 'select', dataSource: '0' }, 
+        xsdsjjn: { type: 'select', dataSource: '0' }, 
+        xsxxxggc: { type: 'select', dataSource: '0' }, 
+        ydyjc: { type: 'textarea' }, 
+        wtyjy: { type: 'textarea' }, 
+        Evaluate: { type: 'select', dataSource: '0' }, 
+        Remark: { type: 'textarea' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+        DeptNo: '', 
+        MajorNo: '', 
+        ClassNo: '', 
+        EmpNo: '', 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        DeptNo: [], 
+        MajorNo: [], 
+        ClassNo: [], 
+        xxmb: [], 
+        xxmbsfkcl: [], 
+        xxqjdsj: [], 
+        gzrwdsj: [], 
+        jxhddsj: [], 
+        jxzddfx: [], 
+        gczhdytw: [], 
+        xsdcyhz: [], 
+        xsdsjjn: [], 
+        xsxxxggc: [], 
+        Evaluate: [], 
+      }, 
+  
+      // 时间查询参数 
+      dateRange: null, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('LogisticsManagementListenClassRecord-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('LogisticsManagementListenClassRecord-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/LogisticsManagement/ListenClassRecord/pagelist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'ID', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    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/LogisticsManagement/ListenClassRecord/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'; 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ListenClassRecord/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ListenClassRecord/single.vue
index 1dc22e4d0..4ecbd8017 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ListenClassRecord/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ListenClassRecord/single.vue	
@@ -1,401 +1,401 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-select 
-        @input="setValue('ListenClassRecord.DeptNo', $event)"
-        :value="getValue('ListenClassRecord.DeptNo')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.DeptNo"
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-select 
+        @input="setValue('ListenClassRecord.DeptNo', $event)"
+        :value="getValue('ListenClassRecord.DeptNo')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.DeptNo"
         @change="deptChange($event)"
-        title="系部"
-      /> 
-      <l-select 
-        @input="setValue('ListenClassRecord.MajorNo', $event)"
-        :value="getValue('ListenClassRecord.MajorNo')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.MajorNo"
+        title="系部"
+      /> 
+      <l-select 
+        @input="setValue('ListenClassRecord.MajorNo', $event)"
+        :value="getValue('ListenClassRecord.MajorNo')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.MajorNo"
         @change="majorChange($event)"
-        title="专业"
-      /> 
-      <l-select 
-        @input="setValue('ListenClassRecord.ClassNo', $event)"
-        :value="getValue('ListenClassRecord.ClassNo')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.ClassNo"
-        title="班级"
-      /> 
-      <l-organize-picker 
-        @input="setValue('ListenClassRecord.EmpNo', $event)"
-        :value="getValue('ListenClassRecord.EmpNo')"
-        :readonly="!edit"
-        type="user"
-        title="讲课老师"
-      /> 
-      <l-input 
-        @input="setValue('ListenClassRecord.Address', $event)"
-        :value="getValue('ListenClassRecord.Address')"
-        :disabled="!edit"
-        title="听课地点"
-      /> 
-      <l-input 
-        @input="setValue('ListenClassRecord.LessonName', $event)"
-        :value="getValue('ListenClassRecord.LessonName')"
-        :disabled="!edit"
-        title="课程名称"
-      /> 
-      <l-input 
-        @input="setValue('ListenClassRecord.RecordTime', $event)"
-        :value="getValue('ListenClassRecord.RecordTime')"
-        :disabled="!edit"
-        title="记录时间"
-      /> 
-      <l-textarea 
-        @input="setValue('ListenClassRecord.sknryhd', $event)"
-        :value="getValue('ListenClassRecord.sknryhd')"
-        :readonly="!edit"
-        title="授课内容与活动"
-      /> 
-      <l-select 
-        @input="setValue('ListenClassRecord.xxmb', $event)"
-        :value="getValue('ListenClassRecord.xxmb')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.xxmb"
-        title="是否有学习目标？"
-      /> 
-      <l-select 
-        @input="setValue('ListenClassRecord.xxmbsfkcl', $event)"
-        :value="getValue('ListenClassRecord.xxmbsfkcl')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.xxmbsfkcl"
-        title="学习目标是否清晰，具体，可测量？"
-      /> 
-      <l-organize-picker 
-        @input="setValue('ListenClassRecord.Creater', $event)"
-        :value="getValue('ListenClassRecord.Creater')"
-        :readonly="!edit"
-        type="user"
-        title="听客人"
-      /> 
-      <l-select 
-        @input="setValue('ListenClassRecord.xxqjdsj', $event)"
-        :value="getValue('ListenClassRecord.xxqjdsj')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.xxqjdsj"
-        title="学习情景的设计是否满足教学？"
-      /> 
-      <l-select 
-        @input="setValue('ListenClassRecord.gzrwdsj', $event)"
-        :value="getValue('ListenClassRecord.gzrwdsj')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.gzrwdsj"
-        title="工作任务（或问题）的设计是否合适？"
-      /> 
-      <l-select 
-        @input="setValue('ListenClassRecord.jxhddsj', $event)"
-        :value="getValue('ListenClassRecord.jxhddsj')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.jxhddsj"
-        title="教学活动的设计与实施是否合适，有效？"
-      /> 
-      <l-select 
-        @input="setValue('ListenClassRecord.jxzddfx', $event)"
-        :value="getValue('ListenClassRecord.jxzddfx')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.jxzddfx"
-        title="教学重点的分析与难点的突破？"
-      /> 
-      <l-select 
-        @input="setValue('ListenClassRecord.gczhdytw', $event)"
-        :value="getValue('ListenClassRecord.gczhdytw')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.gczhdytw"
-        title="过程中互动与提问？"
-      /> 
-      <l-select 
-        @input="setValue('ListenClassRecord.xsdcyhz', $event)"
-        :value="getValue('ListenClassRecord.xsdcyhz')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.xsdcyhz"
-        title="学生的参与，合作？"
-      /> 
-      <l-select 
-        @input="setValue('ListenClassRecord.xsdsjjn', $event)"
-        :value="getValue('ListenClassRecord.xsdsjjn')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.xsdsjjn"
-        title="学生的实践技能学习？"
-      /> 
-      <l-select 
-        @input="setValue('ListenClassRecord.xsxxxggc', $event)"
-        :value="getValue('ListenClassRecord.xsxxxggc')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.xsxxxggc"
-        title="学生学习效果观察？"
-      /> 
-      <l-textarea 
-        @input="setValue('ListenClassRecord.ydyjc', $event)"
-        :value="getValue('ListenClassRecord.ydyjc')"
-        :readonly="!edit"
-        title="优点与精彩"
-      /> 
-      <l-textarea 
-        @input="setValue('ListenClassRecord.wtyjy', $event)"
-        :value="getValue('ListenClassRecord.wtyjy')"
-        :readonly="!edit"
-        title="问题与建议"
-      /> 
-      <l-select 
-        @input="setValue('ListenClassRecord.Evaluate', $event)"
-        :value="getValue('ListenClassRecord.Evaluate')"
-        :disabled="!edit"
-        :range="dataSource.ListenClassRecord.Evaluate"
-        title="评价"
-      /> 
-      <l-textarea 
-        @input="setValue('ListenClassRecord.Remark', $event)"
-        :value="getValue('ListenClassRecord.Remark')"
-        :readonly="!edit"
-        title="备注"
-      /> 
-    </view> 
-  
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> 
-  </view> 
+        title="专业"
+      /> 
+      <l-select 
+        @input="setValue('ListenClassRecord.ClassNo', $event)"
+        :value="getValue('ListenClassRecord.ClassNo')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.ClassNo"
+        title="班级"
+      /> 
+      <l-organize-picker 
+        @input="setValue('ListenClassRecord.EmpNo', $event)"
+        :value="getValue('ListenClassRecord.EmpNo')"
+        :readonly="!edit"
+        type="user"
+        title="讲课老师"
+      /> 
+      <l-input 
+        @input="setValue('ListenClassRecord.Address', $event)"
+        :value="getValue('ListenClassRecord.Address')"
+        :disabled="!edit"
+        title="听课地点"
+      /> 
+      <l-input 
+        @input="setValue('ListenClassRecord.LessonName', $event)"
+        :value="getValue('ListenClassRecord.LessonName')"
+        :disabled="!edit"
+        title="课程名称"
+      /> 
+      <l-input 
+        @input="setValue('ListenClassRecord.RecordTime', $event)"
+        :value="getValue('ListenClassRecord.RecordTime')"
+        :disabled="!edit"
+        title="记录时间"
+      /> 
+      <l-textarea 
+        @input="setValue('ListenClassRecord.sknryhd', $event)"
+        :value="getValue('ListenClassRecord.sknryhd')"
+        :readonly="!edit"
+        title="授课内容与活动"
+      /> 
+      <l-select 
+        @input="setValue('ListenClassRecord.xxmb', $event)"
+        :value="getValue('ListenClassRecord.xxmb')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.xxmb"
+        title="是否有学习目标？"
+      /> 
+      <l-select 
+        @input="setValue('ListenClassRecord.xxmbsfkcl', $event)"
+        :value="getValue('ListenClassRecord.xxmbsfkcl')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.xxmbsfkcl"
+        title="学习目标是否清晰，具体，可测量？"
+      /> 
+      <l-organize-picker 
+        @input="setValue('ListenClassRecord.Creater', $event)"
+        :value="getValue('ListenClassRecord.Creater')"
+        :readonly="!edit"
+        type="user"
+        title="听客人"
+      /> 
+      <l-select 
+        @input="setValue('ListenClassRecord.xxqjdsj', $event)"
+        :value="getValue('ListenClassRecord.xxqjdsj')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.xxqjdsj"
+        title="学习情景的设计是否满足教学？"
+      /> 
+      <l-select 
+        @input="setValue('ListenClassRecord.gzrwdsj', $event)"
+        :value="getValue('ListenClassRecord.gzrwdsj')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.gzrwdsj"
+        title="工作任务（或问题）的设计是否合适？"
+      /> 
+      <l-select 
+        @input="setValue('ListenClassRecord.jxhddsj', $event)"
+        :value="getValue('ListenClassRecord.jxhddsj')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.jxhddsj"
+        title="教学活动的设计与实施是否合适，有效？"
+      /> 
+      <l-select 
+        @input="setValue('ListenClassRecord.jxzddfx', $event)"
+        :value="getValue('ListenClassRecord.jxzddfx')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.jxzddfx"
+        title="教学重点的分析与难点的突破？"
+      /> 
+      <l-select 
+        @input="setValue('ListenClassRecord.gczhdytw', $event)"
+        :value="getValue('ListenClassRecord.gczhdytw')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.gczhdytw"
+        title="过程中互动与提问？"
+      /> 
+      <l-select 
+        @input="setValue('ListenClassRecord.xsdcyhz', $event)"
+        :value="getValue('ListenClassRecord.xsdcyhz')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.xsdcyhz"
+        title="学生的参与，合作？"
+      /> 
+      <l-select 
+        @input="setValue('ListenClassRecord.xsdsjjn', $event)"
+        :value="getValue('ListenClassRecord.xsdsjjn')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.xsdsjjn"
+        title="学生的实践技能学习？"
+      /> 
+      <l-select 
+        @input="setValue('ListenClassRecord.xsxxxggc', $event)"
+        :value="getValue('ListenClassRecord.xsxxxggc')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.xsxxxggc"
+        title="学生学习效果观察？"
+      /> 
+      <l-textarea 
+        @input="setValue('ListenClassRecord.ydyjc', $event)"
+        :value="getValue('ListenClassRecord.ydyjc')"
+        :readonly="!edit"
+        title="优点与精彩"
+      /> 
+      <l-textarea 
+        @input="setValue('ListenClassRecord.wtyjy', $event)"
+        :value="getValue('ListenClassRecord.wtyjy')"
+        :readonly="!edit"
+        title="问题与建议"
+      /> 
+      <l-select 
+        @input="setValue('ListenClassRecord.Evaluate', $event)"
+        :value="getValue('ListenClassRecord.Evaluate')"
+        :disabled="!edit"
+        :range="dataSource.ListenClassRecord.Evaluate"
+        title="评价"
+      /> 
+      <l-textarea 
+        @input="setValue('ListenClassRecord.Remark', $event)"
+        :value="getValue('ListenClassRecord.Remark')"
+        :readonly="!edit"
+        title="备注"
+      /> 
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-21 10:28 
- * 描  述：听课记录 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-21 10:28 
+ * 描  述：听课记录 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/LogisticsManagement/ListenClassRecord/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/LogisticsManagement/ListenClassRecord/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        ListenClassRecord: { 
-          DeptNo: { type: 'select', title: '系部', dataSource: '1', dataSourceId: 'CdDeptInfo,deptname,deptno' }, 
-          MajorNo: { type: 'select', title: '专业', dataSource: '1', dataSourceId: 'CdMajorInfo,majorname,majorno' }, 
-          ClassNo: { type: 'select', title: '班级', dataSource: '1', dataSourceId: 'bjsj,classname,classno' }, 
-          EmpNo: { type: 'organize', title: '讲课老师', dataType: 'user' }, 
-          Address: { type: 'text', title: '听课地点' }, 
-          LessonName: { type: 'text', title: '课程名称' }, 
-          RecordTime: { type: 'text', title: '记录时间' }, 
-          sknryhd: { type: 'textarea', title: '授课内容与活动' }, 
-          xxmb: { type: 'select', title: '是否有学习目标？', dataSource: '0' }, 
-          xxmbsfkcl: { type: 'select', title: '学习目标是否清晰，具体，可测量？', dataSource: '0' }, 
-          Creater: { type: 'organize', title: '听客人', dataType: 'user' }, 
-          xxqjdsj: { type: 'select', title: '学习情景的设计是否满足教学？', dataSource: '0' }, 
-          gzrwdsj: { type: 'select', title: '工作任务（或问题）的设计是否合适？', dataSource: '0' }, 
-          jxhddsj: { type: 'select', title: '教学活动的设计与实施是否合适，有效？', dataSource: '0' }, 
-          jxzddfx: { type: 'select', title: '教学重点的分析与难点的突破？', dataSource: '0' }, 
-          gczhdytw: { type: 'select', title: '过程中互动与提问？', dataSource: '0' }, 
-          xsdcyhz: { type: 'select', title: '学生的参与，合作？', dataSource: '0' }, 
-          xsdsjjn: { type: 'select', title: '学生的实践技能学习？', dataSource: '0' }, 
-          xsxxxggc: { type: 'select', title: '学生学习效果观察？', dataSource: '0' }, 
-          ydyjc: { type: 'textarea', title: '优点与精彩' }, 
-          wtyjy: { type: 'textarea', title: '问题与建议' }, 
-          Evaluate: { type: 'select', title: '评价', dataSource: '0' }, 
-          Remark: { type: 'textarea', title: '备注' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        ListenClassRecord: { 
-          DeptNo: [], 
-          MajorNo: [], 
-          ClassNo: [], 
-          xxmb: [{ text: '有', value: '1' }, { text: '无', value: '0' }], 
-          xxmbsfkcl: [{ text: '良好', value: '1' }, { text: '稍作修改', value: '2' }, { text: '较大修改', value: '3' }], 
-          xxqjdsj: [{ text: '满足', value: '1' }, { text: '基本满足', value: '2' }, { text: '不满足', value: '3' }], 
-          gzrwdsj: [{ text: '合适', value: '1' }, { text: '基本合适', value: '2' }, { text: '不合适', value: '3' }], 
-          jxhddsj: [{ text: '好', value: '1' }, { text: '一般', value: '2' }, { text: '较差', value: '3' }], 
-          jxzddfx: [{ text: '分析清晰', value: '1' }, { text: '需要改进', value: '2' }], 
-          gczhdytw: [{ text: '方法', value: '1' }, { text: '效果', value: '2' }], 
-          xsdcyhz: [{ text: '良好', value: '1' }, { text: '一般', value: '2' }, { text: '较差', value: '3' }], 
-          xsdsjjn: [{ text: '实践内容丰富', value: '1' }, { text: '实践内容较少', value: '2' }], 
-          xsxxxggc: [{ text: '良好', value: '1' }, { text: '一般', value: '2' }, { text: '较差', value: '3' }], 
-          Evaluate: [{ text: '优秀，可示范', value: '1' }, { text: '良好，有期待', value: '2' }, { text: '一般，待改进', value: '3' }, { text: '较差，需培训', value: '4' }], 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-        this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-          this.dataSource.ListenClassRecord.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
-        }), 
-        this.FETCH_DATASOURCE('CdMajorInfo').then(result => { 
-          this.dataSource.ListenClassRecord.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
-        }), 
-        this.FETCH_DATASOURCE('bjsj').then(result => { 
-          this.dataSource.ListenClassRecord.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
-        }), 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/LogisticsManagement/ListenClassRecord/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/LogisticsManagement/ListenClassRecord/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('LogisticsManagementListenClassRecord-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/LogisticsManagement/ListenClassRecord/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('LogisticsManagementListenClassRecord-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    },
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        ListenClassRecord: { 
+          DeptNo: { type: 'select', title: '系部', dataSource: '1', dataSourceId: 'CdDeptInfo,deptname,deptno' }, 
+          MajorNo: { type: 'select', title: '专业', dataSource: '1', dataSourceId: 'CdMajorInfo,majorname,majorno' }, 
+          ClassNo: { type: 'select', title: '班级', dataSource: '1', dataSourceId: 'bjsj,classname,classno' }, 
+          EmpNo: { type: 'organize', title: '讲课老师', dataType: 'user' }, 
+          Address: { type: 'text', title: '听课地点' }, 
+          LessonName: { type: 'text', title: '课程名称' }, 
+          RecordTime: { type: 'text', title: '记录时间' }, 
+          sknryhd: { type: 'textarea', title: '授课内容与活动' }, 
+          xxmb: { type: 'select', title: '是否有学习目标？', dataSource: '0' }, 
+          xxmbsfkcl: { type: 'select', title: '学习目标是否清晰，具体，可测量？', dataSource: '0' }, 
+          Creater: { type: 'organize', title: '听客人', dataType: 'user' }, 
+          xxqjdsj: { type: 'select', title: '学习情景的设计是否满足教学？', dataSource: '0' }, 
+          gzrwdsj: { type: 'select', title: '工作任务（或问题）的设计是否合适？', dataSource: '0' }, 
+          jxhddsj: { type: 'select', title: '教学活动的设计与实施是否合适，有效？', dataSource: '0' }, 
+          jxzddfx: { type: 'select', title: '教学重点的分析与难点的突破？', dataSource: '0' }, 
+          gczhdytw: { type: 'select', title: '过程中互动与提问？', dataSource: '0' }, 
+          xsdcyhz: { type: 'select', title: '学生的参与，合作？', dataSource: '0' }, 
+          xsdsjjn: { type: 'select', title: '学生的实践技能学习？', dataSource: '0' }, 
+          xsxxxggc: { type: 'select', title: '学生学习效果观察？', dataSource: '0' }, 
+          ydyjc: { type: 'textarea', title: '优点与精彩' }, 
+          wtyjy: { type: 'textarea', title: '问题与建议' }, 
+          Evaluate: { type: 'select', title: '评价', dataSource: '0' }, 
+          Remark: { type: 'textarea', title: '备注' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        ListenClassRecord: { 
+          DeptNo: [], 
+          MajorNo: [], 
+          ClassNo: [], 
+          xxmb: [{ text: '有', value: '1' }, { text: '无', value: '0' }], 
+          xxmbsfkcl: [{ text: '良好', value: '1' }, { text: '稍作修改', value: '2' }, { text: '较大修改', value: '3' }], 
+          xxqjdsj: [{ text: '满足', value: '1' }, { text: '基本满足', value: '2' }, { text: '不满足', value: '3' }], 
+          gzrwdsj: [{ text: '合适', value: '1' }, { text: '基本合适', value: '2' }, { text: '不合适', value: '3' }], 
+          jxhddsj: [{ text: '好', value: '1' }, { text: '一般', value: '2' }, { text: '较差', value: '3' }], 
+          jxzddfx: [{ text: '分析清晰', value: '1' }, { text: '需要改进', value: '2' }], 
+          gczhdytw: [{ text: '方法', value: '1' }, { text: '效果', value: '2' }], 
+          xsdcyhz: [{ text: '良好', value: '1' }, { text: '一般', value: '2' }, { text: '较差', value: '3' }], 
+          xsdsjjn: [{ text: '实践内容丰富', value: '1' }, { text: '实践内容较少', value: '2' }], 
+          xsxxxggc: [{ text: '良好', value: '1' }, { text: '一般', value: '2' }, { text: '较差', value: '3' }], 
+          Evaluate: [{ text: '优秀，可示范', value: '1' }, { text: '良好，有期待', value: '2' }, { text: '一般，待改进', value: '3' }, { text: '较差，需培训', value: '4' }], 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+        this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
+          this.dataSource.ListenClassRecord.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+        }), 
+        this.FETCH_DATASOURCE('CdMajorInfo').then(result => { 
+          this.dataSource.ListenClassRecord.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+        }), 
+        this.FETCH_DATASOURCE('bjsj').then(result => { 
+          this.dataSource.ListenClassRecord.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+        }), 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/LogisticsManagement/ListenClassRecord/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/LogisticsManagement/ListenClassRecord/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('LogisticsManagementListenClassRecord-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/LogisticsManagement/ListenClassRecord/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('LogisticsManagementListenClassRecord-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    },
     deptChange(val){
         console.log(val);
         this.GET('/dept/majorbydept', val).then(data => { 
         this.dataSource.ListenClassRecord.MajorNo=data[1].data.data.map(t=>({value:t.MajorNo,text:t.MajorName}));
-  
-          }) 
+  
+          }) 
     },
     majorChange(val){
         console.log(val);
         this.GET('/dept/classbymajor', val).then(data => { 
         this.dataSource.ListenClassRecord.ClassNo=data[1].data.data.map(t=>({value:t.ClassNo,text:t.ClassName}));
-  
-          }) 
+  
+          }) 
     }
-  } 
+  } 
 } 
 </script> 
\ No newline at end of file
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 56e5ea1fa..b8f29045f 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	
@@ -1,302 +1,302 @@
 <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.Id"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">时间：</text> 
-              {{ displayListItem(item, 'Date') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">地点：</text> 
-              {{ displayListItem(item, 'Address') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">主题：</text> 
-              {{ displayListItem(item, 'Title') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">内容：</text> 
-              {{ displayListItem(item, 'Content') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">备注：</text> 
-              {{ displayListItem(item, 'Remark') }} 
-            </view> 
-  
-  
-            <l-customlist-action showEdit @edit="action('edit', item.Id)" showDelete @delete="action('delete', item.Id)" @view="action('view', item.Id)" /> 
-          </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.Title"
-          @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> 
+  <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.Id"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">时间：</text> 
+              {{ displayListItem(item, 'Date') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">地点：</text> 
+              {{ displayListItem(item, 'Address') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">主题：</text> 
+              {{ displayListItem(item, 'Title') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">内容：</text> 
+              {{ displayListItem(item, 'Content') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">备注：</text> 
+              {{ displayListItem(item, 'Remark') }} 
+            </view> 
+  
+  
+            <l-customlist-action showEdit @edit="action('edit', item.Id)" showDelete @delete="action('delete', item.Id)" @view="action('view', item.Id)" /> 
+          </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.Title"
+          @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-20 09:25 
- * 描  述：活动安排 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-20 09:25 
+ * 描  述：活动安排 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/ActivitySchedule/list", "style": { "navigationBarTitleText": "表单列表页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/ActivitySchedule/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: { 
-        Date: { type: 'datetime', dateformat: '0' }, 
-        Address: { type: 'text' }, 
-        Title: { type: 'text' }, 
-        Content: { type: 'textarea' }, 
-        Remark: { type: 'textarea' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-        Title: '', 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-      }, 
-  
-      // 时间查询参数 
-      dateRange: null, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('PersonnelManagementActivitySchedule-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('PersonnelManagementActivitySchedule-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/PersonnelManagement/ActivitySchedule/pagelist', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    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('/PersonnelManagement/ActivitySchedule/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 
-      } 
-    } 
-  
-  } 
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        Date: { type: 'datetime', dateformat: '0' }, 
+        Address: { type: 'text' }, 
+        Title: { type: 'text' }, 
+        Content: { type: 'textarea' }, 
+        Remark: { type: 'textarea' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+        Title: '', 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+      }, 
+  
+      // 时间查询参数 
+      dateRange: null, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('PersonnelManagementActivitySchedule-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('PersonnelManagementActivitySchedule-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/PersonnelManagement/ActivitySchedule/pagelist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    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/PersonnelManagement/ActivitySchedule/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'; 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/single.vue
index 4f1bbebda..8d321b531 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/single.vue	
@@ -1,220 +1,220 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-date-picker 
-        @input="setValue('ActivitySchedule.Date', $event)"
-        :value="getValue('ActivitySchedule.Date')"
-        :disabled="!edit"
-        title="时间"
-      /> 
-      <l-input 
-        @input="setValue('ActivitySchedule.Address', $event)"
-        :value="getValue('ActivitySchedule.Address')"
-        :disabled="!edit"
-        title="地点"
-      /> 
-      <l-input 
-        @input="setValue('ActivitySchedule.Title', $event)"
-        :value="getValue('ActivitySchedule.Title')"
-        :disabled="!edit"
-        title="主题"
-      /> 
-      <l-textarea 
-        @input="setValue('ActivitySchedule.Content', $event)"
-        :value="getValue('ActivitySchedule.Content')"
-        :readonly="!edit"
-        title="内容"
-      /> 
-      <l-textarea 
-        @input="setValue('ActivitySchedule.Remark', $event)"
-        :value="getValue('ActivitySchedule.Remark')"
-        :readonly="!edit"
-        title="备注"
-      /> 
-    </view> 
-  
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> 
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-date-picker 
+        @input="setValue('ActivitySchedule.Date', $event)"
+        :value="getValue('ActivitySchedule.Date')"
+        :disabled="!edit"
+        title="时间"
+      /> 
+      <l-input 
+        @input="setValue('ActivitySchedule.Address', $event)"
+        :value="getValue('ActivitySchedule.Address')"
+        :disabled="!edit"
+        title="地点"
+      /> 
+      <l-input 
+        @input="setValue('ActivitySchedule.Title', $event)"
+        :value="getValue('ActivitySchedule.Title')"
+        :disabled="!edit"
+        title="主题"
+      /> 
+      <l-textarea 
+        @input="setValue('ActivitySchedule.Content', $event)"
+        :value="getValue('ActivitySchedule.Content')"
+        :readonly="!edit"
+        title="内容"
+      /> 
+      <l-textarea 
+        @input="setValue('ActivitySchedule.Remark', $event)"
+        :value="getValue('ActivitySchedule.Remark')"
+        :readonly="!edit"
+        title="备注"
+      /> 
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-20 09:25 
- * 描  述：活动安排 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-20 09:25 
+ * 描  述：活动安排 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/ActivitySchedule/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/ActivitySchedule/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        ActivitySchedule: { 
-          Date: { type: 'datetime', title: '时间', dateformat: '0' }, 
-          Address: { type: 'text', title: '地点' }, 
-          Title: { type: 'text', title: '主题' }, 
-          Content: { type: 'textarea', title: '内容' }, 
-          Remark: { type: 'textarea', title: '备注' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        ActivitySchedule: { 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/PersonnelManagement/ActivitySchedule/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/PersonnelManagement/ActivitySchedule/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementActivitySchedule-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/PersonnelManagement/ActivitySchedule/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementActivitySchedule-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        ActivitySchedule: { 
+          Date: { type: 'datetime', title: '时间', dateformat: '0' }, 
+          Address: { type: 'text', title: '地点' }, 
+          Title: { type: 'text', title: '主题' }, 
+          Content: { type: 'textarea', title: '内容' }, 
+          Remark: { type: 'textarea', title: '备注' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        ActivitySchedule: { 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/PersonnelManagement/ActivitySchedule/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/PersonnelManagement/ActivitySchedule/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementActivitySchedule-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/PersonnelManagement/ActivitySchedule/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementActivitySchedule-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
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 d896f6282..a455afd77 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	
@@ -1,301 +1,301 @@
 <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.Id"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">班级：</text> 
-              {{ displayListItem(item, 'ClassNo') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">日期：</text> 
-              {{ displayListItem(item, 'Date') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">标题：</text> 
-              {{ displayListItem(item, 'Title') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">工作内容：</text> 
-              {{ displayListItem(item, 'Content') }} 
-            </view> 
-  
-  
-            <l-customlist-action showEdit @edit="action('edit', item.Id)" showDelete @delete="action('delete', item.Id)" @view="action('view', item.Id)" /> 
-          </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-select 
-          v-model="queryData.ClassNo"
-          @change="searchChange"
-          :range="dataSource.ClassNo"
-          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> 
+  <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.Id"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">班级：</text> 
+              {{ displayListItem(item, 'ClassNo') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">日期：</text> 
+              {{ displayListItem(item, 'Date') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">标题：</text> 
+              {{ displayListItem(item, 'Title') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">工作内容：</text> 
+              {{ displayListItem(item, 'Content') }} 
+            </view> 
+  
+  
+            <l-customlist-action showEdit @edit="action('edit', item.Id)" showDelete @delete="action('delete', item.Id)" @view="action('view', item.Id)" /> 
+          </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-select 
+          v-model="queryData.ClassNo"
+          @change="searchChange"
+          :range="dataSource.ClassNo"
+          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-20 09:37 
- * 描  述：班级工作记事 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-20 09:37 
+ * 描  述：班级工作记事 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/ClassWork/list", "style": { "navigationBarTitleText": "表单列表页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/ClassWork/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: { 
-        ClassNo: { type: 'select', dataSource: '1', dataSourceId: 'bjsj,classname,classno' }, 
-        Date: { type: 'datetime', dateformat: '0' }, 
-        Title: { type: 'text' }, 
-        Content: { type: 'textarea' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-        ClassNo: '', 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        ClassNo: [], 
-      }, 
-  
-      // 时间查询参数 
-      dateRange: null, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('PersonnelManagementClassWork-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('PersonnelManagementClassWork-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-        this.FETCH_DATASOURCE('bjsj').then(result => { 
-          this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
-        }), 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/PersonnelManagement/ClassWork/pagelist', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    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('/PersonnelManagement/ClassWork/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 
-      } 
-    } 
-  
-  } 
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        ClassNo: { type: 'select', dataSource: '1', dataSourceId: 'bjsj,classname,classno' }, 
+        Date: { type: 'datetime', dateformat: '0' }, 
+        Title: { type: 'text' }, 
+        Content: { type: 'textarea' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+        ClassNo: '', 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        ClassNo: [], 
+      }, 
+  
+      // 时间查询参数 
+      dateRange: null, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('PersonnelManagementClassWork-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('PersonnelManagementClassWork-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+        this.FETCH_DATASOURCE('bjsj').then(result => { 
+          this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+        }), 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/PersonnelManagement/ClassWork/pagelist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    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/PersonnelManagement/ClassWork/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'; 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/single.vue
index 13df34af9..c87499251 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/single.vue	
@@ -1,218 +1,218 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-select 
-        @input="setValue('ClassWork.ClassNo', $event)"
-        :value="getValue('ClassWork.ClassNo')"
-        :disabled="!edit"
-        :range="dataSource.ClassWork.ClassNo"
-        title="班级"
-      /> 
-      <l-date-picker 
-        @input="setValue('ClassWork.Date', $event)"
-        :value="getValue('ClassWork.Date')"
-        :disabled="!edit"
-        title="日期"
-      /> 
-      <l-input 
-        @input="setValue('ClassWork.Title', $event)"
-        :value="getValue('ClassWork.Title')"
-        :disabled="!edit"
-        title="标题"
-      /> 
-      <l-textarea 
-        @input="setValue('ClassWork.Content', $event)"
-        :value="getValue('ClassWork.Content')"
-        :readonly="!edit"
-        title="工作内容"
-      /> 
-    </view> 
-  
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> 
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-select 
+        @input="setValue('ClassWork.ClassNo', $event)"
+        :value="getValue('ClassWork.ClassNo')"
+        :disabled="!edit"
+        :range="dataSource.ClassWork.ClassNo"
+        title="班级"
+      /> 
+      <l-date-picker 
+        @input="setValue('ClassWork.Date', $event)"
+        :value="getValue('ClassWork.Date')"
+        :disabled="!edit"
+        title="日期"
+      /> 
+      <l-input 
+        @input="setValue('ClassWork.Title', $event)"
+        :value="getValue('ClassWork.Title')"
+        :disabled="!edit"
+        title="标题"
+      /> 
+      <l-textarea 
+        @input="setValue('ClassWork.Content', $event)"
+        :value="getValue('ClassWork.Content')"
+        :readonly="!edit"
+        title="工作内容"
+      /> 
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-20 09:37 
- * 描  述：班级工作记事 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-20 09:37 
+ * 描  述：班级工作记事 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/ClassWork/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/ClassWork/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        ClassWork: { 
-          ClassNo: { type: 'select', title: '班级', dataSource: '1', dataSourceId: 'bjsj,classname,classno' }, 
-          Date: { type: 'datetime', title: '日期', dateformat: '0' }, 
-          Title: { type: 'text', title: '标题' }, 
-          Content: { type: 'textarea', title: '工作内容' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        ClassWork: { 
-          ClassNo: [], 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-        this.FETCH_DATASOURCE('bjsj').then(result => { 
-          this.dataSource.ClassWork.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
-        }), 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/PersonnelManagement/ClassWork/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/PersonnelManagement/ClassWork/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementClassWork-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/PersonnelManagement/ClassWork/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementClassWork-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        ClassWork: { 
+          ClassNo: { type: 'select', title: '班级', dataSource: '1', dataSourceId: 'bjsj,classname,classno' }, 
+          Date: { type: 'datetime', title: '日期', dateformat: '0' }, 
+          Title: { type: 'text', title: '标题' }, 
+          Content: { type: 'textarea', title: '工作内容' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        ClassWork: { 
+          ClassNo: [], 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+        this.FETCH_DATASOURCE('bjsj').then(result => { 
+          this.dataSource.ClassWork.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+        }), 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/PersonnelManagement/ClassWork/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/PersonnelManagement/ClassWork/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementClassWork-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/PersonnelManagement/ClassWork/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementClassWork-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityAttendance/Index/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityAttendance/Index/list.vue
new file mode 100644
index 000000000..99aac4102
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityAttendance/Index/list.vue	
@@ -0,0 +1,11 @@
+<template>
+	<view class="page">
+		该功能没有
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityInfo/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityInfo/list.vue
index ea38097c7..ea22c8d11 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityInfo/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityInfo/list.vue	
@@ -1,275 +1,275 @@
 <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.Id"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">社团编号：</text> 
-              {{ displayListItem(item, 'CommunityCode') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">社团名称：</text> 
-              {{ displayListItem(item, 'CommunityName') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">排序号：</text> 
-              {{ displayListItem(item, 'Sort') }} 
-            </view> 
+  <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.Id"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">社团编号：</text> 
+              {{ displayListItem(item, 'CommunityCode') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">社团名称：</text> 
+              {{ displayListItem(item, 'CommunityName') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">排序号：</text> 
+              {{ displayListItem(item, 'Sort') }} 
+            </view> 
 
-            <l-customlist-action showButton icontype='friendaddfill' buttonText='申请加入' @join="action('join',item.Id)"  @view="action('view', item.Id)" /> 
-          </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"> 
-  
-  
-        <!-- 重置查询条件按钮 --> 
-        <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> 
+            <l-customlist-action showButton icontype='friendaddfill' buttonText='申请加入' @join="action('join',item.Id)"  @view="action('view', item.Id)" /> 
+          </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"> 
+  
+  
+        <!-- 重置查询条件按钮 --> 
+        <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 16:08 
- * 描  述：社团管理 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-14 16:08 
+ * 描  述：社团管理 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/CommunityInfo/list", "style": { "navigationBarTitleText": "表单列表页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/CommunityInfo/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: { 
-        CommunityCode: { type: 'text' }, 
-        CommunityName: { type: 'text' }, 
-        Sort: { type: 'text' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-      }, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('PersonnelManagementCommunityCode-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('PersonnelManagementCommunityCode-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/PersonnelManagement/CommunityInfo/pagelist', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    pullDown() { 
-      this.refreshList().then(() => { 
-        this.$refs.list.stopPullDown() 
-      }) 
-    }, 
-  
-    // 设置搜索条件 
-    async searchChange() { 
-      const result = {} 
-  
-      // 将其他查询项添加到查询 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.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
-  
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        CommunityCode: { type: 'text' }, 
+        CommunityName: { type: 'text' }, 
+        Sort: { type: 'text' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+      }, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('PersonnelManagementCommunityCode-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('PersonnelManagementCommunityCode-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/PersonnelManagement/CommunityInfo/pagelist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    pullDown() { 
+      this.refreshList().then(() => { 
+        this.$refs.list.stopPullDown() 
+      }) 
+    }, 
+  
+    // 设置搜索条件 
+    async searchChange() { 
+      const result = {} 
+  
+      // 将其他查询项添加到查询 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.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 'join': 
-          if (!(await this.CONFIRM('申请加入', '确定要申请加入该社团吗？', true))) { 
-            return
-          } 
-  
-          this.HTTP_POST('/PersonnelManagement/CommunityInfo/join', id, '加入失败').then(success => { 
-            if(!success) { return } 
-            this.TOAST('加入成功', 'success') 
-            this.refreshList() 
-          }) 
-          return
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除该项吗？', true))) { 
-            return
-          } 
-  
-          this.HTTP_POST('/PersonnelManagement/CommunityInfo/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 
-      } 
-    } 
-  
-  } 
+          if (!(await this.CONFIRM('申请加入', '确定要申请加入该社团吗？', true))) { 
+            return
+          } 
+  
+          this.HTTP_POST('learun/adms/PersonnelManagement/CommunityInfo/join', id, '加入失败').then(success => { 
+            if(!success) { return } 
+            this.TOAST('加入成功', 'success') 
+            this.refreshList() 
+          }) 
+          return
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除该项吗？', true))) { 
+            return
+          } 
+  
+          this.HTTP_POST('learun/adms/PersonnelManagement/CommunityInfo/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'; 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityInfo/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityInfo/single.vue
index 637170782..be5740e52 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityInfo/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityInfo/single.vue	
@@ -1,206 +1,206 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-input 
-        @input="setValue('CommunityInfo.CommunityCode', $event)"
-        :value="getValue('CommunityInfo.CommunityCode')"
-        :disabled="!edit"
-        title="社团编号"
-      /> 
-      <l-input 
-        @input="setValue('CommunityInfo.CommunityName', $event)"
-        :value="getValue('CommunityInfo.CommunityName')"
-        :disabled="!edit"
-        title="社团名称"
-      /> 
-      <l-input 
-        @input="setValue('CommunityInfo.Sort', $event)"
-        :value="getValue('CommunityInfo.Sort')"
-        :disabled="!edit"
-        title="排序号"
-      /> 
-    </view> 
-  
-<!--     <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view>  -->
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-input 
+        @input="setValue('CommunityInfo.CommunityCode', $event)"
+        :value="getValue('CommunityInfo.CommunityCode')"
+        :disabled="!edit"
+        title="社团编号"
+      /> 
+      <l-input 
+        @input="setValue('CommunityInfo.CommunityName', $event)"
+        :value="getValue('CommunityInfo.CommunityName')"
+        :disabled="!edit"
+        title="社团名称"
+      /> 
+      <l-input 
+        @input="setValue('CommunityInfo.Sort', $event)"
+        :value="getValue('CommunityInfo.Sort')"
+        :disabled="!edit"
+        title="排序号"
+      /> 
+    </view> 
+  
+<!--     <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view>  -->
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-14 16:08 
- * 描  述：社团管理 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-14 16:08 
+ * 描  述：社团管理 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/CommunityCode/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/CommunityCode/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        CommunityInfo: { 
-          CommunityCode: { type: 'text', title: '社团编号' }, 
-          CommunityName: { type: 'text', title: '社团名称' }, 
-          Sort: { type: 'text', title: '排序号' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        CommunityInfo: { 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/PersonnelManagement/CommunityInfo/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/PersonnelManagement/CommunityInfo/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementCommunityCode-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/PersonnelManagement/CommunityInfo/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementCommunityCode-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        CommunityInfo: { 
+          CommunityCode: { type: 'text', title: '社团编号' }, 
+          CommunityName: { type: 'text', title: '社团名称' }, 
+          Sort: { type: 'text', title: '排序号' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        CommunityInfo: { 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/PersonnelManagement/CommunityInfo/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/PersonnelManagement/CommunityInfo/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementCommunityCode-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/PersonnelManagement/CommunityInfo/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementCommunityCode-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityMember/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityMember/list.vue
index ff0557eb5..840a0777c 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityMember/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CommunityMember/list.vue	
@@ -1,275 +1,265 @@
 <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.Id"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">社团编号：</text> 
-              {{ displayListItem(item, 'CommunityCode') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">社团名称：</text> 
-              {{ displayListItem(item, 'CommunityName') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">加入时间：</text> 
-              {{ displayListItem(item, 'JoinTime') }} 
-            </view> 
+  <view class="page"> 
+    <!-- 主列表页 --> 
+    <view :class="sideOpen ? 'show' : ''" class="mainpage" style="padding-top: 80rpx;"> 
+      <!-- 顶部条目/分页信息栏 --> 
+      <l-customlist-banner >{{ 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.Id"> 
+  
+            <!-- <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">社团编号：</text> 
+              {{ displayListItem(item, 'CommunityId') }}
+            </view> -->
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">社团名称：</text> 
+              {{ displayListItem(item, 'CommunityId') }}
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">加入时间：</text> 
+              {{ displayListItem(item, 'JoinTime') }}
+            </view> 
 
-            <l-customlist-action  @view="action('view', item.Id)" /> 
-          </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"> 
-  
-  
-        <!-- 重置查询条件按钮 --> 
-        <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> 
+            <!-- <l-customlist-action  @view="action('view', item.Id)" /> -->
+          </view> 
+        </l-customlist> 
+      </l-scroll-list> 
+    </view> 
+ 
+  
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-14 16:08 
- * 描  述：社团管理 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-14 16:08 
+ * 描  述：社团管理 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/CommunityInfo/list", "style": { "navigationBarTitleText": "表单列表页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/CommunityInfo/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: { 
-        CommunityCode: { type: 'text' }, 
-        CommunityName: { type: 'text' }, 
-        Sort: { type: 'text' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-      }, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('PersonnelManagementCommunityCode-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('PersonnelManagementCommunityCode-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/PersonnelManagement/CommunityInfo/communityMemberpagelist', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    pullDown() { 
-      this.refreshList().then(() => { 
-        this.$refs.list.stopPullDown() 
-      }) 
-    }, 
-  
-    // 设置搜索条件 
-    async searchChange() { 
-      const result = {} 
-  
-      // 将其他查询项添加到查询 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.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
-  
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        CommunityId: { type: 'select' }, 
+        CommunityName: { type: 'text' }, 
+        Sort: { type: 'text' }, 
+        JoinTime: { type: 'text' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+		  CommunityId: [],
+		  CommunityName: []
+      }, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('PersonnelManagementCommunityCode-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('PersonnelManagementCommunityCode-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+		this.FETCH_DATASOURCE('CommunityInfo').then(data => {
+			console.log(data)
+			this.dataSource.CommunityId = data.data.map(t => ({
+				text: t.communityname,
+				value: t.id
+			}));
+		}),
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/PersonnelManagement/CommunityInfo/communityMemberpagelist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    pullDown() { 
+      this.refreshList().then(() => { 
+        this.$refs.list.stopPullDown() 
+      }) 
+    }, 
+  
+    // 设置搜索条件 
+    async searchChange() { 
+      const result = {} 
+  
+      // 将其他查询项添加到查询 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.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 'join': 
-          if (!(await this.CONFIRM('申请加入', '确定要申请加入该社团吗？', true))) { 
-            return
-          } 
-  
-          this.HTTP_POST('/PersonnelManagement/CommunityInfo/join', id, '加入失败').then(success => { 
-            if(!success) { return } 
-            this.TOAST('加入成功', 'success') 
-            this.refreshList() 
-          }) 
-          return
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除该项吗？', true))) { 
-            return
-          } 
-  
-          this.HTTP_POST('/PersonnelManagement/CommunityInfo/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 
-      } 
-    } 
-  
-  } 
+          if (!(await this.CONFIRM('申请加入', '确定要申请加入该社团吗？', true))) { 
+            return
+          } 
+  
+          this.HTTP_POST('learun/adms/PersonnelManagement/CommunityInfo/join', id, '加入失败').then(success => { 
+            if(!success) { return } 
+            this.TOAST('加入成功', 'success') 
+            this.refreshList() 
+          }) 
+          return
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除该项吗？', true))) { 
+            return
+          } 
+  
+          this.HTTP_POST('learun/adms/PersonnelManagement/CommunityInfo/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'; 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ContactsDetails/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ContactsDetails/list.vue
index 3b4a55117..f2938646e 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ContactsDetails/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ContactsDetails/list.vue	
@@ -1,331 +1,331 @@
 <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.ID"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">姓名：</text> 
-              {{ displayListItem(item, 'Name') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">性别：</text> 
-              {{ displayListItem(item, 'Gender') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">联系方式：</text> 
-              {{ displayListItem(item, 'Mobile') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">身份证：</text> 
-              {{ displayListItem(item, 'IDCard') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">隔离方式：</text> 
-              {{ displayListItem(item, 'QTType') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">隔离地点：</text> 
-              {{ displayListItem(item, 'QTAddress') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">隔离时间：</text> 
-              {{ displayListItem(item, 'QTContactTime') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">是否发热：</text> 
-              {{ displayListItem(item, 'Fever') }} 
-            </view> 
-  
-  
-            <l-customlist-action showEdit @edit="action('edit', item.ID)" showDelete @delete="action('delete', item.ID)" @view="action('view', item.ID)" /> 
-          </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.Name"
-          @change="searchChange"
-          title ="姓名"
-          placeholder="按姓名查询"
-        /> 
-        <l-select 
-          v-model="queryData.Fever"
-          @change="searchChange"
-          :range="dataSource.Fever"
-          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> 
+  <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.ID"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">姓名：</text> 
+              {{ displayListItem(item, 'Name') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">性别：</text> 
+              {{ displayListItem(item, 'Gender') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">联系方式：</text> 
+              {{ displayListItem(item, 'Mobile') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">身份证：</text> 
+              {{ displayListItem(item, 'IDCard') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">隔离方式：</text> 
+              {{ displayListItem(item, 'QTType') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">隔离地点：</text> 
+              {{ displayListItem(item, 'QTAddress') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">隔离时间：</text> 
+              {{ displayListItem(item, 'QTContactTime') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">是否发热：</text> 
+              {{ displayListItem(item, 'Fever') }} 
+            </view> 
+  
+  
+            <l-customlist-action showEdit @edit="action('edit', item.ID)" showDelete @delete="action('delete', item.ID)" @view="action('view', item.ID)" /> 
+          </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.Name"
+          @change="searchChange"
+          title ="姓名"
+          placeholder="按姓名查询"
+        /> 
+        <l-select 
+          v-model="queryData.Fever"
+          @change="searchChange"
+          :range="dataSource.Fever"
+          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-21 09:49 
- * 描  述：疫情详细信息 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-21 09:49 
+ * 描  述：疫情详细信息 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/ContactsDetails/list", "style": { "navigationBarTitleText": "表单列表页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/ContactsDetails/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: { 
-        Name: { type: 'text' }, 
-        Gender: { type: 'select', itemCode: 'usersex', dataSource: '0' }, 
-        Mobile: { type: 'text' }, 
-        IDCard: { type: 'text' }, 
-        QTType: { type: 'select', itemCode: 'QuarantineType', dataSource: '0' }, 
-        QTAddress: { type: 'text' }, 
-        QTContactTime: { type: 'datetime', dateformat: '0' }, 
-        Fever: { type: 'select', itemCode: 'YesOrNoInt', dataSource: '0' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-        Name: '', 
-        Fever: '', 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        Gender: Object.values(this.GET_GLOBAL('dataDictionary').usersex).map(t => ({ value: t.value, text: t.text })), 
-        QTType: Object.values(this.GET_GLOBAL('dataDictionary').QuarantineType).map(t => ({ value: t.value, text: t.text })), 
-        Fever: Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoInt).map(t => ({ value: t.value, text: t.text })), 
-      }, 
-  
-      // 时间查询参数 
-      dateRange: null, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('PersonnelManagementContactsDetails-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('PersonnelManagementContactsDetails-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/PersonnelManagement/ContactsDetails/pagelist', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'ID', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    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('/PersonnelManagement/ContactsDetails/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 
-      } 
-    } 
-  
-  } 
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        Name: { type: 'text' }, 
+        Gender: { type: 'select', itemCode: 'usersex', dataSource: '0' }, 
+        Mobile: { type: 'text' }, 
+        IDCard: { type: 'text' }, 
+        QTType: { type: 'select', itemCode: 'QuarantineType', dataSource: '0' }, 
+        QTAddress: { type: 'text' }, 
+        QTContactTime: { type: 'datetime', dateformat: '0' }, 
+        Fever: { type: 'select', itemCode: 'YesOrNoInt', dataSource: '0' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+        Name: '', 
+        Fever: '', 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        Gender: Object.values(this.GET_GLOBAL('dataDictionary').usersex).map(t => ({ value: t.value, text: t.text })), 
+        QTType: Object.values(this.GET_GLOBAL('dataDictionary').QuarantineType).map(t => ({ value: t.value, text: t.text })), 
+        Fever: Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoInt).map(t => ({ value: t.value, text: t.text })), 
+      }, 
+  
+      // 时间查询参数 
+      dateRange: null, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('PersonnelManagementContactsDetails-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('PersonnelManagementContactsDetails-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/PersonnelManagement/ContactsDetails/pagelist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'ID', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    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/PersonnelManagement/ContactsDetails/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'; 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ContactsDetails/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ContactsDetails/single.vue
index 5dfa81f5a..2cbd79486 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ContactsDetails/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ContactsDetails/single.vue	
@@ -1,247 +1,247 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-input 
-        @input="setValue('ContactsDetails.Name', $event)"
-        :value="getValue('ContactsDetails.Name')"
-        :disabled="!edit"
-        title="姓名"
-      /> 
-      <l-select 
-        @input="setValue('ContactsDetails.Gender', $event)"
-        :value="getValue('ContactsDetails.Gender')"
-        :disabled="!edit"
-        :range="dataSource.ContactsDetails.Gender"
-        title="性别"
-      /> 
-      <l-input 
-        @input="setValue('ContactsDetails.Mobile', $event)"
-        :value="getValue('ContactsDetails.Mobile')"
-        :disabled="!edit"
-        title="联系方式"
-      /> 
-      <l-input 
-        @input="setValue('ContactsDetails.IDCard', $event)"
-        :value="getValue('ContactsDetails.IDCard')"
-        :disabled="!edit"
-        title="身份证"
-      /> 
-      <l-select 
-        @input="setValue('ContactsDetails.QTType', $event)"
-        :value="getValue('ContactsDetails.QTType')"
-        :disabled="!edit"
-        :range="dataSource.ContactsDetails.QTType"
-        title="隔离方式"
-      /> 
-      <l-input 
-        @input="setValue('ContactsDetails.QTAddress', $event)"
-        :value="getValue('ContactsDetails.QTAddress')"
-        :disabled="!edit"
-        title="隔离地点"
-      /> 
-      <l-date-picker 
-        @input="setValue('ContactsDetails.QTContactTime', $event)"
-        :value="getValue('ContactsDetails.QTContactTime')"
-        :disabled="!edit"
-        title="隔离时间"
-      /> 
-      <l-select 
-        @input="setValue('ContactsDetails.Fever', $event)"
-        :value="getValue('ContactsDetails.Fever')"
-        :disabled="!edit"
-        :range="dataSource.ContactsDetails.Fever"
-        title="是否发热"
-      /> 
-    </view> 
-  
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> 
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-input 
+        @input="setValue('ContactsDetails.Name', $event)"
+        :value="getValue('ContactsDetails.Name')"
+        :disabled="!edit"
+        title="姓名"
+      /> 
+      <l-select 
+        @input="setValue('ContactsDetails.Gender', $event)"
+        :value="getValue('ContactsDetails.Gender')"
+        :disabled="!edit"
+        :range="dataSource.ContactsDetails.Gender"
+        title="性别"
+      /> 
+      <l-input 
+        @input="setValue('ContactsDetails.Mobile', $event)"
+        :value="getValue('ContactsDetails.Mobile')"
+        :disabled="!edit"
+        title="联系方式"
+      /> 
+      <l-input 
+        @input="setValue('ContactsDetails.IDCard', $event)"
+        :value="getValue('ContactsDetails.IDCard')"
+        :disabled="!edit"
+        title="身份证"
+      /> 
+      <l-select 
+        @input="setValue('ContactsDetails.QTType', $event)"
+        :value="getValue('ContactsDetails.QTType')"
+        :disabled="!edit"
+        :range="dataSource.ContactsDetails.QTType"
+        title="隔离方式"
+      /> 
+      <l-input 
+        @input="setValue('ContactsDetails.QTAddress', $event)"
+        :value="getValue('ContactsDetails.QTAddress')"
+        :disabled="!edit"
+        title="隔离地点"
+      /> 
+      <l-date-picker 
+        @input="setValue('ContactsDetails.QTContactTime', $event)"
+        :value="getValue('ContactsDetails.QTContactTime')"
+        :disabled="!edit"
+        title="隔离时间"
+      /> 
+      <l-select 
+        @input="setValue('ContactsDetails.Fever', $event)"
+        :value="getValue('ContactsDetails.Fever')"
+        :disabled="!edit"
+        :range="dataSource.ContactsDetails.Fever"
+        title="是否发热"
+      /> 
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-21 09:49 
- * 描  述：疫情详细信息 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-21 09:49 
+ * 描  述：疫情详细信息 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/ContactsDetails/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/ContactsDetails/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        ContactsDetails: { 
-          Name: { type: 'text', title: '姓名' }, 
-          Gender: { type: 'select', title: '性别', itemCode: 'usersex', dataSource: '0' }, 
-          Mobile: { type: 'text', title: '联系方式' }, 
-          IDCard: { type: 'text', title: '身份证' }, 
-          QTType: { type: 'select', title: '隔离方式', itemCode: 'QuarantineType', dataSource: '0' }, 
-          QTAddress: { type: 'text', title: '隔离地点' }, 
-          QTContactTime: { type: 'datetime', title: '隔离时间', dateformat: '0' }, 
-          Fever: { type: 'select', title: '是否发热', itemCode: 'YesOrNoInt', dataSource: '0' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        ContactsDetails: { 
-          Gender: Object.values(this.GET_GLOBAL('dataDictionary').usersex).map(t => ({ value: t.value, text: t.text })), 
-          QTType: Object.values(this.GET_GLOBAL('dataDictionary').QuarantineType).map(t => ({ value: t.value, text: t.text })), 
-          Fever: Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoInt).map(t => ({ value: t.value, text: t.text })), 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/PersonnelManagement/ContactsDetails/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/PersonnelManagement/ContactsDetails/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementContactsDetails-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/PersonnelManagement/ContactsDetails/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementContactsDetails-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        ContactsDetails: { 
+          Name: { type: 'text', title: '姓名' }, 
+          Gender: { type: 'select', title: '性别', itemCode: 'usersex', dataSource: '0' }, 
+          Mobile: { type: 'text', title: '联系方式' }, 
+          IDCard: { type: 'text', title: '身份证' }, 
+          QTType: { type: 'select', title: '隔离方式', itemCode: 'QuarantineType', dataSource: '0' }, 
+          QTAddress: { type: 'text', title: '隔离地点' }, 
+          QTContactTime: { type: 'datetime', title: '隔离时间', dateformat: '0' }, 
+          Fever: { type: 'select', title: '是否发热', itemCode: 'YesOrNoInt', dataSource: '0' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        ContactsDetails: { 
+          Gender: Object.values(this.GET_GLOBAL('dataDictionary').usersex).map(t => ({ value: t.value, text: t.text })), 
+          QTType: Object.values(this.GET_GLOBAL('dataDictionary').QuarantineType).map(t => ({ value: t.value, text: t.text })), 
+          Fever: Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoInt).map(t => ({ value: t.value, text: t.text })), 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/PersonnelManagement/ContactsDetails/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/PersonnelManagement/ContactsDetails/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementContactsDetails-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/PersonnelManagement/ContactsDetails/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementContactsDetails-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue
index 95945126a..718a3a09e 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue	
@@ -1,206 +1,206 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-date-picker 
-        @input="setValue('DutySchedule.Date', $event)"
-        :value="getValue('DutySchedule.Date')"
-        :disabled="!edit"
-        title="时间"
-      /> 
-      <l-input 
-        @input="setValue('DutySchedule.Person', $event)"
-        :value="getValue('DutySchedule.Person')"
-        :disabled="!edit"
-        title="值班人"
-      /> 
-      <l-textarea 
-        @input="setValue('DutySchedule.Remark', $event)"
-        :value="getValue('DutySchedule.Remark')"
-        :readonly="!edit"
-        title="备注"
-      /> 
-    </view> 
-  
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> 
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-date-picker 
+        @input="setValue('DutySchedule.Date', $event)"
+        :value="getValue('DutySchedule.Date')"
+        :disabled="!edit"
+        title="时间"
+      /> 
+      <l-input 
+        @input="setValue('DutySchedule.Person', $event)"
+        :value="getValue('DutySchedule.Person')"
+        :disabled="!edit"
+        title="值班人"
+      /> 
+      <l-textarea 
+        @input="setValue('DutySchedule.Remark', $event)"
+        :value="getValue('DutySchedule.Remark')"
+        :readonly="!edit"
+        title="备注"
+      /> 
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-20 09:55 
- * 描  述：值班安排 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-20 09:55 
+ * 描  述：值班安排 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/DutySchedule/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/DutySchedule/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        DutySchedule: { 
-          Date: { type: 'datetime', title: '时间', dateformat: '0' }, 
-          Person: { type: 'text', title: '值班人' }, 
-          Remark: { type: 'textarea', title: '备注' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        DutySchedule: { 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/PersonnelManagement/DutySchedule/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/PersonnelManagement/DutySchedule/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementDutySchedule-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/PersonnelManagement/DutySchedule/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementDutySchedule-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        DutySchedule: { 
+          Date: { type: 'datetime', title: '时间', dateformat: '0' }, 
+          Person: { type: 'text', title: '值班人' }, 
+          Remark: { type: 'textarea', title: '备注' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        DutySchedule: { 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/PersonnelManagement/DutySchedule/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/PersonnelManagement/DutySchedule/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementDutySchedule-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/PersonnelManagement/DutySchedule/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementDutySchedule-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
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 6c919b334..919127a4e 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	
@@ -1,289 +1,289 @@
 <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.Id"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">报修编号：</text> 
-              {{ displayListItem(item, 'ApplyCode') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">报修人：</text> 
-              {{ displayListItem(item, 'ApplyUserId') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">报修内容：</text> 
-              {{ displayListItem(item, 'ApplyContent') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">报修时间：</text> 
-              {{ displayListItem(item, 'ApplyTime') }} 
-            </view> 
-  
-  
-            <l-customlist-action showEdit @edit="action('edit', item.Id)" showDelete @delete="action('delete', item.Id)" @view="action('view', item.Id)" /> 
-          </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"
-        /> 
-  
-  
-        <!-- 重置查询条件按钮 --> 
-        <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> 
+  <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.Id"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">报修编号：</text> 
+              {{ displayListItem(item, 'ApplyCode') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">报修人：</text> 
+              {{ displayListItem(item, 'ApplyUserId') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">报修内容：</text> 
+              {{ displayListItem(item, 'ApplyContent') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">报修时间：</text> 
+              {{ displayListItem(item, 'ApplyTime') }} 
+            </view> 
+  
+  
+            <l-customlist-action showEdit @edit="action('edit', item.Id)" showDelete @delete="action('delete', item.Id)" @view="action('view', item.Id)" /> 
+          </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"
+        /> 
+  
+  
+        <!-- 重置查询条件按钮 --> 
+        <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-20 11:11 
- * 描  述：掌上报修 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-20 11:11 
+ * 描  述：掌上报修 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/EmpRepair/list", "style": { "navigationBarTitleText": "表单列表页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/EmpRepair/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: { 
-        ApplyCode: { type: 'text' }, 
-        ApplyUserId: { type: 'organize', dataType: 'user' }, 
-        ApplyContent: { type: 'textarea' }, 
-        ApplyTime: { type: 'datetime', dateformat: '0' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-      }, 
-  
-      // 时间查询参数 
-      dateRange: null, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('PersonnelManagementEmpRepair-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('PersonnelManagementEmpRepair-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/PersonnelManagement/EmpRepair/pagelist', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    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('/PersonnelManagement/EmpRepair/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 
-      } 
-    } 
-  
-  } 
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        ApplyCode: { type: 'text' }, 
+        ApplyUserId: { type: 'organize', dataType: 'user' }, 
+        ApplyContent: { type: 'textarea' }, 
+        ApplyTime: { type: 'datetime', dateformat: '0' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+      }, 
+  
+      // 时间查询参数 
+      dateRange: null, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('PersonnelManagementEmpRepair-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('PersonnelManagementEmpRepair-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/PersonnelManagement/EmpRepair/pagelist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    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/PersonnelManagement/EmpRepair/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'; 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/single.vue
index bf49bc979..7f416bf18 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/single.vue	
@@ -1,214 +1,214 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-input 
-        @input="setValue('EmpRepair.ApplyCode', $event)"
-        :value="getValue('EmpRepair.ApplyCode')"
-        :disabled="!edit"
-        title="报修编号"
-      /> 
-      <l-organize-picker 
-        @input="setValue('EmpRepair.ApplyUserId', $event)"
-        :value="getValue('EmpRepair.ApplyUserId')"
-        :readonly="!edit"
-        type="user"
-        title="报修人"
-      /> 
-      <l-textarea 
-        @input="setValue('EmpRepair.ApplyContent', $event)"
-        :value="getValue('EmpRepair.ApplyContent')"
-        :readonly="!edit"
-        title="报修内容"
-      /> 
-      <l-date-picker 
-        @input="setValue('EmpRepair.ApplyTime', $event)"
-        :value="getValue('EmpRepair.ApplyTime')"
-        :disabled="!edit"
-        title="报修时间"
-      /> 
-    </view> 
-  
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> 
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-input 
+        @input="setValue('EmpRepair.ApplyCode', $event)"
+        :value="getValue('EmpRepair.ApplyCode')"
+        :disabled="!edit"
+        title="报修编号"
+      /> 
+      <l-organize-picker 
+        @input="setValue('EmpRepair.ApplyUserId', $event)"
+        :value="getValue('EmpRepair.ApplyUserId')"
+        :readonly="!edit"
+        type="user"
+        title="报修人"
+      /> 
+      <l-textarea 
+        @input="setValue('EmpRepair.ApplyContent', $event)"
+        :value="getValue('EmpRepair.ApplyContent')"
+        :readonly="!edit"
+        title="报修内容"
+      /> 
+      <l-date-picker 
+        @input="setValue('EmpRepair.ApplyTime', $event)"
+        :value="getValue('EmpRepair.ApplyTime')"
+        :disabled="!edit"
+        title="报修时间"
+      /> 
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-20 11:11 
- * 描  述：掌上报修 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-20 11:11 
+ * 描  述：掌上报修 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/EmpRepair/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/EmpRepair/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        EmpRepair: { 
-          ApplyCode: { type: 'text', title: '报修编号' }, 
-          ApplyUserId: { type: 'organize', title: '报修人', dataType: 'user' }, 
-          ApplyContent: { type: 'textarea', title: '报修内容' }, 
-          ApplyTime: { type: 'datetime', title: '报修时间', dateformat: '0' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        EmpRepair: { 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/PersonnelManagement/EmpRepair/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/PersonnelManagement/EmpRepair/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementEmpRepair-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/PersonnelManagement/EmpRepair/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementEmpRepair-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        EmpRepair: { 
+          ApplyCode: { type: 'text', title: '报修编号' }, 
+          ApplyUserId: { type: 'organize', title: '报修人', dataType: 'user' }, 
+          ApplyContent: { type: 'textarea', title: '报修内容' }, 
+          ApplyTime: { type: 'datetime', title: '报修时间', dateformat: '0' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        EmpRepair: { 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/PersonnelManagement/EmpRepair/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/PersonnelManagement/EmpRepair/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementEmpRepair-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/PersonnelManagement/EmpRepair/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementEmpRepair-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EpidemicSituationCopy/from.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EpidemicSituationCopy/from.vue
new file mode 100644
index 000000000..fd74a8d1d
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EpidemicSituationCopy/from.vue	
@@ -0,0 +1,515 @@
+<template>
+	<view class="page">
+		<l-select :disabled="disabled" v-model="queryData.Creater" :range="dataSource.Creater" title="填报人员" :placeholder="title.Creater" />
+		<l-date-picker v-model="queryData.CreateTime" title="填报时间" placeholder="" :end="todayTime" />
+		<l-select v-model="queryData.Type" :range="dataSource.Type" title="类别" placeholder="请选择" />
+		<l-select v-if="!DepartFlag" v-model="queryData.Department" :range="dataSource.Department" title="所在部门" placeholder="请选择" />
+		<l-input v-if="DepartFlag" v-model="queryData.StudentSource" title="所在班级" placeholder="请填写所在班级" right />
+		<l-select v-model="queryData.HealthSituation" :range="dataSource.HealthSituation" title="健康状况" placeholder="请选择" />
+		<l-select v-model="queryData.Gender" :range="dataSource.Gender" title="性别" placeholder="请选择" />
+		<l-input v-model="queryData.HomeAddress" title="家庭住址" placeholder="请填写家庭住址" right />
+		<l-input v-model="queryData.Mobile" title="联系方式" placeholder="请填写联系方式" right />
+		<l-input v-model="queryData.Objective" title="当前地址" placeholder="请填写当前地址" right />
+		<l-select v-model="queryData.IsOut" :range="dataSource.YesOrNoInt" title="*是否外出" placeholder="请选择" @change="change('PassPlaces')" />
+		<view class="checkInBox" v-show="queryData.IsOut == 1">
+			<view class="checkInCon" v-for="(item, i) in queryData.PassPlaces" :key="item.Time">
+				<view class="checkInT">
+					经过地点记录（{{ i + 1 }}）
+					<text @click="remove('PassPlaces', i)" class="remove" v-show="queryData.PassPlaces.length > 1">删除</text>
+				</view>
+				<l-select v-model="item.PassType" :range="dataSource.EpiPassType" title="类别" placeholder="请选择" />
+				<location-picker v-model="item.ProvinceArea" :code="item.ProvinceArea"></location-picker>
+				<l-input v-model="item.Address" title="详细住址" placeholder="请填写详细住址" right />
+				<l-datetime-picker v-model="item.Time" title="隔离时间" />
+				<l-select v-model="item.Vehicle" :range="dataSource.Vehicle" title="交通工具" placeholder="请选择交通工具" />
+				<l-input v-model="item.VehicleNo" title="班次号" placeholder="请填写班次号" right />
+			</view>
+			<view class="checkInBtn" @click="add('PassPlaces')">
+				<text class="text-xxl cuIcon cuIcon-add"></text>
+				增加经过地点记录
+			</view>
+		</view>
+		<l-select v-model="queryData.HasFamily" :range="dataSource.YesOrNoInt" title="*家人异常" placeholder="请选择" @change="change('ContactsDetails')" />
+		<view class="checkInBox" v-show="queryData.HasFamily == 1">
+			<view class="checkInCon" v-for="(item, i) in queryData.ContactsDetails" :key="item.QTTime">
+				<view class="checkInT">
+					接触家人（{{ i + 1 }}）
+					<text @click="remove('ContactsDetails', i)" class="remove" v-show="queryData.ContactsDetails.length > 1">删除</text>
+				</view>
+				<l-input v-model="item.Name" title="名字" placeholder="请填写名字" right />
+				<l-select v-model="item.Gender" :range="dataSource.Gender" title="性别" placeholder="请选择性别" />
+				<l-input v-model="item.Mobile" title="联系方式" placeholder="请填写联系方式" right />
+				<l-select v-model="item.QTType" :range="dataSource.QTType" title="隔离方式" placeholder="请选择隔离方式" />
+				<location-picker v-model="item.ProvinceArea" :code="item.ProvinceArea"></location-picker>
+				<l-input v-model="item.QTAddress" title="隔离地点" placeholder="请填写隔离地点" right />
+				<l-datetime-picker v-model="item.QTTime" title="隔离时间" />
+				<l-datetime-picker v-model="item.QTContactTime" title="接触隔离时间" />
+				<l-select v-model="item.Fever" :range="dataSource.HealthSituation" title="健康状况" placeholder="请选择健康状况" />
+			</view>
+			<view class="checkInBtn" @click="add('ContactsDetails')">
+				<text class="text-xxl cuIcon cuIcon-add"></text>
+				增加接触家人
+			</view>
+		</view>
+		<l-select v-model="queryData.HasPeople" :range="dataSource.YesOrNoInt" title="*疫区人异常" placeholder="请选择" @change="change('PeopleDetails')" />
+		<view class="checkInBox" v-show="queryData.HasPeople == 1">
+			<view class="checkInCon" v-for="(item, i) in queryData.PeopleDetails" :key="item.QTTime">
+				<view class="checkInT">
+					接触人（{{ i + 1 }}）
+					<text @click="remove('PeopleDetails', i)" class="remove" v-show="queryData.PeopleDetails.length > 1">删除</text>
+				</view>
+				<l-input v-model="item.Name" title="名字" placeholder="请填写名字" right />
+				<l-select v-model="item.Gender" :range="dataSource.Gender" title="性别" placeholder="请选择性别" />
+				<l-input v-model="item.Mobile" title="联系方式" placeholder="请填写联系方式" right />
+				<l-select v-model="item.QTType" :range="dataSource.QTType" title="隔离方式" placeholder="请选择隔离方式" />
+				<location-picker v-model="item.ProvinceArea" :code="item.ProvinceArea"></location-picker>
+				<l-input v-model="item.QTAddress" title="隔离地点" placeholder="请填写隔离地点" right />
+				<l-datetime-picker v-model="item.QTTime" title="隔离时间" />
+				<l-datetime-picker v-model="item.QTContactTime" title="接触隔离时间" />
+				<l-select v-model="item.Fever" :range="dataSource.HealthSituation" title="健康状况" placeholder="请选择健康状况" />
+			</view>
+			<view class="checkInBtn" @click="add('PeopleDetails')">
+				<text class="text-xxl cuIcon cuIcon-add"></text>
+				增加接触人
+			</view>
+		</view>
+		<view class="btn" @click="submit">{{ submitTxt}}</view>
+	</view>
+</template>
+
+<script>
+import moment from 'moment';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import todayTime from '@/common/js/todayTime.js';
+import locationPicker from '@/components/location/location.vue';
+export default {
+	components: {
+		locationPicker
+	},
+	data() {
+		return {
+			scheme: {
+				Creater: {
+					type: 'select',
+					dataSource: '1',
+					dataSourceId: 'BaseUser,f_realname,f_userid'
+				}
+			},
+			title:{
+				Creater: '请选择...',
+			},
+			disabled: false,
+			submitTxt: '',
+			select3: '0',
+			pageInfo: null,
+			userInfo: null,
+			todayTime: todayTime.fmtDate().ymd,
+			DepartFlag: true,
+			//下拉
+			dataSource: {
+				Creater: [],
+				Type: [],
+				HealthSituation: [],
+				Gender: [],
+				YesOrNoInt: [],
+				Department: [],
+				EpiPassType: [],
+				Vehicle: [],
+				QTType: [],
+				PassPlaces: {
+					EpiPassType: '',
+					ProvinceArea: '',
+					Address: '',
+					Time: '',
+					Vehicle: '',
+					VehicleNo: ''
+				},
+				ContactsDetails: {
+					Name: '',
+					Gender: '',
+					Mobile: '',
+					QTType: '',
+					ProvinceArea: '',
+					QTAddress: '',
+					QTTime: '',
+					QTContactTime: '',
+					Fever: ''
+				},
+				PeopleDetails: {
+					Name: '',
+					Gender: '',
+					Mobile: '',
+					QTType: '',
+					ProvinceArea: '',
+					QTAddress: '',
+					QTTime: '',
+					QTContactTime: '',
+					Fever: ''
+				}
+			},
+			queryData: {
+				keyValue: '',
+				Creater: '',
+				Type: '',
+				Department: '',
+				CreateTime: todayTime.fmtDate().ymd,
+				StudentSource: '',
+				HealthSituation: '',
+				Gender: '',
+				HomeAddress: '',
+				Mobile: '',
+				Objective: '',
+				IsOut: '',
+				PassPlaces: [
+					{
+						PassType: '',
+						ProvinceArea: '',
+						Address: '',
+						Time: '',
+						Vehicle: '',
+						VehicleNo: ''
+					}
+				],
+				HasFamily: '',
+				ContactsDetails: [
+					{
+						Name: '',
+						Gender: '',
+						Mobile: '',
+						QTType: '',
+						ProvinceArea: '',
+						QTAddress: '',
+						QTTime: '',
+						QTContactTime: '',
+						Fever: ''
+					}
+				],
+				HasPeople: '',
+				PeopleDetails: [
+					{
+						Name: '',
+						Gender: '',
+						Mobile: '',
+						QTType: '',
+						ProvinceArea: '',
+						QTAddress: '',
+						QTTime: '',
+						QTContactTime: '',
+						Fever: ''
+					}
+				]
+			}
+		};
+	},
+	methods: {
+		async init() {
+			let _this = this;
+			// 拉取加载列表和数据源
+			await Promise.all([
+				this.FETCH_DATASOURCE('classdata').then(data => {
+					//console.log(data)
+					this.dataSource.Department = data.data.map(t => ({
+						text: t.f_fullname,
+						value: t.f_parentid
+					}));
+				}),
+				this.FETCH_DATASOURCE('BaseUser').then(data => {
+					// console.log(data)
+					this.dataSource.Creater = data.data.map(t => ({
+						text: t.f_realname,
+						value: t.f_userid
+					}));
+				}),
+		
+				() => {}
+			]);
+		
+			let dataDictionary = this.GET_GLOBAL('dataDictionary');
+			this.dataSource.Type = Object.values(dataDictionary.EUserType).map(t => ({ value: t.value, text: t.text }));
+			this.dataSource.HealthSituation = Object.values(dataDictionary.EpiHealth).map(t => ({ value: t.value, text: t.text }));
+			this.dataSource.Gender = Object.values(dataDictionary.usersex).map(t => ({ value: t.value, text: t.text }));
+			this.dataSource.YesOrNoInt = Object.values(dataDictionary.YesOrNoInt).map(t => ({ value: t.value, text: t.text }));
+			this.dataSource.EpiPassType = Object.values(dataDictionary.EpiPassType).map(t => ({ value: t.value, text: t.text }));
+			this.dataSource.Vehicle = Object.values(dataDictionary.Vehicle).map(t => ({ value: t.value, text: t.text }));
+			this.dataSource.QTType = Object.values(dataDictionary.QuarantineType).map(t => ({ value: t.value, text: t.text }));
+			// console.log(this.dataSource.YesOrNoInt);
+		
+			// 拉取加载列表和数据源
+			_this.pageInfo = _this.GET_PARAM(); //获取页面传递参数
+			// console.log(_this.pageInfo);
+			_this.queryData.keyValue = _this.pageInfo.keyValue;
+			_this.userInfo = _this.GET_GLOBAL('loginUser');
+			// console.log(_this.userInfo);
+			//新建时获取登陆人信息
+			if (_this.pageInfo.type == 'add') {
+				_this.submitTxt = '提交';
+				_this.dataSource.Creater = [
+					{
+						text: _this.userInfo.realName,
+						value: _this.userInfo.userId
+					}
+				];
+		
+				_this.queryData.Creater = _this.userInfo.userId;
+				_this.queryData.Department = _this.userInfo.departmentId;
+				_this.queryData.Gender = JSON.stringify(_this.userInfo.gender);
+				_this.queryData.Mobile = _this.userInfo.mobile;
+				_this.queryData.IsOut = '0';
+				_this.queryData.HasFamily = '0';
+				_this.queryData.HasPeople = '0';
+				_this.queryData.HealthSituation = '0';
+		
+				//定位
+				// $page.find('#Objective').val(returnCitySN.cname)
+				if (_this.userInfo.Description == '学生') {
+					_this.queryData.Type = '5';
+					_this.LOADING('加载数据中…');
+					_this.HTTP_GET('learun/PersonnelManagement/EpidemicSituationCopy/getStuSource', _this.userInfo.account, '加载数据时出错').then(data => {
+						this.HIDE_LOADING();
+						if (data) {
+							_this.queryData.HomeAddress = data.Address;
+							_this.queryData.StudentSource = data.res;
+						}
+					});
+				} else {
+					_this.LOADING('加载数据中…');
+					_this.HTTP_GET('learun/PersonnelManagement/EpidemicSituationCopy/getUserSource', _this.userInfo.userId, '加载数据时出错').then(data => {
+						this.HIDE_LOADING();
+						if (data) {
+							_this.queryData.HomeAddress = data.Address;
+						}
+					});
+				}
+		
+				if (_this.userInfo.Description != '学生') {
+					_this.DepartFlag = false;
+				}
+			}else{
+				_this.LOADING('加载数据中…');
+				_this.HTTP_GET('learun/PersonnelManagement/EpidemicSituationCopy/form', _this.pageInfo.keyValue, '加载数据时出错').then(data => {
+					this.HIDE_LOADING();
+					if (data) {
+						console.log(data)
+						// data.EpidemicSituation.forEach((n, i) => {
+						// 	console.log(i)
+						// })
+						_this.disabled = 'disabled';
+						for(let j in data.EpidemicSituation){
+							// console.log(j)
+							let txt = data.EpidemicSituation[j];
+							_this.queryData[j] = txt;
+						}
+						if(data.EpidemicSituation.IsOut == 1){
+							_this.queryData.PassPlaces.length = 0;
+							_this.queryData.PassPlaces = this.COPY(data.PassPlaces);
+							_this.queryData.PassPlaces.forEach((n,i)=>{
+								n.ProvinceArea = n.Province + ',' + n.City + ',' + n.Area;
+								for(let j in n){
+									if(typeof n[j] == 'number'){
+										n[j] = JSON.stringify(n[j]);
+									}
+								}
+							})
+						}
+						if(data.EpidemicSituation.HasPeople == 1){
+							_this.queryData.PeopleDetails.length = 0;
+							_this.queryData.PeopleDetails = this.COPY(data.PeopleDetails);
+							_this.queryData.PeopleDetails.forEach((n,i)=>{
+								n.ProvinceArea = n.Province + ',' + n.City + ',' + n.Area;
+								for(let j in n){
+									if(typeof n[j] == 'number'){
+										n[j] = JSON.stringify(n[j]);
+									}
+								}
+							})
+						}
+						if(data.EpidemicSituation.HasFamily == 1){
+							_this.queryData.ContactsDetails.length = 0;
+							_this.queryData.ContactsDetails = this.COPY(data.ContactsDetails);
+							_this.queryData.ContactsDetails.forEach((n,i)=>{
+								n.ProvinceArea = n.Province + ',' + n.City + ',' + n.Area;
+								for(let j in n){
+									if(typeof n[j] == 'number'){
+										n[j] = JSON.stringify(n[j]);
+									}
+								}
+							})
+						}
+						_this.queryData.Department = JSON.stringify(_this.queryData.Department);
+						_this.queryData.Gender = JSON.stringify(_this.userInfo.gender);
+						_this.queryData.IsOut = JSON.stringify(_this.queryData.IsOut);
+						_this.queryData.HasFamily = JSON.stringify(_this.queryData.HasFamily);
+						_this.queryData.HasPeople = JSON.stringify(_this.queryData.HasPeople);
+						_this.queryData.Type = JSON.stringify(_this.queryData.Type);
+						_this.title.Creater = _this.displayListItem({Creater: _this.queryData.Creater}, 'Creater');
+						
+						
+						console.log(_this.queryData)
+					}
+				});
+				_this.submitTxt = '修改';
+			}
+		},
+		change(e) {
+			//console.log(e);
+		},
+		submit() {
+			console.log(this.queryData);
+			let _postData = {};
+			_postData.keyValue = this.pageInfo.keyValue;
+			let pageForm = {
+				Creater: this.queryData.Creater,
+				CreateTime: this.queryData.CreateTime,
+				Type: this.queryData.Type,
+				Department: this.queryData.Department,
+				StudentSource: this.queryData.StudentSource,
+				HealthSituation: this.queryData.HealthSituation,
+				Gender: this.queryData.Gender,
+				HomeAddress: this.queryData.HomeAddress,
+				Mobile: this.queryData.Mobile,
+				Objective: this.queryData.Objective,
+				IsOut: this.queryData.IsOut,
+				HasFamily: this.queryData.HasFamily,
+				HasPeople: this.queryData.HasPeople,
+				Provice: this.queryData.Provice,
+				OutArea: this.queryData.OutArea,
+				City: this.queryData.City
+			};
+			if (this.queryData.IsOut == 1) {
+				console.log(this.queryData.PeopleDetails)
+				pageForm.Provice = '';
+				pageForm.OutArea = '';
+				pageForm.City = '';
+
+				this.queryData.PassPlaces.forEach((n, i) => {
+					let areaInfo = n.ProvinceArea.split(',');
+					n.Province = areaInfo[0];
+					n.City = areaInfo[1];
+					n.Area = areaInfo[2];
+				});
+				_postData.strpassPlaceList = JSON.stringify(this.queryData.PassPlaces);
+			} else {
+				_postData.strpassPlaceList = '[]';
+			}
+			if (this.queryData.HasPeople == 1) {
+				console.log(this.queryData.PeopleDetails)
+				this.queryData.PeopleDetails.forEach((n, i) => {
+					let areaInfo = n.ProvinceArea.split(',');
+					n.Province = areaInfo[0];
+					n.City = areaInfo[1];
+					n.Area = areaInfo[2];
+				});
+				_postData.strpeopleDetailsList = JSON.stringify(this.queryData.PeopleDetails);
+			} else {
+				_postData.strpeopleDetailsList = '[]';
+			}
+
+			if (this.queryData.HasFamily == 1) {
+				console.log(this.queryData.ContactsDetails)
+				this.queryData.ContactsDetails.forEach((n, i) => {
+					let areaInfo = n.ProvinceArea.split(',');
+					n.Province = areaInfo[0];
+					n.City = areaInfo[1];
+					n.Area = areaInfo[2];
+				});
+				_postData.strcontactsDetailsList = JSON.stringify(this.queryData.ContactsDetails);
+			} else {
+				_postData.strcontactsDetailsList = '[]';
+			}
+			_postData.strEntity = JSON.stringify(pageForm);
+			// console.log(this.queryData);
+			// console.log(_postData);
+			var _this = this;
+			this.LOADING('正在提交数据…');
+			this.HTTP_POST('learun/PersonnelManagement/EpidemicSituationCopy/save', _postData, '加载数据时出错').then(data => {
+				this.HIDE_LOADING();
+				if (data) {
+					// _this.$parent.refreshList();
+					// console.log(data)
+					this.EMIT('EpidemicSituationCopy') 
+					this.NAV_BACK()
+					this.TOAST('提交保存成功', 'success') 
+				}
+			});
+		},
+		add(str) {
+			let json = this.COPY(this.dataSource[str]);
+			this.queryData[str].push(json);
+		},
+		remove(str, i) {
+			this.CONFIRM('删除', '确定删除该条数据吗', true).then(res => {
+				if (res) {
+					this.queryData[str].splice(i, 1);
+				}
+			});
+		},
+		// 显示列表中的标题项
+		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;
+			}
+		}
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/common/css/sidepage.less';
+@import '~@/common/css/customlist.less';
+@import '~@/common/css/common.less';
+
+.checkInT {
+	padding: 0.5px 15px;
+	line-height: 40px;
+	font-size: 12px;
+}
+.checkInBtn {
+	text-align: center;
+	line-height: 40px;
+	color: @pubColor;
+	background-color: #fff;
+	border-bottom: 0.5px solid #eee;
+}
+.checkInBtn text {
+	position: relative;
+	top: 2px;
+	margin-right: 5px;
+	font-size: 20px;
+}
+.remove {
+	float: right;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EpidemicSituationCopy/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EpidemicSituationCopy/list.vue
new file mode 100644
index 000000000..81d6c9d6b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EpidemicSituationCopy/list.vue	
@@ -0,0 +1,336 @@
+<template>
+	<view class="page">
+		<!-- 主列表页 -->
+		<view :class="sideOpen ? 'show' : ''" class="mainpage" style="padding-top: 80rpx">
+			<!-- 顶部条目/分页信息栏 -->
+			<l-customlist-banner @buttonClick="sideOpen = true">
+				共
+				<text class="records">{{ records }}</text>
+				数据
+			</l-customlist-banner>
+
+			<!-- 滚动列表，跨端支持上拉/下拉 -->
+			<l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list">
+				<l-customlist :tips="loadState" showTips>
+					<view class=""></view>
+					<!-- 单条记录 -->
+					<view class="pageBox customlist-item" showDelete="true" v-for="(item, ind) in list" :key="item.MakeDate" @click="action('view', item.ID)">
+						<view class="">
+							<text>填表人员:</text>
+							{{ displayListItem(item, 'Creater') }}
+						</view>
+						<view class="">
+							<text>填报时间:</text>
+							<!-- {{ item.CreateTime }} -->
+							{{ displayListItem(item, 'CreateTime') }}
+						</view>
+						<view class="listBtn" @click.stop="action('delete', item.ID)">删除</view>
+					</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-input v-model="queryData.Creater" title="填表人员" placeholder="请填写填表人员" right />
+				<l-select v-model="queryData.Type" :range="dataSource.Type" title="类别" placeholder="按类别查询" />
+				<l-input v-model="queryData.UnitName" title="单位名称" placeholder="请填写单位名称" right />
+				<l-input v-model="queryData.StudentSource" title="系专业班级" placeholder="请填写系专业班级" right />
+				<!-- 重置查询条件按钮 -->
+				<view class="padding-tb"><l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button></view>
+				<view class="padding-tb"><l-button @click="searchChange" 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-12 17:22
+ * 描  述：班级自诊打卡
+ */
+
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/EducationalAdministration/Thermography/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 {
+			user: null,
+			// 数据项的数据类型、结构
+			scheme: {
+				Creater: {
+					type: 'select',
+					dataSource: '1',
+					dataSourceId: 'BaseUser,f_realname,f_userid'
+				},
+				CreateTime: {
+					type: 'text'
+				}
+			},
+
+			// 查询条件
+			searchData: {
+				MeasurerID: this.GET_GLOBAL('loginUser').account
+			},
+			defaultQueryData: {},
+			queryData: {
+				Creater: '',
+				Type: '',
+				UnitName: '',
+				StudentSource: ''
+			},
+
+			// 数据源
+			dataSource: {
+				Creater: '',
+				Type: Object.values(this.GET_GLOBAL('dataDictionary').EUserType).map(t => ({ value: t.value, text: t.text }))
+			},
+
+			// 时间查询参数
+			dateRange: null,
+
+			// 页面相关参数
+			ready: false,
+			tips: '加载中...',
+			loadState: '向下翻以加载更多',
+			sideOpen: false,
+
+			// 列表与分页信息
+			page: 1,
+			total: 2,
+			rows: 10,
+			list: [],
+			// records: '加载中...',
+			records: 0,
+			multipleData: null
+		};
+	},
+
+	async onLoad() {
+		await this.init();
+	},
+	onUnload() {
+		this.OFF('EpidemicSituationCopy');
+	},
+
+	methods: {
+		// 页面初始化
+		async init() {
+			this.ON('EpidemicSituationCopy', this.refreshList);
+			this.user = this.GET_GLOBAL('loginUser');
+			// this.queryData.Creater = this.user.userId
+			// 拉取加载列表和数据源
+			await Promise.all([
+				this.FETCH_DATASOURCE('BaseUser').then(data => {
+					// console.log(data)
+					this.dataSource.Creater = data.data.map(t => ({
+						text: t.f_realname,
+						value: t.f_userid
+					}));
+				}),
+
+				() => {}
+			]);
+			// console.log(this.page)
+			// console.log(this.dataSource.Type);
+			this.fetchList();
+			// 初始化查询条件
+			this.defaultQueryData = this.COPY(this.queryData);
+			this.ready = true;
+		},
+
+		// 拉取列表
+		async fetchList() {
+			// console.log(this.page)
+			// console.log(this.total)
+			this.sideOpen = false;
+			if (this.page > this.total) {
+				return;
+			}
+			let _this = this;
+			let _postParam = {
+				pagination: {
+					rows: _this.rows,
+					page: _this.page,
+					sidx: 'ID',
+					sord: 'DESC'
+				},
+				queryJson: '{}'
+			};
+			if(_this.queryData.Creater.length != 0){
+				_postParam.queryJson = JSON.stringify(_this.queryData);
+			}else{
+				_postParam.queryJson = JSON.stringify({ Creater: _this.user.userId });
+			}
+			// console.log(_this.user)
+			_this.LOADING('加载数据中…');
+			// _this.HIDE_LOADING();
+			_this.HTTP_GET('learun/PersonnelManagement/EpidemicSituationCopy/pagelist', _postParam, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				// console.log(res);
+				_this.list = _this.list.concat(res.rows);
+				_this.total = res.total;
+				_this.records = res.records;
+				_this.page = res.page + 1;
+				_this.loadState = res.page >= res.total ? '已加载所有项目' : '向下翻以加载更多';
+				// console.log(_this.list);
+			});
+		},
+
+		// 刷新清空列表
+		async refreshList() {
+			this.page = 1;
+			this.total = 2;
+			this.list = [];
+
+			await this.fetchList();
+		},
+
+		// 列表下拉
+		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 中
+			// this.multipleData = data || {};
+			console.log(this.queryData)
+			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('./from', {type: 'view', keyValue: id}, true);
+					return;
+
+				case 'add':
+					this.NAV_TO('./from', {type: 'add'}, true);
+					return;
+
+				case 'delete':
+					if (!(await this.CONFIRM('删除项目', '确定要删除该数据吗？', true))) {
+						return;
+					}
+					this.LOADING('删除数据中…');
+					// _this.HIDE_LOADING();
+					this.HTTP_POST('learun/PersonnelManagement/EpidemicSituationCopy/delete', id, '删除失败').then(success => {
+						if (!success) {
+							return;
+						}
+						this.HIDE_LOADING();
+						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';
+@import '~@/common/css/common.less';
+.records {
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	background-color: @pubColor;
+	border-radius: 50%;
+	color: #fff;
+	font-size: 12px;
+	line-height: 16px;
+	text-align: center;
+	margin: 0 5px;
+}
+.listBtn{
+	background-color: @pubColor;
+	border-radius: 3px;
+	display: inline-block;
+	padding: 3px 10px;
+	color: #fff;
+	margin-top: 5px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue
new file mode 100644
index 000000000..aae48d1d6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue	
@@ -0,0 +1,378 @@
+<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.Id">
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">会议主题：</text>
+              {{ displayListItem(item, "MeetingTitle") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">会议地点：</text>
+              {{ displayListItem(item, "MeetingPlace") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">开始时间：</text>
+              {{ displayListItem(item, "BeginTime") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">结束时间：</text>
+              {{ displayListItem(item, "EndTime") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">申请人：</text>
+              {{ displayListItem(item, "CreateUser") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">会议记录者：</text>
+              {{ displayListItem(item, "RecordPerson") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">会议内容：</text>
+              {{ displayListItem(item, "Content") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">附件上传：</text>
+              {{ displayListItem(item, "Files") }}
+            </view>
+
+            <l-customlist-action
+              showButton
+              buttonText="会议纪要"
+              @join="action('join', item.Id)"
+              showEdit
+              @edit="action('edit', item.Id)"
+              showDelete
+              @delete="action('delete', item.Id)"
+              @view="action('view', item.Id)"
+            />
+          </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-input
+          v-model="queryData.MeetingTitle"
+          @change="searchChange"
+          title="会议主题"
+          placeholder="按会议主题查询"
+        />
+        <l-select
+          v-model="queryData.MeetingPlace"
+          @change="searchChange"
+          :range="dataSource.MeetingPlace"
+          title="会议地点"
+          placeholder="按会议地点查询"
+        />
+        <l-organize-picker
+          v-model="queryData.CreateUser"
+          @change="searchChange"
+          type="user"
+          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-2021 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:07
+ * 描  述：会议管理
+ */
+
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/PersonnelManagement/MeetingManagement/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: {
+        MeetingTitle: { type: "text" },
+        MeetingPlace: { type: "select", dataSource: "0" },
+        BeginTime: { type: "datetime", dateformat: "0" },
+        EndTime: { type: "datetime", dateformat: "0" },
+        RecordPerson: { type: "organize", dataType: "user" },
+        Content: { type: "texteditor" },
+        Files: { type: "upload" },
+        CreateUser: { type: "organize", dataType: "user" },
+      },
+
+      // 查询条件
+      searchData: {},
+      defaultQueryData: {},
+      queryData: {
+        MeetingTitle: "",
+        MeetingPlace: "",
+        CreateUser: "",
+      },
+
+      // 数据源
+      dataSource: {
+        MeetingPlace: [],
+      },
+
+      // 页面相关参数
+      ready: false,
+      tips: "加载中...",
+      loadState: "向下翻以加载更多",
+      sideOpen: false,
+
+      // 列表与分页信息
+      page: 1,
+      total: 2,
+      list: [],
+    };
+  },
+
+  async onLoad() {
+    await this.init();
+  },
+  onUnload() {
+    this.OFF("PersonnelManagementMeetingManagement-list-change");
+  },
+
+  methods: {
+    // 页面初始化
+    async init() {
+      this.ON(
+        "PersonnelManagementMeetingManagement-list-change",
+        this.refreshList
+      );
+
+      // 拉取加载列表和数据源
+      await Promise.all([() => {}]);
+      await this.fetchList();
+      // 初始化查询条件
+      this.defaultQueryData = this.COPY(this.queryData);
+      this.ready = true;
+    },
+
+    // 拉取列表
+    async fetchList() {
+      if (this.page > this.total) {
+        return;
+      }
+
+      const result = await this.HTTP_GET(
+        "learun/adms/PersonnelManagement/MeetingManagement/pagelist",
+        {
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序)
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序
+          pagination: { rows: 10, page: this.page, sidx: "Id", sord: "DESC" },
+          queryJson: JSON.stringify(this.searchData),
+        },
+        "加载数据时出错"
+      );
+
+      if (!result) {
+        return;
+      }
+
+      this.total = result.total;
+      this.page = result.page + 1;
+      this.list = this.list.concat(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();
+    },
+
+    // 列表下拉
+    pullDown() {
+      this.refreshList().then(() => {
+        this.$refs.list.stopPullDown();
+      });
+    },
+
+    // 设置搜索条件
+    async searchChange() {
+      const result = {};
+
+      // 将其他查询项添加到查询 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.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 "join":
+          console.log(123);
+          this.NAV_TO(`/pages/PersonnelManagement/MeetingMinutes/list?meetId=${id}`);
+          return;
+
+        case "delete":
+          if (!(await this.CONFIRM("删除项目", "确定要删除该项吗？", true))) {
+            return;
+          }
+
+          this.HTTP_POST(
+            "learun/adms/PersonnelManagement/MeetingManagement/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/PersonnelManagement/MeetingManagement/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue
new file mode 100644
index 000000000..9a24d1307
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue	
@@ -0,0 +1,248 @@
+<template>
+  <view class="page">
+    <view v-if="ready">
+      <l-input
+        @input="setValue('MeetingManagement.MeetingTitle', $event)"
+        :value="getValue('MeetingManagement.MeetingTitle')"
+        :disabled="!edit"
+        title="会议主题"
+      />
+      <l-select
+        @input="setValue('MeetingManagement.MeetingPlace', $event)"
+        :value="getValue('MeetingManagement.MeetingPlace')"
+        :disabled="!edit"
+        :range="dataSource.MeetingManagement.MeetingPlace"
+        title="会议地点"
+      />
+      <l-date-picker
+        @input="setValue('MeetingManagement.BeginTime', $event)"
+        :value="getValue('MeetingManagement.BeginTime')"
+        :disabled="!edit"
+        title="开始时间"
+      />
+      <l-date-picker
+        @input="setValue('MeetingManagement.EndTime', $event)"
+        :value="getValue('MeetingManagement.EndTime')"
+        :disabled="!edit"
+        title="结束时间"
+      />
+      <l-organize-picker
+        @input="setValue('MeetingManagement.RecordPerson', $event)"
+        :value="getValue('MeetingManagement.RecordPerson')"
+        :readonly="!edit"
+        type="user"
+        title="会议记录者"
+      />
+      <l-textarea
+        @input="setValue('MeetingManagement.Content', $event)"
+        :value="getValue('MeetingManagement.Content')"
+        :readonly="!edit"
+        title="会议内容"
+      />
+      <l-upload-file
+        @input="setValue('MeetingManagement.Files', $event)"
+        :value="getValue('MeetingManagement.Files')"
+        :readonly="!edit"
+        :number="9"
+        title="附件上传"
+      />
+      <l-organize-picker
+        @input="setValue('MeetingManagement.CreateUser', $event)"
+        :value="getValue('MeetingManagement.CreateUser')"
+        :readonly="!edit"
+        type="user"
+        title="申请人"
+      />
+    </view>
+
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block>
+        提交保存
+      </l-button>
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block>
+        编辑本页
+      </l-button>
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block>
+        取消编辑
+      </l-button>
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block>
+        删除
+      </l-button>
+    </view>
+  </view>
+</template>
+
+
+<script>
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2021 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:07
+ * 描  述：会议管理
+ */
+
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/PersonnelManagement/MeetingManagement/single", "style": { "navigationBarTitleText": "表单详情页" } }
+ * 
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改）
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件）
+ */
+
+import get from 'lodash/get'
+import set from 'lodash/set'
+import moment from 'moment'
+import customPageMixins from '@/common/custompage.js'
+
+export default {
+  mixins: [customPageMixins],
+
+  data() {
+    return {
+      // 页面相关参数
+      id: null,
+      mode: null,
+      edit: null,
+      ready: false,
+
+      // 表单数据
+      current: {},
+      origin: {},
+
+      // 表单项数据结构
+      scheme: {
+        MeetingManagement: {
+          MeetingTitle: { type: 'text', title: '会议主题' },
+          MeetingPlace: { type: 'select', title: '会议地点', dataSource: '0' },
+          BeginTime: { type: 'datetime', title: '开始时间', dateformat: '0' },
+          EndTime: { type: 'datetime', title: '结束时间', dateformat: '0' },
+          RecordPerson: { type: 'organize', title: '会议记录者', dataType: 'user' },
+          Content: { type: 'texteditor', title: '会议内容' },
+          Files: { type: 'upload', title: '附件上传' },
+          CreateUser: { type: 'organize', title: '申请人', dataType: 'user' },
+        },
+
+      },
+
+      // 数据源
+      dataSource: {
+        MeetingManagement: {
+          MeetingPlace: [],
+        },
+
+      }
+    }
+  },
+
+  async onLoad({ type, id }) {
+    await this.init(type, id)
+  },
+
+  methods: {
+    // 页面初始化
+    async init(type, id) {
+      this.LOADING('加载数据中...')
+
+      this.id = id
+      this.mode = type
+      this.edit = ['create', 'edit'].includes(this.mode)
+
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据
+      await Promise.all([
+
+
+        () => {}
+      ])
+      await this.fetchForm()
+
+      this.ready = true
+      this.HIDE_LOADING()
+    },
+
+    // 加载表单数据
+    async fetchForm() {
+      if (this.mode === 'create') {
+        this.origin = await this.getDefaultForm()
+      } else {
+        const result = await this.HTTP_GET('learun/adms/PersonnelManagement/MeetingManagement/form', this.id)
+        this.origin = await this.formatFormData(result)
+      }
+      this.current = this.COPY(this.origin)
+    },
+
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮
+    async action(type) {
+      switch (type) {
+        case 'edit':
+          this.edit = true
+          break
+
+        case 'reset':
+          this.current = this.COPY(this.origin)
+          this.edit = false
+          break
+
+        case 'save':
+          const verifyResult = this.verifyForm()
+          if (verifyResult.length > 0) {
+            this.CONFIRM('表单验证失败', verifyResult.join('\n'))
+            return
+          }
+
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) {
+            return
+          }
+
+          this.LOADING('正在提交...')
+          const postData = await this.getPostData(this.id)
+
+          this.HTTP_POST('learun/adms/PersonnelManagement/MeetingManagement/save', postData, '表单提交保存失败').then(success => {
+            this.HIDE_LOADING()
+            if (!success) {
+              return
+            }
+
+            this.EMIT('PersonnelManagementMeetingManagement-list-change')
+            this.NAV_BACK()
+            this.TOAST('提交保存成功')
+          })
+          break
+
+        case 'delete':
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) {
+            return
+          }
+
+          this.LOADING('提交删除中...')
+          this.HTTP_POST('learun/adms/PersonnelManagement/MeetingManagement/delete', this.id, '删除失败').then(success => {
+            this.HIDE_LOADING()
+            if (!success) {
+              return
+            }
+
+            this.EMIT('PersonnelManagementMeetingManagement-list-change')
+            this.NAV_BACK()
+            this.this.TOAST('删除成功', 'success')
+          })
+          break
+
+        default: break
+      }
+    },
+
+    // 获取表单值
+    getValue(path) {
+      return get(this.current, path)
+    },
+
+    // 设置表单值
+    setValue(path, val) {
+      set(this.current, path, val)
+    }
+  }
+}
+</script>
+
+
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMinutes/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMinutes/list.vue
new file mode 100644
index 000000000..d80eb68d3
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMinutes/list.vue	
@@ -0,0 +1,338 @@
+<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.ID">
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">会议名称：</text>
+              {{ displayListItem(item, "MeetingTitle") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">纪要标题：</text>
+              {{ displayListItem(item, "Title") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">内容：</text>
+              {{ displayListItem(item, "Content") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">附件上传：</text>
+              {{ displayListItem(item, "Files") }}
+            </view>
+
+            <l-customlist-action
+              showEdit
+              @edit="action('edit', item.ID)"
+              showDelete
+              @delete="action('delete', item.ID)"
+              @view="action('view', item.ID)"
+            />
+          </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-input
+          v-model="queryData.MeetID"
+          @change="searchChange"
+          title="会议名称"
+          placeholder="按会议名称查询"
+        />
+        <l-input
+          v-model="queryData.Title"
+          @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-2021 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-08 10:36
+ * 描  述：会议纪要
+ */
+
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/PersonnelManagement/MeetingMinutes/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: {
+        MeetingTitle: { type: "text" },
+        Title: { type: "text" },
+        Content: { type: "texteditor" },
+        Files: { type: "upload" },
+      },
+
+      // 查询条件
+      searchData: {},
+      defaultQueryData: {},
+      queryData: {
+        MeetID: "",
+        Title: "",
+      },
+
+      // 数据源
+      dataSource: {},
+
+      // 页面相关参数
+      meetId: "",
+      ready: false,
+      tips: "加载中...",
+      loadState: "向下翻以加载更多",
+      sideOpen: false,
+
+      // 列表与分页信息
+      page: 1,
+      total: 2,
+      list: [],
+    };
+  },
+
+  async onLoad(meetId) {
+    await this.init(meetId);
+  },
+  onUnload() {
+    this.OFF("PersonnelManagementMeetingMinutes-list-change");
+  },
+
+  methods: {
+    // 页面初始化
+    async init(meetId) {
+      console.log(meetId);
+      this.meetId = meetId.meetId;
+      this.ON(
+        "PersonnelManagementMeetingMinutes-list-change",
+        this.refreshList
+      );
+
+      // 拉取加载列表和数据源
+      await Promise.all([() => {}]);
+      await this.fetchList();
+      // 初始化查询条件
+      this.defaultQueryData = this.COPY(this.queryData);
+      this.ready = true;
+    },
+
+    // 拉取列表
+    async fetchList() {
+      if (this.page > this.total) {
+        return;
+      }
+this.searchData.MeetID=this.meetId;
+      const result = await this.HTTP_GET(
+        "learun/adms/PersonnelManagement/MeetingMinutes/pagelist",
+        {
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序)
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序
+          pagination: { rows: 10, page: this.page, sidx: "ID", sord: "DESC" },
+          queryJson: JSON.stringify(this.searchData),
+        },
+        "加载数据时出错"
+      );
+
+      if (!result) {
+        return;
+      }
+
+      this.total = result.total;
+      this.page = result.page + 1;
+      this.list = this.list.concat(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();
+    },
+
+    // 列表下拉
+    pullDown() {
+      this.refreshList().then(() => {
+        this.$refs.list.stopPullDown();
+      });
+    },
+
+    // 设置搜索条件
+    async searchChange() {
+      const result = {};
+
+      // 将其他查询项添加到查询 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.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&meetId="+this.meetId);
+          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/PersonnelManagement/MeetingMinutes/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/PersonnelManagement/MeetingMinutes/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMinutes/single.vue
new file mode 100644
index 000000000..a8bdc7417
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMinutes/single.vue	
@@ -0,0 +1,259 @@
+<template>
+  <view class="page">
+    <view v-if="ready">
+      <l-input
+        @input="setValue('MeetingMinutes.Title', $event)"
+        :value="getValue('MeetingMinutes.Title')"
+        :disabled="!edit"
+        title="纪要标题"
+      />
+      <l-textarea
+        @input="setValue('MeetingMinutes.Content', $event)"
+        :value="getValue('MeetingMinutes.Content')"
+        :readonly="!edit"
+        title="内容"
+      />
+      <l-upload-file
+        @input="setValue('MeetingMinutes.Files', $event)"
+        :value="getValue('MeetingMinutes.Files')"
+        :readonly="!edit"
+        :number="9"
+        title="附件上传"
+      />
+    </view>
+
+    <view
+      v-if="ready"
+      class="bg-white margin-tb padding"
+      style="padding-top: 0; overflow: hidden"
+    >
+      <l-button
+        v-if="edit"
+        @click="action('save')"
+        size="lg"
+        color="green"
+        class="block margin-top"
+        block
+      >
+        提交保存
+      </l-button>
+      <l-button
+        v-if="!edit && mode !== 'create'"
+        @click="action('edit')"
+        size="lg"
+        line="orange"
+        class="block margin-top"
+        block
+      >
+        编辑本页
+      </l-button>
+      <l-button
+        v-if="edit && mode !== 'create'"
+        @click="action('reset')"
+        size="lg"
+        line="red"
+        class="block margin-top"
+        block
+      >
+        取消编辑
+      </l-button>
+      <l-button
+        v-if="!edit && mode !== 'create'"
+        @click="action('delete')"
+        size="lg"
+        line="red"
+        class="block margin-top"
+        block
+      >
+        删除
+      </l-button>
+    </view>
+  </view>
+</template>
+
+
+<script>
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2021 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-08 10:36
+ * 描  述：会议纪要
+ */
+
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/PersonnelManagement/MeetingMinutes/single", "style": { "navigationBarTitleText": "表单详情页" } }
+ *
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改）
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件）
+ */
+
+import get from "lodash/get";
+import set from "lodash/set";
+import moment from "moment";
+import customPageMixins from "@/common/custompage.js";
+
+export default {
+  mixins: [customPageMixins],
+
+  data() {
+    return {
+      // 页面相关参数
+      meetId: null,
+      id: null,
+      mode: null,
+      edit: null,
+      ready: false,
+
+      // 表单数据
+      current: {},
+      origin: {},
+
+      // 表单项数据结构
+      scheme: {
+        MeetingMinutes: {
+          MeetID: { type: "text", title: "会议名称" },
+          Title: { type: "text", title: "纪要标题" },
+          Content: { type: "texteditor", title: "内容" },
+          Files: { type: "upload", title: "附件上传" },
+        },
+      },
+
+      // 数据源
+      dataSource: {
+        MeetingMinutes: {},
+      },
+    };
+  },
+
+  async onLoad({ type, id, meetId }) {
+    await this.init(type, id, meetId);
+  },
+
+  methods: {
+    // 页面初始化
+    async init(type, id, meetId) {
+      this.LOADING("加载数据中...");
+
+      this.meetId = meetId;
+      this.id = id;
+      this.mode = type;
+      this.edit = ["create", "edit"].includes(this.mode);
+
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据
+      await Promise.all([() => {}]);
+      await this.fetchForm();
+
+      this.ready = true;
+      this.HIDE_LOADING();
+    },
+
+    // 加载表单数据
+    async fetchForm() {
+      if (this.mode === "create") {
+        this.origin = await this.getDefaultForm();
+      } else {
+        const result = await this.HTTP_GET(
+          "learun/adms/PersonnelManagement/MeetingMinutes/form",
+          this.id
+        );
+        this.origin = await this.formatFormData(result);
+      }
+      this.current = this.COPY(this.origin);
+    },
+
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮
+    async action(type) {
+      switch (type) {
+        case "edit":
+          this.edit = true;
+          break;
+
+        case "reset":
+          this.current = this.COPY(this.origin);
+          this.edit = false;
+          break;
+
+        case "save":
+          const verifyResult = this.verifyForm();
+          if (verifyResult.length > 0) {
+            this.CONFIRM("表单验证失败", verifyResult.join("\n"));
+            return;
+          }
+
+          if (
+            !(await this.CONFIRM(
+              "提交确认",
+              "确定要提交本页表单内容吗？",
+              true
+            ))
+          ) {
+            return;
+          }
+
+          this.LOADING("正在提交...");
+          this.scheme.MeetingMinutes.MeetID = this.meetId;
+          const postData = await this.getPostData(this.id);
+          var aa = JSON.parse(postData.strEntity);
+          aa.MeetID = this.meetId;
+          postData.strEntity = JSON.stringify(aa);
+          console.log(postData);
+          this.HTTP_POST(
+            "learun/adms/PersonnelManagement/MeetingMinutes/save",
+            postData,
+            "表单提交保存失败"
+          ).then((success) => {
+            this.HIDE_LOADING();
+            if (!success) {
+              return;
+            }
+
+            this.EMIT("PersonnelManagementMeetingMinutes-list-change");
+            this.NAV_BACK();
+            this.TOAST("提交保存成功");
+          });
+          break;
+
+        case "delete":
+          if (!(await this.CONFIRM("删除项目", "确定要删除本项吗？", true))) {
+            return;
+          }
+
+          this.LOADING("提交删除中...");
+          this.HTTP_POST(
+            "learun/adms/PersonnelManagement/MeetingMinutes/delete",
+            this.id,
+            "删除失败"
+          ).then((success) => {
+            this.HIDE_LOADING();
+            if (!success) {
+              return;
+            }
+
+            this.EMIT("PersonnelManagementMeetingMinutes-list-change");
+            this.NAV_BACK();
+            this.this.TOAST("删除成功", "success");
+          });
+          break;
+
+        default:
+          break;
+      }
+    },
+
+    // 获取表单值
+    getValue(path) {
+      return get(this.current, path);
+    },
+
+    // 设置表单值
+    setValue(path, val) {
+      set(this.current, path, val);
+    },
+  },
+};
+</script>
+
+
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue
new file mode 100644
index 000000000..1a2b42a8f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue	
@@ -0,0 +1,380 @@
+<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.Id">
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">会议主题：</text>
+              {{ displayListItem(item, "MeetingTitle") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">会议地点：</text>
+              {{ displayListItem(item, "MeetingPlace") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">开始时间：</text>
+              {{ displayListItem(item, "BeginTime") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">结束时间：</text>
+              {{ displayListItem(item, "EndTime") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">申请人：</text>
+              {{ displayListItem(item, "CreateUser") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">会议记录者：</text>
+              {{ displayListItem(item, "RecordPerson") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">会议内容：</text>
+              {{ displayListItem(item, "Content") }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">附件上传：</text>
+              {{ displayListItem(item, "Files") }}
+            </view>
+
+            <l-customlist-action
+              showButton
+              buttonText="会议纪要"
+              @join="action('join', item.Id)"
+              showEdit
+              @edit="action('edit', item.Id)"
+              showDelete
+              @delete="action('delete', item.Id)"
+              @view="action('view', item.Id)"
+            />
+          </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-input
+          v-model="queryData.MeetingTitle"
+          @change="searchChange"
+          title="会议主题"
+          placeholder="按会议主题查询"
+        />
+        <l-select
+          v-model="queryData.MeetingPlace"
+          @change="searchChange"
+          :range="dataSource.MeetingPlace"
+          title="会议地点"
+          placeholder="按会议地点查询"
+        />
+        <l-organize-picker
+          v-model="queryData.CreateUser"
+          @change="searchChange"
+          type="user"
+          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-2021 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:07
+ * 描  述：会议管理
+ */
+
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/PersonnelManagement/MeetingManagement/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: {
+        MeetingTitle: { type: "text" },
+        MeetingPlace: { type: "select", dataSource: "0" },
+        BeginTime: { type: "datetime", dateformat: "0" },
+        EndTime: { type: "datetime", dateformat: "0" },
+        RecordPerson: { type: "organize", dataType: "user" },
+        Content: { type: "texteditor" },
+        Files: { type: "upload" },
+        CreateUser: { type: "organize", dataType: "user" },
+      },
+
+      // 查询条件
+      searchData: {},
+      defaultQueryData: {},
+      queryData: {
+        MeetingTitle: "",
+        MeetingPlace: "",
+        CreateUser: "",
+      },
+
+      // 数据源
+      dataSource: {
+        MeetingPlace: [],
+      },
+
+      // 页面相关参数
+      ready: false,
+      tips: "加载中...",
+      loadState: "向下翻以加载更多",
+      sideOpen: false,
+
+      // 列表与分页信息
+      page: 1,
+      total: 2,
+      list: [],
+    };
+  },
+
+  async onLoad() {
+    await this.init();
+  },
+  onUnload() {
+    this.OFF("PersonnelManagementMeetingManagement-list-change");
+  },
+
+  methods: {
+    // 页面初始化
+    async init() {
+      this.ON(
+        "PersonnelManagementMeetingManagement-list-change",
+        this.refreshList
+      );
+
+      // 拉取加载列表和数据源
+      await Promise.all([() => {}]);
+      await this.fetchList();
+      // 初始化查询条件
+      this.defaultQueryData = this.COPY(this.queryData);
+      this.ready = true;
+    },
+
+    // 拉取列表
+    async fetchList() {
+      if (this.page > this.total) {
+        return;
+      }
+
+      var userInfo = this.GET_GLOBAL("loginUser");
+      this.searchData.CreateUser = userInfo.userId;
+      const result = await this.HTTP_GET(
+        "learun/adms/PersonnelManagement/MeetingManagement/pagelist",
+        {
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序)
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序
+          pagination: { rows: 10, page: this.page, sidx: "Id", sord: "DESC" },
+          queryJson: JSON.stringify(this.searchData),
+        },
+        "加载数据时出错"
+      );
+
+      if (!result) {
+        return;
+      }
+
+      this.total = result.total;
+      this.page = result.page + 1;
+      this.list = this.list.concat(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();
+    },
+
+    // 列表下拉
+    pullDown() {
+      this.refreshList().then(() => {
+        this.$refs.list.stopPullDown();
+      });
+    },
+
+    // 设置搜索条件
+    async searchChange() {
+      const result = {};
+
+      // 将其他查询项添加到查询 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.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 "join":
+          console.log(123);
+          this.NAV_TO(`/pages/PersonnelManagement/MeetingMinutes/list?meetId=${id}`);
+          return;
+
+        case "delete":
+          if (!(await this.CONFIRM("删除项目", "确定要删除该项吗？", true))) {
+            return;
+          }
+
+          this.HTTP_POST(
+            "learun/adms/PersonnelManagement/MeetingManagement/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/PersonnelManagement/MeetingMy/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/single.vue
new file mode 100644
index 000000000..0c57ac63f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/single.vue	
@@ -0,0 +1,248 @@
+<template>
+  <view class="page">
+    <view v-if="ready">
+      <l-input
+        @input="setValue('MeetingManagement.MeetingTitle', $event)"
+        :value="getValue('MeetingManagement.MeetingTitle')"
+        :disabled="!edit"
+        title="会议主题"
+      />
+      <l-select
+        @input="setValue('MeetingManagement.MeetingPlace', $event)"
+        :value="getValue('MeetingManagement.MeetingPlace')"
+        :disabled="!edit"
+        :range="dataSource.MeetingManagement.MeetingPlace"
+        title="会议地点"
+      />
+      <l-date-picker
+        @input="setValue('MeetingManagement.BeginTime', $event)"
+        :value="getValue('MeetingManagement.BeginTime')"
+        :disabled="!edit"
+        title="开始时间"
+      />
+      <l-date-picker
+        @input="setValue('MeetingManagement.EndTime', $event)"
+        :value="getValue('MeetingManagement.EndTime')"
+        :disabled="!edit"
+        title="结束时间"
+      />
+      <l-organize-picker
+        @input="setValue('MeetingManagement.RecordPerson', $event)"
+        :value="getValue('MeetingManagement.RecordPerson')"
+        :readonly="!edit"
+        type="user"
+        title="会议记录者"
+      />
+      <l-textarea
+        @input="setValue('MeetingManagement.Content', $event)"
+        :value="getValue('MeetingManagement.Content')"
+        :readonly="!edit"
+        title="会议内容"
+      />
+      <l-upload-file
+        @input="setValue('MeetingManagement.Files', $event)"
+        :value="getValue('MeetingManagement.Files')"
+        :readonly="!edit"
+        :number="9"
+        title="附件上传"
+      />
+      <l-organize-picker
+        @input="setValue('MeetingManagement.CreateUser', $event)"
+        :value="getValue('MeetingManagement.CreateUser')"
+        :readonly="!edit"
+        type="user"
+        title="申请人"
+      />
+    </view>
+
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block>
+        提交保存
+      </l-button>
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block>
+        编辑本页
+      </l-button>
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block>
+        取消编辑
+      </l-button>
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block>
+        删除
+      </l-button>
+    </view>
+  </view>
+</template>
+
+
+<script>
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2021 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:07
+ * 描  述：会议管理
+ */
+
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/PersonnelManagement/MeetingManagement/single", "style": { "navigationBarTitleText": "表单详情页" } }
+ * 
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改）
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件）
+ */
+
+import get from 'lodash/get'
+import set from 'lodash/set'
+import moment from 'moment'
+import customPageMixins from '@/common/custompage.js'
+
+export default {
+  mixins: [customPageMixins],
+
+  data() {
+    return {
+      // 页面相关参数
+      id: null,
+      mode: null,
+      edit: null,
+      ready: false,
+
+      // 表单数据
+      current: {},
+      origin: {},
+
+      // 表单项数据结构
+      scheme: {
+        MeetingManagement: {
+          MeetingTitle: { type: 'text', title: '会议主题' },
+          MeetingPlace: { type: 'select', title: '会议地点', dataSource: '0' },
+          BeginTime: { type: 'datetime', title: '开始时间', dateformat: '0' },
+          EndTime: { type: 'datetime', title: '结束时间', dateformat: '0' },
+          RecordPerson: { type: 'organize', title: '会议记录者', dataType: 'user' },
+          Content: { type: 'texteditor', title: '会议内容' },
+          Files: { type: 'upload', title: '附件上传' },
+          CreateUser: { type: 'organize', title: '申请人', dataType: 'user' },
+        },
+
+      },
+
+      // 数据源
+      dataSource: {
+        MeetingManagement: {
+          MeetingPlace: [],
+        },
+
+      }
+    }
+  },
+
+  async onLoad({ type, id }) {
+    await this.init(type, id)
+  },
+
+  methods: {
+    // 页面初始化
+    async init(type, id) {
+      this.LOADING('加载数据中...')
+
+      this.id = id
+      this.mode = type
+      this.edit = ['create', 'edit'].includes(this.mode)
+
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据
+      await Promise.all([
+
+
+        () => {}
+      ])
+      await this.fetchForm()
+
+      this.ready = true
+      this.HIDE_LOADING()
+    },
+
+    // 加载表单数据
+    async fetchForm() {
+      if (this.mode === 'create') {
+        this.origin = await this.getDefaultForm()
+      } else {
+        const result = await this.HTTP_GET('learun/adms/PersonnelManagement/MeetingManagement/form', this.id)
+        this.origin = await this.formatFormData(result)
+      }
+      this.current = this.COPY(this.origin)
+    },
+
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮
+    async action(type) {
+      switch (type) {
+        case 'edit':
+          this.edit = true
+          break
+
+        case 'reset':
+          this.current = this.COPY(this.origin)
+          this.edit = false
+          break
+
+        case 'save':
+          const verifyResult = this.verifyForm()
+          if (verifyResult.length > 0) {
+            this.CONFIRM('表单验证失败', verifyResult.join('\n'))
+            return
+          }
+
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) {
+            return
+          }
+
+          this.LOADING('正在提交...')
+          const postData = await this.getPostData(this.id)
+
+          this.HTTP_POST('learun/adms/PersonnelManagement/MeetingManagement/save', postData, '表单提交保存失败').then(success => {
+            this.HIDE_LOADING()
+            if (!success) {
+              return
+            }
+
+            this.EMIT('PersonnelManagementMeetingManagement-list-change')
+            this.NAV_BACK()
+            this.TOAST('提交保存成功')
+          })
+          break
+
+        case 'delete':
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) {
+            return
+          }
+
+          this.LOADING('提交删除中...')
+          this.HTTP_POST('learun/adms/PersonnelManagement/MeetingManagement/delete', this.id, '删除失败').then(success => {
+            this.HIDE_LOADING()
+            if (!success) {
+              return
+            }
+
+            this.EMIT('PersonnelManagementMeetingManagement-list-change')
+            this.NAV_BACK()
+            this.this.TOAST('删除成功', 'success')
+          })
+          break
+
+        default: break
+      }
+    },
+
+    // 获取表单值
+    getValue(path) {
+      return get(this.current, path)
+    },
+
+    // 设置表单值
+    setValue(path, val) {
+      set(this.current, path, val)
+    }
+  }
+}
+</script>
+
+
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/list.vue
new file mode 100644
index 000000000..478af1e78
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/list.vue	
@@ -0,0 +1,280 @@
+<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.ID">
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">会议：</text>
+              {{ displayListItem(item, 'MeetID') }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">参与人id：</text>
+              {{ displayListItem(item, 'ParticipantID') }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">参与人名字：</text>
+              {{ displayListItem(item, 'ParticipantName') }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">是否签到：</text>
+              {{ displayListItem(item, 'IsSignIn') }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">参加时间：</text>
+              {{ displayListItem(item, 'SignInTime') }}
+            </view>
+
+
+            <l-customlist-action showEdit @edit="action('edit', item.ID)" showDelete @delete="action('delete', item.ID)" @view="action('view', item.ID)" />
+          </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">
+
+
+        <!-- 重置查询条件按钮 -->
+        <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-2021 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:16
+ * 描  述：会议签到记录
+ */
+
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/PersonnelManagement/MeetingSignInRecord/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: {
+        MeetID: { type: 'select', dataSource: '0' },
+        ParticipantID: { type: 'organize', dataType: 'user' },
+        ParticipantName: { type: 'text' },
+        IsSignIn: { type: 'select', itemCode: 'YesOrNoBit', dataSource: '0' },
+        SignInTime: { type: 'datetime', dateformat: '0' },
+      },
+
+      // 查询条件
+      searchData: {},
+      defaultQueryData: {},
+      queryData: {
+      },
+
+      // 数据源
+      dataSource: {
+        MeetID: [],
+        IsSignIn: Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoBit).map(t => ({ value: t.value, text: t.text })),
+      },
+
+      // 页面相关参数
+      ready: false,
+      tips: '加载中...',
+      loadState: '向下翻以加载更多',
+      sideOpen: false,
+
+      // 列表与分页信息
+      page: 1,
+      total: 2,
+      list: []
+    }
+  },
+
+  async onLoad() {
+    await this.init()
+  },
+  onUnload() {
+    this.OFF('PersonnelManagementMeetingSignInRecord-list-change')
+  },
+
+  methods: {
+    // 页面初始化
+    async init() {
+      this.ON('PersonnelManagementMeetingSignInRecord-list-change', this.refreshList)
+
+      // 拉取加载列表和数据源
+      await Promise.all([
+
+
+        () => {}
+      ])
+      await this.fetchList()
+      // 初始化查询条件
+      this.defaultQueryData = this.COPY(this.queryData)
+      this.ready = true
+    },
+
+    // 拉取列表
+    async fetchList() {
+      if (this.page > this.total) { return }
+
+      const result = await this.HTTP_GET(
+        'learun/adms/PersonnelManagement/MeetingSignInRecord/pagelist',
+        {
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序)
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序
+          pagination: { rows: 10, page: this.page, sidx: 'ID', sord: 'DESC' },
+          queryJson: JSON.stringify(this.searchData)
+        },
+        '加载数据时出错'
+      )
+
+      if (!result) { return }
+
+      this.total = result.total
+      this.page = result.page + 1
+      this.list = this.list.concat(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()
+    },
+
+    // 列表下拉
+    pullDown() {
+      this.refreshList().then(() => {
+        this.$refs.list.stopPullDown()
+      })
+    },
+
+    // 设置搜索条件
+    async searchChange() {
+      const result = {}
+
+      // 将其他查询项添加到查询 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.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('/PersonnelManagement/MeetingSignInRecord/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/PersonnelManagement/MeetingSignInRecord/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/single.vue
new file mode 100644
index 000000000..c172b471f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/single.vue	
@@ -0,0 +1,227 @@
+<template>
+  <view class="page">
+    <view v-if="ready">
+      <l-select
+        @input="setValue('MeetingSignInRecord.MeetID', $event)"
+        :value="getValue('MeetingSignInRecord.MeetID')"
+        :disabled="!edit"
+        :range="dataSource.MeetingSignInRecord.MeetID"
+        title="会议"
+      />
+      <l-organize-picker
+        @input="setValue('MeetingSignInRecord.ParticipantID', $event)"
+        :value="getValue('MeetingSignInRecord.ParticipantID')"
+        :readonly="!edit"
+        type="user"
+        title="参与人id"
+      />
+      <l-input
+        @input="setValue('MeetingSignInRecord.ParticipantName', $event)"
+        :value="getValue('MeetingSignInRecord.ParticipantName')"
+        :disabled="!edit"
+        title="参与人名字"
+      />
+      <l-select
+        @input="setValue('MeetingSignInRecord.IsSignIn', $event)"
+        :value="getValue('MeetingSignInRecord.IsSignIn')"
+        :disabled="!edit"
+        :range="dataSource.MeetingSignInRecord.IsSignIn"
+        title="是否签到"
+      />
+      <l-date-picker
+        @input="setValue('MeetingSignInRecord.SignInTime', $event)"
+        :value="getValue('MeetingSignInRecord.SignInTime')"
+        :disabled="!edit"
+        title="参加时间"
+      />
+    </view>
+
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block>
+        提交保存
+      </l-button>
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block>
+        编辑本页
+      </l-button>
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block>
+        取消编辑
+      </l-button>
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block>
+        删除
+      </l-button>
+    </view>
+  </view>
+</template>
+
+
+<script>
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2021 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:16
+ * 描  述：会议签到记录
+ */
+
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/PersonnelManagement/MeetingSignInRecord/single", "style": { "navigationBarTitleText": "表单详情页" } }
+ * 
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改）
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件）
+ */
+
+import get from 'lodash/get'
+import set from 'lodash/set'
+import moment from 'moment'
+import customPageMixins from '@/common/custompage.js'
+
+export default {
+  mixins: [customPageMixins],
+
+  data() {
+    return {
+      // 页面相关参数
+      id: null,
+      mode: null,
+      edit: null,
+      ready: false,
+
+      // 表单数据
+      current: {},
+      origin: {},
+
+      // 表单项数据结构
+      scheme: {
+        MeetingSignInRecord: {
+          MeetID: { type: 'select', title: '会议', dataSource: '0' },
+          ParticipantID: { type: 'organize', title: '参与人id', dataType: 'user' },
+          ParticipantName: { type: 'text', title: '参与人名字' },
+          IsSignIn: { type: 'select', title: '是否签到', itemCode: 'YesOrNoBit', dataSource: '0' },
+          SignInTime: { type: 'datetime', title: '参加时间', dateformat: '0' },
+        },
+
+      },
+
+      // 数据源
+      dataSource: {
+        MeetingSignInRecord: {
+          MeetID: [],
+          IsSignIn: Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoBit).map(t => ({ value: t.value, text: t.text })),
+        },
+
+      }
+    }
+  },
+
+  async onLoad({ type, id }) {
+    await this.init(type, id)
+  },
+
+  methods: {
+    // 页面初始化
+    async init(type, id) {
+      this.LOADING('加载数据中...')
+
+      this.id = id
+      this.mode = type
+      this.edit = ['create', 'edit'].includes(this.mode)
+
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据
+      await Promise.all([
+
+
+        () => {}
+      ])
+      await this.fetchForm()
+
+      this.ready = true
+      this.HIDE_LOADING()
+    },
+
+    // 加载表单数据
+    async fetchForm() {
+      if (this.mode === 'create') {
+        this.origin = await this.getDefaultForm()
+      } else {
+        const result = await this.HTTP_GET('learun/adms/PersonnelManagement/MeetingSignInRecord/form', this.id)
+        this.origin = await this.formatFormData(result)
+      }
+      this.current = this.COPY(this.origin)
+    },
+
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮
+    async action(type) {
+      switch (type) {
+        case 'edit':
+          this.edit = true
+          break
+
+        case 'reset':
+          this.current = this.COPY(this.origin)
+          this.edit = false
+          break
+
+        case 'save':
+          const verifyResult = this.verifyForm()
+          if (verifyResult.length > 0) {
+            this.CONFIRM('表单验证失败', verifyResult.join('\n'))
+            return
+          }
+
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) {
+            return
+          }
+
+          this.LOADING('正在提交...')
+          const postData = await this.getPostData(this.id)
+
+          this.HTTP_POST('learun/adms/PersonnelManagement/MeetingSignInRecord/save', postData, '表单提交保存失败').then(success => {
+            this.HIDE_LOADING()
+            if (!success) {
+              return
+            }
+
+            this.EMIT('PersonnelManagementMeetingSignInRecord-list-change')
+            this.NAV_BACK()
+            this.TOAST('提交保存成功')
+          })
+          break
+
+        case 'delete':
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) {
+            return
+          }
+
+          this.LOADING('提交删除中...')
+          this.HTTP_POST('learun/adms/PersonnelManagement/MeetingSignInRecord/delete', this.id, '删除失败').then(success => {
+            this.HIDE_LOADING()
+            if (!success) {
+              return
+            }
+
+            this.EMIT('PersonnelManagementMeetingSignInRecord-list-change')
+            this.NAV_BACK()
+            this.this.TOAST('删除成功', 'success')
+          })
+          break
+
+        default: break
+      }
+    },
+
+    // 获取表单值
+    getValue(path) {
+      return get(this.current, path)
+    },
+
+    // 设置表单值
+    setValue(path, val) {
+      set(this.current, path, val)
+    }
+  }
+}
+</script>
+
+
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue
new file mode 100644
index 000000000..6384251dd
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue	
@@ -0,0 +1,45 @@
+<template>
+  <view class="page">
+    <view class="btn" @click="tapScan"> 扫码 </view>
+  </view>
+</template>
+
+<script>
+import scanCodeFun from "@/common/js/scanCodeFun.js";
+export default {
+  data() {
+    return {};
+  },
+  methods: {
+    init() {
+      let _this = this;
+      scanCodeFun.scanCodeFun().then((res) => {
+        if (!res) return;
+        var userInfo = this.GET_GLOBAL("loginUser");
+        var result =  this.HTTP_GET(
+          "learun/adms/PersonnelManagement/MeetingSignInRecord/scan",
+          {
+            userid: userInfo.userId,
+            meetid: res.result,
+          },
+          "签到时出错"
+        ).then(res1=>{this.TOAST(res1.result )})
+      });
+    },
+    tapScan() {
+      this.init();
+    },
+  },
+  mounted() {
+    let _this = this;
+    setTimeout(function () {
+      _this.init();
+    }, 100);
+  },
+};
+</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/PersonnelManagement/Schedule/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/list.vue
index 842d83f71..3e0e76b9d 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	
@@ -1,289 +1,289 @@
 <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.F_ScheduleId"> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">开始时间：</text> 
-              {{ displayListItem(item, 'F_StartDate') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">结束时间：</text> 
-              {{ displayListItem(item, 'F_EndDate') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">提前提醒：</text> 
-              {{ displayListItem(item, 'F_Early') }} 
-            </view> 
-  
-            <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">日程内容：</text> 
-              {{ displayListItem(item, 'F_ScheduleContent') }} 
-            </view> 
-  
-  
-            <l-customlist-action showEdit @edit="action('edit', item.F_ScheduleId)" showDelete @delete="action('delete', item.F_ScheduleId)" @view="action('view', item.F_ScheduleId)" /> 
-          </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"
-        /> 
-  
-  
-        <!-- 重置查询条件按钮 --> 
-        <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> 
+  <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.F_ScheduleId"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">开始时间：</text> 
+              {{ displayListItem(item, 'F_StartDate') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">结束时间：</text> 
+              {{ displayListItem(item, 'F_EndDate') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">提前提醒：</text> 
+              {{ displayListItem(item, 'F_Early') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">日程内容：</text> 
+              {{ displayListItem(item, 'F_ScheduleContent') }} 
+            </view> 
+  
+  
+            <l-customlist-action showEdit @edit="action('edit', item.F_ScheduleId)" showDelete @delete="action('delete', item.F_ScheduleId)" @view="action('view', item.F_ScheduleId)" /> 
+          </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"
+        /> 
+  
+  
+        <!-- 重置查询条件按钮 --> 
+        <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-20 11:22 
- * 描  述：日程安排 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-20 11:22 
+ * 描  述：日程安排 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/Schedule/list", "style": { "navigationBarTitleText": "表单列表页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/Schedule/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: { 
-        F_StartDate: { type: 'datetime', dateformat: '1' }, 
-        F_EndDate: { type: 'datetime', dateformat: '1' }, 
-        F_Early: { type: 'text' }, 
-        F_ScheduleContent: { type: 'textarea' }, 
-      }, 
-  
-      // 查询条件 
-      searchData: {}, 
-      defaultQueryData: {}, 
-      queryData: { 
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-      }, 
-  
-      // 时间查询参数 
-      dateRange: null, 
-  
-      // 页面相关参数 
-      ready: false, 
-      tips: '加载中...', 
-      loadState: '向下翻以加载更多', 
-      sideOpen: false, 
-  
-      // 列表与分页信息 
-      page: 1, 
-      total: 2, 
-      list: [] 
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  onUnload() { 
-    this.OFF('PersonnelManagementSchedule-list-change') 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.ON('PersonnelManagementSchedule-list-change', this.refreshList) 
-  
-      // 拉取加载列表和数据源 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchList() 
-      // 初始化查询条件 
-      this.defaultQueryData = this.COPY(this.queryData) 
-      this.ready = true
-    }, 
-  
-    // 拉取列表 
-    async fetchList() { 
-      if (this.page > this.total) { return } 
-  
-      const result = await this.HTTP_GET( 
-        '/PersonnelManagement/Schedule/pagelist', 
-        { 
-          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
-          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'F_ScheduleId', sord: 'DESC' }, 
-          queryJson: JSON.stringify(this.searchData) 
-        }, 
-        '加载数据时出错'
-      ) 
-  
-      if (!result) { return } 
-  
-      this.total = result.total 
-      this.page = result.page + 1 
-      this.list = this.list.concat(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() 
-    }, 
-  
-    // 列表下拉 
-    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('/PersonnelManagement/Schedule/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 
-      } 
-    } 
-  
-  } 
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        F_StartDate: { type: 'datetime', dateformat: '1' }, 
+        F_EndDate: { type: 'datetime', dateformat: '1' }, 
+        F_Early: { type: 'text' }, 
+        F_ScheduleContent: { type: 'textarea' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+      }, 
+  
+      // 时间查询参数 
+      dateRange: null, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('PersonnelManagementSchedule-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('PersonnelManagementSchedule-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/PersonnelManagement/Schedule/pagelist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'F_ScheduleId', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(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() 
+    }, 
+  
+    // 列表下拉 
+    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/PersonnelManagement/Schedule/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'; 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/single.vue
index a99c9c795..7df8b50fc 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/single.vue	
@@ -1,214 +1,214 @@
 <template> 
-  <view class="page"> 
-    <view v-if="ready"> 
-      <l-datetime-picker 
-        @input="setValue('LR_OA_Schedule.F_StartDate', $event)"
-        :value="getValue('LR_OA_Schedule.F_StartDate')"
-        :disabled="!edit"
-        title="开始时间"
-      /> 
-      <l-datetime-picker 
-        @input="setValue('LR_OA_Schedule.F_EndDate', $event)"
-        :value="getValue('LR_OA_Schedule.F_EndDate')"
-        :disabled="!edit"
-        title="结束时间"
-      /> 
-      <l-input 
-        @input="setValue('LR_OA_Schedule.F_Early', $event)"
-        :value="getValue('LR_OA_Schedule.F_Early')"
-        :disabled="!edit"
-        title="提前提醒"
-        required 
-      /> 
-      <l-textarea 
-        @input="setValue('LR_OA_Schedule.F_ScheduleContent', $event)"
-        :value="getValue('LR_OA_Schedule.F_ScheduleContent')"
-        :readonly="!edit"
-        title="日程内容"
-      /> 
-    </view> 
-  
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> 
-  </view> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-datetime-picker 
+        @input="setValue('LR_OA_Schedule.F_StartDate', $event)"
+        :value="getValue('LR_OA_Schedule.F_StartDate')"
+        :disabled="!edit"
+        title="开始时间"
+      /> 
+      <l-datetime-picker 
+        @input="setValue('LR_OA_Schedule.F_EndDate', $event)"
+        :value="getValue('LR_OA_Schedule.F_EndDate')"
+        :disabled="!edit"
+        title="结束时间"
+      /> 
+      <l-input 
+        @input="setValue('LR_OA_Schedule.F_Early', $event)"
+        :value="getValue('LR_OA_Schedule.F_Early')"
+        :disabled="!edit"
+        title="提前提醒"
+        required 
+      /> 
+      <l-textarea 
+        @input="setValue('LR_OA_Schedule.F_ScheduleContent', $event)"
+        :value="getValue('LR_OA_Schedule.F_ScheduleContent')"
+        :readonly="!edit"
+        title="日程内容"
+      /> 
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
 </template> 
-  
-  
+  
+  
 <script> 
 /* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2020-10-20 11:22 
- * 描  述：日程安排 
- */
-  
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-20 11:22 
+ * 描  述：日程安排 
+ */
+  
 /** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/PersonnelManagement/Schedule/single", "style": { "navigationBarTitleText": "表单详情页" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/PersonnelManagement/Schedule/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
 import get from 'lodash/get'
 import set from 'lodash/set'
 import moment from 'moment'
 import customPageMixins from '@/common/custompage.js'
-  
+  
 export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-      id: null, 
-      mode: null, 
-      edit: null, 
-      ready: false, 
-  
-      // 表单数据 
-      current: {}, 
-      origin: {}, 
-  
-      // 表单项数据结构 
-      scheme: { 
-        LR_OA_Schedule: { 
-          F_StartDate: { type: 'datetime', title: '开始时间', dateformat: '1' }, 
-          F_EndDate: { type: 'datetime', title: '结束时间', dateformat: '1' }, 
-          F_Early: { type: 'text', title: '提前提醒', verify: 'NumOrNull' }, 
-          F_ScheduleContent: { type: 'textarea', title: '日程内容' }, 
-        }, 
-  
-      }, 
-  
-      // 数据源 
-      dataSource: { 
-        LR_OA_Schedule: { 
-        }, 
-  
-      } 
-    } 
-  }, 
-  
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init(type, id) { 
-      this.LOADING('加载数据中...') 
-  
-      this.id = id 
-      this.mode = type 
-      this.edit = ['create', 'edit'].includes(this.mode) 
-  
-      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-  
-  
-        () => {} 
-      ]) 
-      await this.fetchForm() 
-  
-      this.ready = true
-      this.HIDE_LOADING() 
-    }, 
-  
-    // 加载表单数据 
-    async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('/PersonnelManagement/Schedule/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
-    }, 
-  
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('/PersonnelManagement/Schedule/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementSchedule-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('/PersonnelManagement/Schedule/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('PersonnelManagementSchedule-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
-  
-    // 获取表单值 
-    getValue(path) { 
-      return get(this.current, path) 
-    }, 
-  
-    // 设置表单值 
-    setValue(path, val) { 
-      set(this.current, path, val) 
-    } 
-  } 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        LR_OA_Schedule: { 
+          F_StartDate: { type: 'datetime', title: '开始时间', dateformat: '1' }, 
+          F_EndDate: { type: 'datetime', title: '结束时间', dateformat: '1' }, 
+          F_Early: { type: 'text', title: '提前提醒', verify: 'NumOrNull' }, 
+          F_ScheduleContent: { type: 'textarea', title: '日程内容' }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        LR_OA_Schedule: { 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/PersonnelManagement/Schedule/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/PersonnelManagement/Schedule/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementSchedule-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/PersonnelManagement/Schedule/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('PersonnelManagementSchedule-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
 } 
 </script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/StuEncourgement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/StuEncourgement/list.vue
new file mode 100644
index 000000000..ca9906383
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/StuEncourgement/list.vue	
@@ -0,0 +1,191 @@
+<template>
+	<view class="page">
+		<view class="studSeeSec1">
+		    <view class="studSeeSec1Box">
+		        <l-select :range="selectArr1" :placeholder="placeholder" @change="bindDateChange" valueField="value" textField="text" />
+		    </view>
+		</view>
+		<view class="studSeeSec2">
+		    <view class="tips" v-show="!flag">暂无数据！</view>
+		    <view class="studSeeSec2List" v-show="flag">
+				<view class="studSeeSec2Li" v-for="(n,ind) in data" :key="n.ID">
+					<div>
+						<text>{{ n.EncourgeName }}</text>
+						<text class="EncourgeLevel" v-if="n.EncourgeLevel != null">【 {{ n.EncourgeLevel }} 】 【 {{ n.EncourgeSort }} 】</text>
+					</div>
+					<div>奖励金额：<text>{{ n.Fee }}</text>元</div>
+					<div>{{ n.Reason }}</div>
+					<div class="dateRow">奖励日期：{{ n.EncourgeDate }}</div>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default{
+	data() {
+		return {
+			value: 0,
+			flag:false,
+			selectArr1: [],
+			placeholder: '请选择学期',
+			data: []
+		}
+	},
+	methods:{
+		init() {
+			//获取学年学期列表
+			let _this = this;
+			_this.LOADING('加载数据中…')
+			_this.HTTP_GET(
+			  'StuEncourgement/academicAndSemesterList',
+			  {},
+			  '加载数据时出错'
+			).then( res => { 
+				this.HIDE_LOADING()
+				// console.log(res)
+				_this.selectArr1 = res;
+				_this.placeholder = res[0].text;
+				_this.getListAjax(res[0].value);
+			})
+		},
+		bindDateChange: function(e) {
+			// console.log(e);
+			this.getListAjax(e)
+		},
+		getListAjax(id) {
+		    var param = { value: id };
+			let _this = this;
+			_this.LOADING('加载数据中…')
+			_this.HTTP_GET(
+			  'StuEncourgement/encourgementList',
+			  param,
+			  '加载数据时出错'
+			).then( res => { 
+				this.HIDE_LOADING()
+				// console.log(res)
+				if (res == null || res.length <= 0) {
+				    _this.flag = false;
+				    return;
+				}
+				_this.flag = true;
+				_this.data = res;
+			})
+		    
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+/deep/ .picker {
+	text-align: center;
+}
+/deep/ .cu-form-group {
+	background: #fff;
+	height: 28px;
+	border-radius: 14px;
+	line-height: 28px;
+	text-align: center;
+	font-size: 15px;
+	color: #1a1a1a;
+	position: relative;
+	margin: 0 auto;
+	min-height: 28px;
+}
+.studSeeSec1 {
+	background: #0c86d8;
+	height: 100px;
+	padding-top: 10px;
+}
+.studSeeSec1Box {
+	width: 84%;
+	background: #fff;
+	height: 28px;
+	border-radius: 14px;
+	line-height: 28px;
+	text-align: center;
+	font-size: 15px;
+	color: #1a1a1a;
+	position: relative;
+	margin: 0 auto;
+}
+.studSeeSec2Top {
+	padding: 0 12px;
+	margin-top: -52px;
+}
+.studSeeSec2TopBox {
+	background: #fff;
+	padding: 20px 0;
+	text-align: center;
+	font-size: 0;
+	border-radius: 4px;
+}
+.studSeeSec2TopBox > * {
+	display: inline-block;
+	vertical-align: middle;
+}
+.studSeeSec2Line {
+	height: 25px;
+	width: 1px;
+	background: #d6dfe2;
+	margin: 0 40px;
+}
+.studSeeSec2Txt {
+	color: #8a8a8a;
+}
+.studSeeSec2Txt view:first-child {
+	font-size: 12px;
+}
+.studSeeSec2Txt view:first-child text {
+	font-size: 20px;
+	color: #0089fe;
+	margin-right: 5px;
+}
+.studSeeSec2Txt view:last-child {
+	font-size: 15px;
+}
+.studSeeSec2List {
+	margin-top: 10px;
+	background: #fff;
+}
+.studSeeSec2Li {
+	padding: 0 12px 0 30px;
+	border-bottom: 1px solid #d6dfe2;
+	line-height: 24px;
+	font-size: 13px;
+	color: #7a7a7a;
+	position: relative;
+}
+.studSeeSec2Li:before {
+	/*content: '';*/
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 12px;
+	margin: auto;
+	width: 6px;
+	height: 6px;
+	background: #8ac9ff;
+	border-radius: 50%;
+}
+.studSeeSec2List .EncourgeLevel {
+	float: right;
+}
+.studSeeSec2List image {
+	width: 12px;
+	margin-right: 5px;
+	position: relative;
+	top: 2px;
+}
+.studSeeSec2Li .dateRow {
+	text-align: right;
+}
+.studSeeSec2 .tips {
+	text-align: center;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/StuPayFee/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/StuPayFee/list.vue
new file mode 100644
index 000000000..fe0440b0d
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/StuPayFee/list.vue	
@@ -0,0 +1,103 @@
+<template>
+	<view class="page">
+	    <!--标题-->
+	    <view class="noticeT"><text id="AcademicYearNo">{{ data.AcademicYearNo }}</text>学年第<text id="Semester">{{ data.Semester }}</text>学期收费标准</view>
+	    <!--简介-->
+	    <view class="noticeBox">
+	        <view class="noticeTitle">费用明细</view>
+	        <view id="list">
+				<view class="noticeTxt" v-for="(item, i) in data.FinaChargesStandardList" :key="item.ChargeItemID">
+					<text> {{ item.ChargeItemName }} ：</text><text> {{ item.Standard }} 元</text>
+				</view>
+			</view>
+	        <view class="noticeTxt">
+	            <text>合计：</text><text><text id="total">{{ data.PayFeeTotal }}</text>元</text>
+	        </view>
+	    </view>
+	</view>
+</template>
+
+<script>
+export default{
+	data() {
+		return {
+			data: null
+		}
+	},
+	methods:{
+		init() {
+			//数据绑定
+			let _this = this;
+			_this.LOADING('加载数据中…')
+			_this.HTTP_GET('StuInfoFresh/payFeeDetail', {}, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				console.log(res);
+				_this.data = res;
+			});
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style scoped lang="less">
+/deep/ uni-page{
+	background-color: #fff;
+}
+.f-page-body {
+	background: #fff;
+}
+
+.page {
+	padding: 10px 12px;
+	background: #fff;
+}
+
+.noticeT {
+	font-size: 20px;
+	line-height: 26px;
+	text-align: center;
+}
+
+.noticeTitle {
+	font-size: 16px;
+	/* border-top: 10px #f9f9f9 solid; */
+	/* margin: 0 -12px; */
+	margin: 15px 0 10px;
+}
+
+.noticeBox {
+	margin: 10px 0;
+	padding: 12px;
+	background: #f9f9f9;
+	border-radius: 14px;
+}
+
+.noticeBox .noticeTitle:first-child {
+	margin-top: 0;
+}
+
+.noticeTxt,
+.noticeText {
+	font-size: 14px;
+	line-height: 24px;
+	overflow: hidden;
+	margin: 5px 0;
+}
+
+.noticeText {
+	text-align: right;
+}
+
+.noticeTxt > *:last-child {
+	float: right;
+}
+
+.noticeLine {
+	height: 1px;
+	margin: 10px 0;
+	background: #e4e4e4;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/StuPunishment/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/StuPunishment/list.vue
new file mode 100644
index 000000000..8b56f8572
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/StuPunishment/list.vue	
@@ -0,0 +1,195 @@
+<template>
+	<view class="page">
+		<view class="studSeeSec1">
+			<view class="studSeeSec1Box">
+				<l-select :range="semeArr" :placeholder="placeholder" @change="bindDateChange" valueField="value" textField="text" />
+			</view>
+		</view>
+		<view class="studSeeSec2">
+			<view class="tips" v-show="flag">暂无数据！</view>
+			<view class="studSeeSec2List" v-show="!flag">
+				<view class="studSeeSec2Li" v-for="(n, ind) in data" :key="n.Id">
+					<view>
+						<text>{{ n.PunishName }}</text>
+						<text v-if="n.WithdrawDate != null">【已撤销】</text>
+					</view> 
+					<view>{{ n.PunishReason }}</view>
+					<view class="dateRow">处分日期：{{ n.PunishDate }}</view>
+					<view class="dateRow" v-if="n.WithdrawDate != null">撤销日期：{{ n.WithdrawDate }}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default{
+	data() {
+		return {
+			semeArr:[],
+			placeholder: '请选择学期',
+			flag: true,
+			data: []
+		}
+	},
+	methods:{
+		init() {
+			let _this = this;
+			_this.LOADING('加载数据中…')
+			//获取学年学期列表
+			_this.HTTP_GET(
+			  'StuPunishment/academicAndSemesterList',
+			  {},
+			  '加载数据时出错'
+			).then( res => { 
+				this.HIDE_LOADING()
+				//console.log(res)
+				_this.semeArr = res;
+				_this.placeholder = res[0].text;
+				_this.getListAjax(res[0].value)
+			})
+		},
+		bindDateChange: function(e) {
+			//console.log(e);
+			this.LOADING('加载数据中…')
+			this.getListAjax(e)
+		},
+		getListAjax(id) {
+		    var param = { value: id };
+			let _this = this;
+			//获取处分数据
+			_this.HTTP_GET(
+			  'StuPunishment/punishmentList',
+			  param,
+			  '加载数据时出错'
+			).then( res => { 
+				this.HIDE_LOADING()
+				// console.log(res)
+				if (res == null || res.length <= 0) {
+				   _this.flag = true
+				    return;
+				}
+				_this.flag = false;
+				_this.data = res;
+			})
+		    
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+
+/deep/ .picker {
+	text-align: center;
+}
+/deep/ .cu-form-group {
+	min-height: 28px;
+	background: #fff;
+	height: 28px;
+	border-radius: 14px;
+	line-height: 28px;
+	text-align: center;
+	font-size: 15px;
+	color: #1a1a1a;
+	position: relative;
+	margin: 0 auto;
+	min-height: 28px;
+}
+
+.studSeeSec2Li .dateRow {
+	text-align: right;
+}
+
+.studSeeSec2 .tips {
+	text-align: center;
+}
+.studSeeSec1 {
+	background: #0c86d8;
+	height: 100px;
+	padding-top: 10px;
+}
+.studSeeSec1Box {
+	width: 84%;
+	background: #fff;
+	height: 28px;
+	border-radius: 14px;
+	line-height: 28px;
+	text-align: center;
+	font-size: 15px;
+	color: #1a1a1a;
+	position: relative;
+	margin: 0 auto;
+}
+.studSeeSec1Box .icon {
+	position: absolute;
+	top: 0;
+	right: 15px;
+	line-height: 28px;
+	color: #818181;
+}
+.studSeeSec2Top {
+	padding: 0 12px;
+	margin-top: -52px;
+}
+.studSeeSec2TopBox {
+	background: #fff;
+	padding: 20px 0;
+	text-align: center;
+	font-size: 0;
+	border-radius: 4px;
+}
+.studSeeSec2TopBox > * {
+	display: inline-block;
+	vertical-align: middle;
+}
+.studSeeSec2Line {
+	height: 25px;
+	width: 1px;
+	background: #d6dfe2;
+	margin: 0 40px;
+}
+.studSeeSec2Txt {
+	color: #8a8a8a;
+}
+.studSeeSec2Txt view:first-child {
+	font-size: 12px;
+}
+.studSeeSec2Txt view:first-child text {
+	font-size: 20px;
+	color: #0089fe;
+	margin-right: 5px;
+}
+.studSeeSec2Txt view:last-child {
+	font-size: 15px;
+}
+.studSeeSec2List {
+	margin-top: 10px;
+	background: #fff;
+}
+.studSeeSec2Li{
+	padding: 0 12px 0 30px;
+	border-bottom: 1px solid #d6dfe2;
+	line-height: 39px;
+	font-size: 13px;
+	color: #7a7a7a;
+	position: relative;
+	line-height: 24px;
+}
+
+.studSeeSec2List text {
+	float: right;
+}
+.studSeeSec2List image {
+	width: 12px;
+	margin-right: 5px;
+	position: relative;
+	top: 2px;
+}
+.studSeeSec2Li text{
+	font-weight: bold;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/TeacherWorkload/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/TeacherWorkload/list.vue
new file mode 100644
index 000000000..cf9744b95
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/TeacherWorkload/list.vue	
@@ -0,0 +1,140 @@
+<template>
+	<view class="page">
+		<view class="mainpage" :class="sideOpen ? 'show' : ''" style="padding-top: 40px;">
+			<!-- <l-customlist-banner></l-customlist-banner> -->
+			<view class="records">共 {{ records }} 条数据</view>
+			<l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="data">
+				<l-customlist :tips="loadState" showTips>
+					<view></view>
+					<view class="pageBox customlist-item" showDelete="true" v-for="(item, ind) in data" :key="item.ALTId">
+						<view class="">
+							<text>课程:</text> 
+							{{ item.LessonName }}【{{ item.LessonNo }}】
+						</view>
+						<view class="">
+							<text>总课时:</text> 
+							{{ item.lessoncount }}
+						</view>
+						<view class="">
+							<text>系数:</text> 
+							{{ item.coefficient }}
+						</view>
+						<view class="">
+							<text>工作量:</text> 
+							{{ item.lessoncount }}
+						</view>
+					</view>
+				</l-customlist>
+			</l-scroll-list>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			user: null,
+			data: [],
+			total: 1,
+			records: 0,
+			ready: false,
+			page: 1,
+			rows: 10,
+			multipleData: null,
+			sideOpen: false,
+			loadState: '向下翻以加载更多'
+		};
+	},
+	methods: {
+		init() {
+			// 拉取加载列表和数据源
+			Promise.all([() => {}]);
+			var _this = this;
+			this.user = this.GET_GLOBAL('loginUser');
+			this.fetchList();
+			this.ready = true;
+		},
+		// 拉取列表
+		async fetchList() {
+			if (this.page > this.total) {
+				return;
+			}
+			let _this = this;
+			let _postParam = {
+				pagination: {
+					rows: _this.rows,
+					page: _this.page,
+					sidx: 'LessonNo',
+					sord: 'asc'
+				},
+				queryJson: '{}'
+			};
+			_this.LOADING('加载数据中…')
+			_this.HTTP_GET('learun/EducationalAdministration/TeacherWorkload/pagelist', _postParam, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				// console.log(res);
+				this.data = this.data.concat(res.rows);
+				_this.total = res.total;
+				_this.records = res.records;
+				this.page = res.page + 1;
+				this.loadState = res.page >= res.total ? '已加载所有项目' : '向下翻以加载更多';
+				console.log(_this.data);
+			});
+		},
+		// 列表下拉
+		pullDown() {
+			this.refreshList().then(() => {
+				this.$refs.data.stopPullDown();
+			});
+		},
+		async refreshList() {
+			this.page = 1;
+			this.total = 1;
+			this.data = [];
+
+			this.fetchList();
+		}
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/common/css/sidepage.less';
+@import '~@/common/css/customlist.less';
+.page {
+	background-color: #fff;
+}
+.page-content {
+	margin-top: 39px;
+}
+.records {
+	color: #8f8f94;
+	background: #ffffff;
+	padding: 10px 12px;
+	width: 100%;
+	vertical-align: middle;
+	border-bottom: 0.5px solid #ddd;
+	position: fixed;
+	top: var(--window-top);
+	z-index: 1024;
+	border-bottom: 0.5px solid #ddd;
+	height: 40px;
+	width: 100%;
+	box-shadow: 0 0.5px 3px rgba(0, 0, 0, 0.1);
+	// background: #f1f1f1;
+}
+.pageBox {
+	// margin-top: 34px;
+	padding: 5px 15px;
+	line-height: 24px;
+	border-bottom: 5px solid #f5f5f5;
+	color: #333;
+}
+.pageBox text{
+	margin-right: 5px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/from.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/from.vue
new file mode 100644
index 000000000..5e4395eac
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/from.vue	
@@ -0,0 +1,369 @@
+<template>
+	<view class="welcome">
+		<view class="welT">基本信息</view>
+		<view class="welBox">
+			<!-- <input type="hidden" name="ID" value="" id="ID" /> -->
+			<l-input title="学号" placeholder="请填写" :value="StuInfoFreshEntity.StuNo" disabled right />
+			<l-input title="准考证号" placeholder="请填写" :value="StuInfoFreshEntity.zkzh" disabled right />
+			<l-input title="考生号" placeholder="请填写" :value="StuInfoFreshEntity.ksh" disabled right />
+			<l-input title="姓名" placeholder="请填写" :value="StuInfoFreshEntity.StuName" disabled right />
+			<l-input title="性别" placeholder="请填写" :value="displayListItem(StuInfoFreshEntity, 'GenderNo')" disabled right />
+			<l-input title="系别" placeholder="请填写" :value="StuInfoFreshEntity.DeptNo" disabled right />
+			<l-input title="专业" placeholder="请填写" :value="StuInfoFreshEntity.MajorNo" disabled right />
+			<l-input title="班级" placeholder="请填写" :value="StuInfoFreshEntity.ClassNo" disabled right />
+			<l-input title="身份证号" placeholder="请填写" :value="StuInfoFreshEntity.IdentityCardNo" disabled right />
+			<l-input title="出生日期" placeholder="请填写" :value="StuInfoFreshEntity.Birthday" disabled right />
+			<l-input title="户口类别" placeholder="请填写" :value="StuInfoFreshEntity.ResidenceNo" disabled right />
+			<l-input title="政治面貌" placeholder="请填写" :value="displayListItem(StuInfoFreshEntity, 'PartyFaceNo')" disabled right />
+		</view>
+		<!-- {{ StuInfoFreshEntity.GenderNo }} -->
+		<!-- <view class="welLine"></view> -->
+		<view class="welT" style="padding-top: 10px;">采集照片信息</view>
+		<view class="welBox">
+			<input type="hidden" id="Photo" value="" />
+			<input id="files" type="file" accept="image/*" />
+			<view class="welImgAdd">
+				<!--<view id="welImgBtn">上传照片</view>-->
+				<img id="PhotoImg" :src="imgSrc" alt="" />
+			</view>
+			<!--<view class="welText">说明：近期两寸免冠正面彩色照小于100K</view>-->
+		</view>
+		<view class="welLine"></view>
+		<view class="welT" style="padding-top: 10px;">自然信息</view>
+		<view class="welLine"></view>
+		<view class="welBox"><l-input v-model="queryData.RegionNo" title="籍贯" placeholder="请填写" right /></view>
+		<view class="welT" style="padding-top: 10px;">通讯信息</view>
+		<view class="welLine"></view>
+		<view class="welBox">
+			<l-input v-model="queryData.FamilyAddress" title="家庭住址" placeholder="请填写" right />
+			<l-input v-model="queryData.telephone" title="联系电话" placeholder="请填写" right />
+		</view>
+		<view class="welT" style="padding-top: 10px;">
+			家庭成员(直系家属)
+			<text class="text-xxl cuIcon cuIcon-add" @click="add('StuInfoFreshFamilyEntities')"></text>
+		</view>
+		<view class="welBox" id="StuInfoFreshFamily" v-show="queryData.StuInfoFreshFamilyEntities.length != 0">
+			<view class="welCon" v-for="(item, i) in queryData.StuInfoFreshFamilyEntities" :key='i'>
+				<l-input v-model="item.Name" title="姓名" placeholder="请填写" right />
+				<!-- <l-input v-model="item.Relation" title="" placeholder="请填写" right /> -->
+				<l-select v-model="item.Relation" :range="dataSource.FamilyRelation" title="与本人关系" placeholder="请选择" />
+				<l-select v-model="item.Sex" :range="dataSource.GenderNo" title="性别" placeholder="请选择" />
+				<l-input v-model="item.Age" title="年龄" placeholder="请填写" right />
+				<!-- <l-input v-model="item.Politicy" title="政治面貌" placeholder="请填写" right /> -->
+				<l-select v-model="item.Politicy" :range="dataSource.PartyFaceNo" title="政治面貌" placeholder="请选择" />
+				<view class="welDel" @click="del('StuInfoFreshFamilyEntities', i)"><text class="text-xxl cuIcon cuIcon-move"></text></view>
+			</view>
+		</view>
+		<view class="welT" style="padding-top: 10px;">
+			紧急联系人
+			<text class="text-xxl cuIcon cuIcon-add" @click="add('StuInfoFreshEmergePeopleEntities')"></text>
+		</view>
+		<view class="welBox" id="StuInfoFreshEmergePeople" v-show="queryData.StuInfoFreshEmergePeopleEntities.length != 0">
+			<view class="welCon" v-for="(item, i) in queryData.StuInfoFreshEmergePeopleEntities" :key='i'>
+				<l-input v-model="item.Name" title="姓名" placeholder="请填写" right />
+				<l-input v-model="item.Relation" title="与本人关系" placeholder="请填写" right />
+				<l-input v-model="item.Telephone" title="手机号码" placeholder="请填写" right />
+				<l-input v-model="item.Mobile" title="座机号码" placeholder="请填写" right />
+				<l-input v-model="item.Address" title="联系地址" placeholder="请填写" right />
+				<view class="welDel" @click="del('StuInfoFreshEmergePeopleEntities', i)"><text class="text-xxl cuIcon cuIcon-move"></text></view>
+			</view>
+		</view>
+		<view class="btn" @click="tapBtn">报到</view>
+	</view>
+</template>
+
+<script>
+import moment from 'moment';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import todayTime from '@/common/js/todayTime.js';
+export default {
+	data() {
+		return {
+			pageInfo: '',
+			imgSrc: '',
+			scheme: {
+				PartyFaceNo: {
+					type: 'sourceData',
+					dataSource: '1',
+					dataSourceId: 'BCdPartyFace,partyface,partyfaceno'
+				},
+				GenderNo:{
+					type: 'dataItem',
+					dataType: 'dataDictionary'
+				}
+			},
+			userInfo: {},
+			dataSource:{
+				GenderNo: Object.values(this.GET_GLOBAL('dataDictionary').usersex).map(t => ({ value: t.value, text: t.text })),
+				FamilyRelation: Object.values(this.GET_GLOBAL('dataDictionary').FamilyRelation).map(t => ({ value: t.value, text: t.text })),
+				PartyFaceNo:[]
+			},
+			StuInfoFreshFamilyEntities:{
+				Name: '',
+				Age: '',
+				Sex: '1',
+				Politicy: '01',
+				Relation: '01'
+			},
+			StuInfoFreshEmergePeopleEntities:{
+				Name: '',
+				Relation: '',
+				Telephone: '',
+				Mobile: '',
+				Address: ''
+			},
+			ID: '',
+			queryData:{
+				RegisterStatus: '1',
+				ArriveDate: '',
+				RegionNo: '',
+				FamilyAddress: '',
+				telephone: '',
+				Photo: '',
+				StuInfoFreshFamilyEntities:[],
+				StuInfoFreshEmergePeopleEntities: []
+			},
+			StuInfoFreshEntity:{
+				
+			}
+		};
+	},
+	methods: {
+		init() {
+			// console.log(this.API)
+			let _this = this;
+			Promise.all([
+				this.FETCH_DATASOURCE('BCdPartyFace').then(data => {
+					// console.log(data)
+					this.dataSource.PartyFaceNo = data.data.map(t => ({
+						text: t.partyface,
+						value: t.partyfaceno
+					}));
+				}),
+			
+				() => {}
+			]);
+			_this.LOADING('加载数据…');
+			_this.pageInfo = _this.GET_PARAM(); //获取页面传递参数
+			_this.HTTP_GET('StuInfoFresh/stuInfoFreshEntity', _this.pageInfo.StuNo, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				// console.log(res);
+				_this.StuInfoFreshEntity = _this.COPY(res.StuInfoFreshEntity);
+				_this.queryData.StuInfoFreshFamilyEntities = _this.COPY(res.StuInfoFreshFamilyList);
+				_this.queryData.StuInfoFreshEmergePeopleEntities = _this.COPY(res.StuInfoFreshEmergePeopleList);
+				_this.ID = res.StuInfoFreshEntity.ID;
+				_this.queryData.Photo = res.StuInfoFreshEntity.Photo;
+				_this.queryData.telephone = res.StuInfoFreshEntity.telephone;
+				_this.queryData.FamilyAddress = res.StuInfoFreshEntity.FamilyAddress;
+				_this.queryData.RegionNo = res.StuInfoFreshEntity.RegionNo;
+				_this.imgSrc = this.API.slice(0,-1) + res.Url;
+			});
+		},
+		tapBtn() {
+			console.log(this.queryData)
+			this.queryData.ArriveDate = todayTime.fmtDate().ymdhMins;
+			let _postData = {
+				keyValue: this.ID,
+				strEntity: JSON.stringify(this.queryData)
+			}
+			this.LOADING('正在提交数据…');
+			this.HTTP_POST('StuInfoFresh/save', _postData, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				if (res) {
+					this.TOAST('保存成功');
+					this.NAV_BACK()
+				}
+			});
+		},
+		add(str) {
+			let jsons = this.COPY(this[str]);
+			this.queryData[str].push(jsons)
+			// console.log(this.queryData[str])
+		},
+		del(str, num) {
+			this.queryData[str].splice(num, 1) 
+		},
+
+		// 显示列表中的标题项
+		displayListItem(item, field) {
+			const fieldItem = this.scheme[field];
+			const value = item[field];
+			// console.log(Object.values(this.GET_GLOBAL('dataDictionary').usersex));
+			
+			switch (fieldItem.type) {
+				case 'currentInfo':
+				case 'organize':
+					return fieldItem.dataType === 'time' ? value : get(this.GET_GLOBAL(fieldItem.dataType), `${value}.name`, '');
+					
+				case 'dataItem':
+					const sex = this.dataSource[field].find(t => t.value === String(value));
+					return get(sex, 'text', '');
+				
+				case 'sourceData':
+					const BCdPartyFace = this.dataSource[field].find(t => t.value === String(value));
+					return get(BCdPartyFace, 'text', '');
+				
+				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;
+			}
+		}
+	},
+	created() {
+		this.userInfo = this.GET_GLOBAL('loginUser'); //获取登录信息
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+/deep/ .cu-form-group {
+	min-height: 40px;
+}
+.welcome {
+	padding: 1px 0px 20px;
+	background: #fff;
+}
+
+.welT {
+	font-size: 16px;
+	margin-bottom: 10px;
+	line-height: 26px;
+	padding: 0 12px;
+}
+
+.welT text {
+	width: 26px;
+	height: 26px;
+	line-height: 24px;
+	border: 1px solid #efefef;
+	border-radius: 4px;
+	float: right;
+	text-align: center;
+	color: #999;
+}
+
+.welLine {
+	height: 1px;
+	background: #efefef;
+	// margin: 10px -12px;
+}
+
+.welInput {
+	overflow: hidden;
+	font-size: 14px;
+	margin-top: 10px;
+}
+
+.welInput span {
+	float: left;
+	width: 26%;
+	text-align: right;
+	line-height: 30px;
+}
+
+.welInput input {
+	display: block;
+	margin-left: 28%;
+	width: 72%;
+	border: 1px solid #efefef;
+	border-radius: 4px;
+	height: 30px;
+	line-height: 28px;
+	padding: 0 10px;
+	margin-bottom: 0;
+}
+
+.welCon {
+	padding: 10px;
+	border: 1px solid #efefef;
+	margin-top: 18px;
+	border-radius: 4px;
+	position: relative;
+}
+
+.welDel {
+	position: absolute;
+	top: -8px;
+	left: -8px;
+	background: #fff;
+}
+
+.welDel text {
+	text-align: center;
+	width: 26px;
+	height: 26px;
+	display: block;
+	line-height: 24px;
+	border: 1px solid #efefef;
+	border-radius: 50%;
+}
+
+.welImgAdd {
+	text-align: center;
+	line-height: 0;
+}
+
+#files {
+	opacity: 0;
+	-webkit-opacity: 0;
+	z-index: 9;
+	display: none;
+}
+
+#welImgBtn {
+	display: block;
+	width: 110px;
+	height: 30px;
+	text-align: center;
+	line-height: 26px;
+	border: 2px solid #efefef;
+	border-radius: 4px;
+	font-size: 14px;
+	color: #999;
+	margin: 10px auto;
+	cursor: pointer;
+}
+.welImgAdd {
+	min-height: 110px;
+}
+#PhotoImg {
+	width: 110px;
+	height: 110px;
+}
+
+.btnBox {
+	margin-top: 20px;
+	text-align: center;
+}
+#saveBtn {
+	margin: auto;
+	margin-top: 25px;
+	width: 92%;
+}
+#StuInfoFreshFamily,#StuInfoFreshEmergePeople{
+	padding: 0 15px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue
new file mode 100644
index 000000000..8fdd22950
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue	
@@ -0,0 +1,39 @@
+<template>
+	<view class="page">
+		<view class="btn" @click="tapScan">
+			扫码
+		</view>
+	</view>
+</template>
+
+<script>
+import scanCodeFun from '@/common/js/scanCodeFun.js';
+export default {
+	data() {
+		return {}
+	},
+	methods:{
+		init() {
+			let _this = this;
+			scanCodeFun.scanCodeFun().then(res => {
+				if(!res) return;
+				this.NAV_TO('./from', { StuNo: res.result }, true);
+			})
+		},
+		tapScan() { 
+			this.init();
+		}
+	},
+	mounted() {
+		let _this = this;
+		setTimeout(function() {
+			_this.init();
+		}, 100);
+	}
+};
+</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/attendance/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/attendance/list.vue
new file mode 100644
index 000000000..a78aa66e3
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/attendance/list.vue	
@@ -0,0 +1,162 @@
+<template>
+	<view class="page">
+		<uni-calendar 
+			:insert="true" 
+			:lunar="true" 
+			@change="change"
+			:selected="selected"
+		></uni-calendar>
+		
+		<view class="attendBox" v-show="flag">
+			<view class="attendBoxT">{{ data.data.day }}</view>
+			<view class="attendBoxTime">
+				<view class="attendCon" v-for="(n, i) in data.data.list" :key="n.time">
+					<view class="attendConT">{{ n.time }} <span>(上班时间 {{ n.time }})</span></view>
+					<!-- <view class="attendConTxt">
+						<image src="~@/common/images/location2.png" mode="widthFix"></image>
+						山西省太原市杏花岭区七府园路11号山西冶金技师学院
+					</view> -->
+					<view class="attendConStatus attendConStatus1">{{ n.status == 1? '正常' : '早退'}}</view>
+					<view class="attendCircular">{{ i == 0? '上' : '下'}}</view>
+				</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+import uniCalendar from '@/components/uni-calendar/uni-calendar.vue';
+export default {
+	components: {
+		uniCalendar
+	},
+	data() {
+		return {
+			selected:[],
+			data: {
+				data:{
+					day: '',
+					list: []
+				}
+			},
+			flag: false
+		};
+	},
+	methods: {
+		init() {
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('teachattendance/major', {}, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				// console.log(res);
+				res.forEach((n, i) => {
+					let jsons = {
+						date: `${n.y}-${n.m}-${n.d}`,
+						info: n.state == 1? '正常' : n.state == 2? '迟到' : '缺勤',
+						data:{
+							day: n.day,
+							list: []
+						}
+					}
+					jsons.data.list = _this.COPY(n.list);
+					_this.selected.push(jsons)
+				})
+			});
+		},
+		change(e) {
+			// console.log(e)
+			if(JSON.stringify(e.extraInfo) == '{}'){
+				this.flag = false;
+			}else{
+				this.flag = true;
+				this.data = {};
+				this.data = this.COPY(e.extraInfo);
+				// console.log(this.data)
+			}
+		}
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+	.attendBox{
+		margin-top: 10px;
+		background: #fff;
+		padding: 20px 12px;
+		// display: none;
+	}
+	.attendBoxT{
+		font-size: 15px;
+		color: #0089FE;
+	}
+	.attendBoxTime{
+		position: relative;
+		height: 143px;
+	}
+	.attendBoxTime:before{
+		    content: '';
+	    position: absolute;
+	    left: 12px;
+	    top: -17px;
+	    width: 1px;
+	    height: 143px;
+	    background: #CBD1D4;
+	}
+	.attendCon{
+		position: relative;
+		margin-top: 20px;
+		padding-left: 30px;
+	}
+	.attendConT{
+		font-size: 15px;
+		color: #6E6E6E;
+	}
+	.attendConT span{
+		color: #9E9E9E;
+		margin-left: 5px;
+	}
+	.attendConTxt{
+		font-size: 13px;
+		color: #9E9E9E;
+		margin: 10px 0;
+	}
+	.attendConTxt image{
+		width: 10px;
+	    margin-right: 5px;
+	    position: relative;
+	    top: 1px;
+	}
+	.attendConStatus{
+		height: 24px;
+		line-height: 24px;
+		padding: 0 10px;
+		font-size: 13px;
+		color: #fff;
+		display: inline-block;
+		border-radius: 12px;
+	}
+	.attendConStatus1{
+		background: #0089FE;
+	}
+	.attendConStatus2{
+		background: #F3C84E;
+	}
+	.attendCircular{
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 24px;
+		height: 24px;
+		border-radius: 50%;
+		text-align: center;
+		line-height: 24px;
+		font-size: 15px;
+		color: #fff;
+		background: #CBD1D4;
+	}
+	
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/invoice/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/invoice/list.vue
index fd96ecc43..42f228f14 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/invoice/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/invoice/list.vue	
@@ -122,7 +122,7 @@ export default {
       }
 
       const result = await this.HTTP_GET(
-        '/crm/invoice/list',
+        'learun/adms/crm/invoice/list',
         {
           pagination: { rows: 10, page: this.page, sidx: 'F_CreateDate', sord: 'DESC' },
           queryJson: JSON.stringify(this.searchData)
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/invoice/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/invoice/single.vue
index 24a51713b..47a4bc3bb 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/invoice/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/invoice/single.vue	
@@ -161,7 +161,7 @@ export default {
             }
           }
 
-          this.HTTP_POST('/crm/invoice/save', postData, '表单提交保存失败').then(success => {
+          this.HTTP_POST('learun/adms/crm/invoice/save', postData, '表单提交保存失败').then(success => {
             this.HIDE_LOADING()
             if (!success) {
               return
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/order/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/order/list.vue
index f14a1aab0..f51504003 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/order/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/order/list.vue	
@@ -214,7 +214,7 @@ export default {
       }
 
       const result = await this.HTTP_GET(
-        '/crm/order/pagelist',
+        'learun/adms/crm/order/pagelist',
         {
           pagination: { rows: 10, page: this.page, sidx: 'F_CreateDate', sord: 'DESC' },
           queryJson: JSON.stringify(this.searchData)
@@ -290,7 +290,7 @@ export default {
             return
           }
 
-          this.HTTP_POST('/crm/order/delete', id, '删除失败').then(success => {
+          this.HTTP_POST('learun/adms/crm/order/delete', id, '删除失败').then(success => {
             if (!success) {
               return
             }
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/order/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/order/single.vue
index af1e79cde..6bba96ad6 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/order/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/crm/order/single.vue	
@@ -353,7 +353,7 @@ export default {
       if (this.mode === 'create') {
         this.origin = await this.getDefaultForm()
       } else {
-        const result = await this.HTTP_GET('/crm/order/form', this.id)
+        const result = await this.HTTP_GET('learun/adms/crm/order/form', this.id)
         this.origin = await this.formatFormData(result)
       }
       this.current = this.COPY(this.origin)
@@ -392,7 +392,7 @@ export default {
             postData.keyValue = originPostData.keyValue
           }
 
-          this.HTTP_POST('/crm/order/save', postData, '表单提交保存失败').then(success => {
+          this.HTTP_POST('learun/adms/crm/order/save', postData, '表单提交保存失败').then(success => {
             this.HIDE_LOADING()
             if (!success) {
               return
@@ -410,7 +410,7 @@ export default {
           }
 
           this.LOADING('提交删除中…')
-          this.HTTP_POST('/crm/order/delete', this.id, '删除失败').then(success => {
+          this.HTTP_POST('learun/adms/crm/order/delete', this.id, '删除失败').then(success => {
             this.HIDE_LOADING()
             if (!success) {
               return
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/customapp/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/customapp/list.vue
index 9c6cf393c..bf9067447 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/customapp/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/customapp/list.vue	
@@ -137,7 +137,7 @@ export default {
       }
 
       const result = await this.HTTP_GET(
-        '/custmer/pagelist',
+        'learun/adms/custmer/pagelist',
         {
           pagination: { rows: 10, page: this.page, sidx: this.primaryKey, sord: 'ASC' },
           queryJson: JSON.stringify({}),
@@ -169,7 +169,7 @@ export default {
 
     // 拉取自定义应用的定义 JSON
     async fetchFormScheme() {
-      const result = await this.HTTP_GET('/form/scheme', [{ id: this.formId, ver: '' }])
+      const result = await this.HTTP_GET('learun/adms/form/scheme', [{ id: this.formId, ver: '' }])
       const scheme = result[this.formId]
       scheme.F_Scheme = JSON.parse(scheme.F_Scheme)
 
@@ -205,7 +205,7 @@ export default {
           }
 
           this.LOADING('提交删除中…')
-          this.HTTP_POST('/form/delete', { schemeInfoId: this.formId, keyValue: id }, '删除失败').then(success => {
+          this.HTTP_POST('learun/adms/form/delete', { schemeInfoId: this.formId, keyValue: id }, '删除失败').then(success => {
             this.HIDE_LOADING()
             if (!success) {
               return
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/customapp/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/customapp/single.vue
index 3c15a9bf5..ad0acb892 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/customapp/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/customapp/single.vue	
@@ -79,7 +79,7 @@ export default {
 
     // 拉取表单的 formData
     async fetchFormData(schemeInfoId, keyValue) {
-      const result = await this.HTTP_GET('/form/data', [{ schemeInfoId, keyValue }], '加载表单失败')
+      const result = await this.HTTP_GET('learun/adms/form/data', [{ schemeInfoId, keyValue }], '加载表单失败')
 
       return result || {}
     },
@@ -112,7 +112,7 @@ export default {
           const formValue = this.$refs.form.getFormValue()
           const postData = await this.getPostData(formValue, this.scheme)
 
-          this.HTTP_POST('/form/save', postData, '表单提交保存失败').then(success => {
+          this.HTTP_POST('learun/adms/form/save', postData, '表单提交保存失败').then(success => {
             this.HIDE_LOADING()
             if (!success) {
               return
@@ -131,7 +131,7 @@ export default {
             return
           }
 
-          this.HTTP_POST('/form/delete', { schemeInfoId: this.schemeId, keyValue: this.id }).then(success => {
+          this.HTTP_POST('learun/adms/form/delete', { schemeInfoId: this.schemeId, keyValue: this.id }).then(success => {
             if (!success) {
               this.TOAST('删除失败')
               return
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/examArrangement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/examArrangement/list.vue
new file mode 100644
index 000000000..f8658ffe6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/examArrangement/list.vue	
@@ -0,0 +1,350 @@
+<template>
+	<view class="page">
+		<div class="timeTable_sec1">
+			<div class="tSec1Box" id="semester">
+				<image src="~@/common/images/timeT1-1.png" mode="widthFix"></image>
+				<span>2019年上半学期</span>
+			</div>
+			<view class="tSec1Box" id="weekTime">
+				<text class="text-xxl cuIcon cuIcon-back" @click="timeTap(1)"></text>
+				<text>{{ todayWeek.Monday }}</text>
+				-
+				<text>{{ todayWeek.Sunday }}</text>
+				<text class="text-xxl cuIcon cuIcon-right" @click="timeTap(2)"></text>
+			</view>
+		</div>
+		<div class="timeTable_sec2">
+			<view class="tSec2Top">
+				<view class="tSec2TopLi" v-for="(item, ind) in weekArr" :key="item.en" @click="liTap(ind)" :class="ind == num ? 'active' : ''">
+					<text>{{ item.en }}</text>
+					<text>{{ item.cn }}</text>
+				</view>
+			</view>
+			<div class="tSec2Box">
+				<view class="tSec2Con" v-for="(items, i) in dataArr" :key="items.num" v-show="i == num">
+					<view class="tSec2List">
+						<view v-if="items.lessonData.length <= 0" class="tSec2ListLi">
+							<view class="noHtml">该时间段没有考试</view>
+						</view>
+						<view v-if="items.lessonData.length > 0">
+							<view class="tSec2ListLi" v-for="(k, j) in items.lessonData" :key="j">
+								<view class="tSec2ListL">第 {{ k.sectionTime }} 节</view>
+								<view class="tSec2ListR">
+									<view class="tSec2ListBox">
+										<view class="tSec2ListT">{{ k.LessonName }}</view>
+										<view class="tSec2ListT">{{ k.ClassName }}</view>
+										<view class="tSec2ListTxt">
+											<text class="text-xxl cuIcon cuIcon-profile"></text>
+											{{ k.EmpName }}
+										</view>
+									</view>
+									<view class="tSec2Location">
+										<text class="text-xxl cuIcon cuIcon-location"></text>
+										{{ k.ClassroomName }}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</div>
+		</div>
+	</view>
+</template>
+
+<script>
+import common from '@/common/js/common.js';
+export default {
+	data() {
+		return {
+			semester: '',
+			num: 0,
+			user: null,
+			weekDayTime: 0,
+			todayWeek: {},
+			dataArr: [],
+			weekArr: [
+				{
+					en: 'MON',
+					cn: '星期一'
+				},
+				{
+					en: 'TUE',
+					cn: '星期二'
+				},
+				{
+					en: 'WED',
+					cn: '星期三'
+				},
+				{
+					en: 'THU',
+					cn: '星期四'
+				},
+				{
+					en: 'FRI',
+					cn: '星期五'
+				},
+				{
+					en: 'SAT',
+					cn: '星期六'
+				},
+				{
+					en: 'SUN',
+					cn: '星期日'
+				}
+			]
+		};
+	},
+	methods: {
+		init() {
+			let _this = this;
+			_this.todayWeek = common.weekday();
+			_this.semester = common.judgeDate();
+			_this.weekDayTime = 7 * common.oneDayTime();
+			_this.user = _this.GET_GLOBAL('loginUser');
+			_this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
+		},
+		loadData(start, end) {
+			let param = { startTime: start, endTime: end };
+			// let param = { StartDate: '2018-11-05', EndDate: '2018-11-11' };
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('arrangeExam/list', param, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				_this.ProcessingData(res);
+			});
+		},
+		liTap(ind) {
+			this.num = ind;
+		},
+		timeTap(num) {
+			let _this = this;
+			if (num == 1) {
+				_this.todayWeek.MondayTime = _this.todayWeek.MondayTime - _this.weekDayTime;
+				_this.todayWeek.SundayTime = _this.todayWeek.SundayTime - _this.weekDayTime;
+			} else {
+				_this.todayWeek.MondayTime = _this.todayWeek.MondayTime + _this.weekDayTime;
+				_this.todayWeek.SundayTime = _this.todayWeek.SundayTime + _this.weekDayTime;
+			}
+			_this.num = 0;
+			_this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime);
+			_this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime);
+			_this.semester = common.judgeDate(_this.todayWeek.SundayTime);
+			_this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
+		},
+		ProcessingData(data) {
+			let dataM = [
+				{
+					weekTime: 1,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 2,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 3,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 4,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 5,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 6,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 7,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				}
+			];
+			data.forEach((n, i) => {
+				n.sectionTime = n.LessonTime.slice(1);
+				dataM.forEach((k, j) => {
+					if (k.weekTime == n.LessonTime.slice(0, 1)) {
+						k.lessonData.push(n);
+					}
+				});
+			});
+			dataM.forEach((n, i) => {
+				n.lessonData.sort(common.compare('sectionTime'));
+			});
+			this.dataArr = dataM;
+		}
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.page {
+	background: #fff;
+}
+.timeTable_sec1 {
+	padding: 14px 12px;
+	text-align: center;
+	background: #0075c4;
+	color: #94d4ff;
+	font-size: 0;
+}
+.tSec1Box > * {
+	display: inline-block;
+	vertical-align: middle;
+}
+.tSec1Line {
+	height: 13px;
+	width: 1px;
+	background: #94d4ff;
+	margin: 0 10px;
+}
+.tSec1Box {
+	font-size: 15px;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+#semester {
+	margin-bottom: 10px;
+}
+#weekTime {
+}
+#weekTime text {
+	margin: 0 10px;
+}
+.tSec1Box > text {
+	width: auto;
+	text-align: center;
+	line-height: 22px;
+}
+.tSec1Box image {
+	width: 15px;
+	margin-right: 2px;
+}
+.tSec1Box text:after {
+	display: none;
+}
+.timeTable_sec2 {
+	margin-bottom: 30px;
+}
+.tSec2Top {
+	padding: 0 12px;
+	background: #0075c4;
+	height: 55px;
+	text-align: center;
+	overflow: hidden;
+}
+.tSec2TopLi {
+	width: 14.285714%;
+	float: left;
+	line-height: 18px;
+	padding: 9px 0 9px;
+	color: #fff;
+	font-size: 13px;
+	border-right: 1px solid #1084d2;
+	border-top: 1px solid #1084d2;
+}
+.tSec2TopLi:first-child {
+	border-left: 1px solid #1084d2;
+}
+.tSec2TopLi.active {
+	color: #0075c4;
+	background: #fff;
+	border-color: #fff;
+}
+.tSec2TopLi text {
+	display: block;
+}
+
+.tSec2TopLi text:first-child {
+	letter-spacing: 2px;
+	text-transform: uppercase;
+}
+.tSec2Box {
+	padding: 0 12px 10px;
+	margin-top: 10px;
+}
+.tSec2Con {
+	border-left: 1px solid #d5eaf7;
+	border-right: 1px solid #d5eaf7;
+	border-top: 1px solid #d5eaf7;
+	// display: none;
+}
+.tSec2Con:first-child {
+	display: block;
+}
+.tSec2List {
+	margin-top: 10px;
+}
+.tSec2List:first-child {
+	margin-top: 0;
+}
+.tSec2ListLi {
+	border-bottom: 1px solid #d5eaf7;
+	overflow: hidden;
+	height: 80px;
+}
+.tSec2ListL {
+	float: left;
+	background: #e8f6ff;
+	height: 100%;
+	width: 25%;
+	text-align: center;
+	line-height: 36px;
+	padding: 11px 0;
+	font-size: 14px;
+	color: #646464;
+}
+.tSec2ListR {
+	float: left;
+	width: 75%;
+	height: 100%;
+	line-height: 18px;
+	padding: 4px 0;
+	overflow: hidden;
+}
+.tSec2ListBox {
+	width: 70%;
+	float: left;
+	padding-left: 5px;
+}
+.tSec2ListT {
+	color: #3e3e3e;
+	font-size: 15px;
+	margin: 5px 0;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.tSec2ListTxt {
+	color: #888888;
+	font-size: 13px;
+}
+.tSec2Location {
+	width: 30%;
+	float: left;
+	line-height: 44px;
+	font-size: 13px;
+	color: #888888;
+}
+.noHtml {
+	height: 100%;
+	line-height: 60px;
+	text-align: center;
+	font-size: 14px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue
index 64ddce013..671a8eb32 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue	
@@ -1,617 +1,715 @@
 <template>
-	<view id="home" class="page">
-		<!-- 顶部搜索栏 -->
-		<view class="header text-white">
-			<!-- #ifndef H5 -->
-			<l-icon @click="scanClick" type="scan" color="white" class="header-left text-xxl margin-left-sm" />
-			<!-- #endif -->
-			<view @click="moreClick(1)" class="search header-mid margin-lr-sm">
-				<l-icon type="search" color="white" class="margin-lr-sm" />
-				搜索更多应用
-			</view>
-			<l-icon @click="msgClick" type="mail" color="white" class="header-right text-xxl margin-right-sm" />
-		</view>
-
-		<!-- 轮播图片 -->
-		<swiper v-if="imgCount > 0" style="height:120px;">
-			<swiper-item v-for="(item, index) of imgData" :key="index" style="height:120px;">
-				<image :src="item" mode="aspectFill" style="height:100%; width:100%;"></image>
-			</swiper-item>
-		</swiper>
-
-		<!-- 功能宫格列表 -->
-		<view class="col-4 function-list cu-list grid no-border">
-			<view v-for="(item, index) in funcListDisplay" @click="funcListClick(item)" :key="index" class="cu-item text-center flex flex-wrap justify-center align-center">
-				<view class="app-item align-center flex flex-wrap justify-center align-center">
-					<l-icon :type="item.icon" color="white" class="text-sl" />
-				</view>
-				<text>{{ item.F_Name }}</text>
-			</view>
-		</view>
-		<view class="text-center bg-white margin-bottom">
-			<text @click="moreClick(0)" class="function-more-btn margin-tb-sm text-gray">更多应用</text>
-		</view>
-
-		<!-- 统计数据宫格 -->
-		<l-title>统计数据</l-title>
-		<view class="count-list cu-list grid col-3 margin-bottom">
-			<view v-for="(item, index) in countData" :key="index" class="cu-item text-center">
-				<text class="margin-bottom-xs">{{ item.title || '(未命名)' }}</text>
-				<text class="count-item-value">{{ item.value || '-' }}</text>
-			</view>
-		</view>
-
-		<!-- 通知列表区块 -->
-		<view v-for="(block, blockIndex) of noticeData" :key="blockIndex" class="margin-bottom">
-			<!-- <view class="margin-top"></view> -->
-			<l-title>{{ block.title }}</l-title>
-			<l-list>
-				<l-list-item v-for="(item, i) of block.content" @click="noticeClick(item)" :key="i" arrow>
-					{{ item.f_title || '(无标题)' }}
-					<l-tag slot="action" line="gray">{{ postDateTime(item.f_time) }}</l-tag>
-				</l-list-item>
-			</l-list>
-		</view>
-
-		<!-- 图表区块 -->
-		<view v-for="(item) of chartData" :key="item.id" class="margin-bottom">
-			<l-title>{{ item.title }}</l-title>
-			<view :style="{ width: cWidth + 'px', height: cHeight + 'px' }" class="chart-list">
-				<!--#ifndef MP-ALIPAY -->
-				<canvas v-if="item.type === 1" @tap="chartTap(item, $event)" @touchstart="touchStart(item.id, $event)" @touchmove="touchMove(item.id, $event)"
-				 @touchend="touchEnd(item.id, $event)" :style="{ width: cWidth + 'px', height: cHeight + 'px' }" :canvas-id="item.id"
-				 :id="item.id" class="charts"></canvas>
-				<canvas v-else @tap="chartTap(item, $event)" :style="{ width: cWidth + 'px', height: cHeight + 'px' }" :canvas-id="item.id"
-				 :id="item.id" class="charts"></canvas>
-				<!--#endif -->
-
-				<!-- 阿里小程序，需要以2倍尺寸显示，然后缩放为50% -->
-				<!--#ifdef MP-ALIPAY -->
-				<canvas v-if="item.type === 1" @tap="chartTap(item, $event)" @touchstart="touchStart(item.id, $event)" @touchmove="touchMove(item.id, $event)"
-				 @touchend="touchEnd(item.id, $event)" :style="{
+  <view id="home" class="page">
+    <!-- 顶部搜索栏 -->
+    <view class="header text-white">
+      <!-- #ifndef H5 -->
+      <l-icon
+        @click="scanClick"
+        type="scan"
+        color="white"
+        class="header-left text-xxl margin-left-sm"
+      />
+      <!-- #endif -->
+      <view @click="moreClick(1)" class="search header-mid margin-lr-sm">
+        <l-icon type="search" color="white" class="margin-lr-sm" />
+        搜索更多应用
+      </view>
+      <l-icon
+        @click="msgClick"
+        type="mail"
+        color="white"
+        class="header-right text-xxl margin-right-sm"
+      />
+    </view>
+
+    <!-- 轮播图片 -->
+    <swiper v-if="imgCount > 0" style="height: 120px">
+      <swiper-item
+        v-for="(item, index) of imgData"
+        :key="index"
+        style="height: 120px"
+      >
+        <image
+          :src="item"
+          mode="aspectFill"
+          style="height: 100%; width: 100%"
+        ></image>
+      </swiper-item>
+    </swiper>
+
+    <!-- 功能宫格列表 -->
+    <view class="col-4 function-list cu-list grid no-border">
+      <view
+        v-for="(item, index) in funcListDisplay"
+        @click="funcListClick(item)"
+        :key="index"
+        class="cu-item text-center flex flex-wrap justify-center align-center"
+      >
+        <view
+          class="app-item align-center flex flex-wrap justify-center align-center"
+        >
+          <l-icon :type="item.icon" color="white" class="text-sl" />
+        </view>
+        <text>{{ item.F_Name }}</text>
+      </view>
+    </view>
+    <view class="text-center bg-white margin-bottom"
+      ><text
+        @click="moreClick(0)"
+        class="function-more-btn margin-tb-sm text-gray"
+        >更多应用</text
+      ></view
+    >
+
+    <!-- 统计数据宫格 -->
+    <l-title>统计数据</l-title>
+    <view class="count-list cu-list grid col-3 margin-bottom">
+      <view
+        v-for="(item, index) in countData"
+        :key="index"
+        class="cu-item text-center"
+      >
+        <text class="margin-bottom-xs">{{ item.title || "(未命名)" }}</text>
+        <text class="count-item-value">{{ item.value || "-" }}</text>
+      </view>
+    </view>
+
+    <!-- 通知列表区块 -->
+    <view
+      v-for="(block, blockIndex) of noticeData"
+      :key="blockIndex"
+      class="margin-bottom"
+    >
+      <!-- <view class="margin-top"></view> -->
+      <l-title @click="informClick(block.title)">{{ block.title }}</l-title>
+      <l-list>
+        <l-list-item
+          v-for="(item, i) of block.content"
+          @click="noticeClick(item)"
+          :key="i"
+          arrow
+        >
+          {{ item.f_title || "(无标题)" }}
+          <l-tag slot="action" line="gray">{{
+            postDateTime(item.f_time)
+          }}</l-tag>
+        </l-list-item>
+      </l-list>
+    </view>
+
+    <!-- 图表区块 -->
+    <view v-for="item of chartData" :key="item.id" class="margin-bottom">
+      <l-title>{{ item.title }}</l-title>
+      <view
+        :style="{ width: cWidth + 'px', height: cHeight + 'px' }"
+        class="chart-list"
+      >
+        <!--#ifndef MP-ALIPAY -->
+        <canvas
+          v-if="item.type === 1"
+          @tap="chartTap(item, $event)"
+          @touchstart="touchStart(item.id, $event)"
+          @touchmove="touchMove(item.id, $event)"
+          @touchend="touchEnd(item.id, $event)"
+          :style="{ width: cWidth + 'px', height: cHeight + 'px' }"
+          :canvas-id="item.id"
+          :id="item.id"
+          class="charts"
+        ></canvas>
+        <canvas
+          v-else
+          @tap="chartTap(item, $event)"
+          :style="{ width: cWidth + 'px', height: cHeight + 'px' }"
+          :canvas-id="item.id"
+          :id="item.id"
+          class="charts"
+        ></canvas>
+        <!--#endif -->
+
+        <!-- 阿里小程序，需要以2倍尺寸显示，然后缩放为50% -->
+        <!--#ifdef MP-ALIPAY -->
+        <canvas
+          v-if="item.type === 1"
+          @tap="chartTap(item, $event)"
+          @touchstart="touchStart(item.id, $event)"
+          @touchmove="touchMove(item.id, $event)"
+          @touchend="touchEnd(item.id, $event)"
+          :style="{
             width: cWidth * pixelRatio + 'px',
             height: cHeight * pixelRatio + 'px',
             transform: 'scale(' + 1 / pixelRatio + ')',
             marginLeft: (-cWidth * (pixelRatio - 1)) / 2 + 'px',
-            marginTop: (-cHeight * (pixelRatio - 1)) / 2 + 'px'
+            marginTop: (-cHeight * (pixelRatio - 1)) / 2 + 'px',
           }"
-				 :canvas-id="item.id" :id="item.id" class="charts"></canvas>
-				<canvas v-else @tap="chartTap(item, $event)" :style="{
+          :canvas-id="item.id"
+          :id="item.id"
+          class="charts"
+        ></canvas>
+        <canvas
+          v-else
+          @tap="chartTap(item, $event)"
+          :style="{
             width: cWidth * pixelRatio + 'px',
             height: cHeight * pixelRatio + 'px',
             transform: 'scale(' + 1 / pixelRatio + ')',
             marginLeft: (-cWidth * (pixelRatio - 1)) / 2 + 'px',
-            marginTop: (-cHeight * (pixelRatio - 1)) / 2 + 'px'
+            marginTop: (-cHeight * (pixelRatio - 1)) / 2 + 'px',
           }"
-				 :canvas-id="item.id" :id="item.id" class="charts"></canvas>
-				<!--#endif -->
-			</view>
-		</view>
-	</view>
+          :canvas-id="item.id"
+          :id="item.id"
+          class="charts"
+        ></canvas>
+        <!--#endif -->
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import moment from 'moment'
-	import mapValues from 'lodash/mapValues'
-	import uCharts from '@/common/u-charts.js'
-
-	// 用于保存图表操作对象
-	let chartsObject = {}
-	let chartsConfig = {}
-
-	export default {
-		data() {
-			return {
-				imgData: [],
-				listData: [],
-				myList: [],
-
-				countData: [],
-				noticeData: [],
-				chartData: [],
-
-				pixelRatio: 1,
-				cWidth: '',
-				cHeight: '',
-				chartsFontSize: 10
-			}
-		},
-
-		async onLoad(param) {
-			await this.init(param)
-		},
-
-		// 本页面开启下拉刷新，用于刷新首页数据
-		onPullDownRefresh() {
-			this.refresh().then(() => {
-				this.TOAST('已更新首页数据')
-				uni.stopPullDownRefresh()
-			})
-		},
-
-		methods: {
-			// 页面初始化
-			async init(param) {
-				this.HIDE_LOADING()
-
-				// 有参数表示可能是打开分享消息；将数据存入全局变量以备后续跳转
-				if (param && param.learun && param.pagePath) {
-					this.SET_GLOBAL('jumpParam', param)
-				}
-
-				// 登录状态无效，则跳转到登录页
-				const stateValid = await this.checkLoginState()
-				if (!stateValid) {
-					this.RELAUNCH_TO('/pages/login')
-					return
-				}
-
-				// 图表相关参数初始化
-				this.initCharts()
-
-				// 加载页面数据和全局数据
-				await this.FETCH_CLIENTDATA()
-				await this.refresh()
-
-				// 监听「我的应用」列表修改
-				this.ON('home-list-change', () => {
-					this.HTTP_GET('/function/mylist').then(newList => {
-						this.myList = newList
-					})
-				})
-
-				this.SET_STORAGE('nextTime', null)
-
-				// 处理小程序分享消息跳转
-				// #ifdef MP
-				const jumpParam = this.GET_GLOBAL('jumpParam')
-				if (jumpParam) {
-					this.SET_GLOBAL('jumpParam', null)
-					this.MP_SHARE_DECODE(jumpParam)
-				}
-				// #endif
-			},
-
-			// 验证登录状态
-			async checkLoginState() {
-				const token = this.GET_GLOBAL('token') || uni.getStorageSync('token')
-				if (!token || token === 'null' || token === 'undefined') {
-					this.RELAUNCH_TO('/pages/login')
-					this.HIDE_LOADING()
-
-					return false
-				}
-				this.SET_GLOBAL('token', token)
-
-				// 判断是否有 loginUser 对象
-				if (this.GET_GLOBAL('loginUser')) {
-					return true
-				}
-
-				// 拉取用户信息验证登录态；如果失败则跳转至登录页
-				const userInfo = await this.HTTP_GET('/user/info')
-				if (!userInfo) {
-					this.SET_GLOBAL('token', null)
-					this.SET_STORAGE('token', null)
-					return false
-				}
-
-				// 有登录态，则设置用户信息和全局数据
-				const {
-					baseinfo,
-					mpinfo,
-					post,
-					role
-				} = userInfo
-				const user = { ...baseinfo,
-					post,
-					role
-				}
-				if (mpinfo && Array.isArray(mpinfo) && mpinfo.includes(this.PLATFORM)) {
-					user.miniProgram = true
-				}
-				this.SET_GLOBAL('loginUser', user)
-
-				return true
-			},
-
-			// 刷新首页数据
-			async refresh() {
-				// 清空页面数据
-				chartsObject = {}
-
-				this.imgData = []
-				this.listData = []
-				this.myList = []
-
-				this.countData = []
-				this.noticeData = []
-				this.chartData = []
-
-				// 同时发出请求，获取轮播图、所有功能列表、我的功能列表、商机通知提醒图表数据
-				// 商机、通知提醒图表数据，获取的是数据ID，所以还需要进一步请求
-				const [imgData, listData, myList, settingData] = await Promise.all([
-					this.HTTP_GET('/desktop/imgid' + (this.CONFIG('isDistributed')==true ? '?isDistributed=true' : '')),
-					this.HTTP_GET('/function/list').then(result => result.data),
-					this.HTTP_GET('/function/mylist'),
-					this.HTTP_GET('/desktop/setting').then(result => result.data)
-				])
-				this.imgData=imgData;
-				if (!this.CONFIG('isDistributed'))
-					// 轮播图需要加上 url 前缀
-					this.imgData = imgData.map(t => this.API + `/desktop/img?data=${t}`)
-
-				// 功能区按钮需要处理 icon
-				this.listData = listData.map(item => {
-					const icon = item.F_Icon ? item.F_Icon.replace(`iconfont icon-`, ``) : ''
-					const existsIcon = this.getUiIcons().some(t => t === icon)
-
-					return {
-						...item,
-						icon: existsIcon ? icon : 'roundright'
-					}
-				})
-
-				// 我的应用列表需要过滤掉不存在的按钮
-				this.myList = myList.filter(t => listData.find(item => item.F_Id === t))
-
-				// 发出请求，获取商机信息、消息通知信息、图表信息；三类数据全部同时请求
-				await Promise.all([
-					...settingData.target.map(item =>
-						this.HTTP_GET('/desktop/data', {
-							type: 'Target',
-							id: item.F_Id
-						}).then(data => {
-							if (data && data.value) {
-								const {
-									value
-								} = data
-								this.countData.push({
-									title: item.F_Name,
-									value
-								})
-							}
-						})
-					),
-
-					...settingData.list.map(item =>
-						this.HTTP_GET('/desktop/data', {
-							type: 'list',
-							id: item.F_Id
-						}).then(data => {
-							if (data && data.value) {
-								const {
-									value
-								} = data
-								this.noticeData.push({
-									title: item.F_Name,
-									content: value
-								})
-							}
-						})
-					),
-
-					...settingData.chart.map(item =>
-						this.HTTP_GET('/desktop/data', {
-							type: 'chart',
-							id: item.F_Id
-						}).then(data => {
-							if (data && data.value) {
-								const {
-									value
-								} = data
-								this.chartData.push({
-									title: item.F_Name,
-									value,
-									id: item.F_Id,
-									type: item.F_Type
-								})
-							}
-						})
-					)
-				])
-
-				// 渲染图表
-				this.chartData.forEach(item => {
-					// 根据 item.type 的值选用对应的图表初始化配置项
-					// 0=环形图；1=折线图；2=柱状图
-					const charts = new uCharts(
-						[{
-								...chartsConfig,
-								canvasId: item.id,
-								type: 'ring',
-								series: item.value.map(t => ({
-									name: t.name,
-									data: t.value
-								})),
-								extra: {
-									pie: {
-										offsetAngle: -45,
-										ringWidth: 20,
-										labelWidth: 15
-									}
-								},
-								legend: {
-									lineHeight: 20
-								}
-							},
-							{
-								...chartsConfig,
-								canvasId: item.id,
-								type: 'line',
-								series: [{
-									name: item.title,
-									data: item.value.map(t => t.value)
-								}],
-								categories: item.value.map(t => t.name),
-								extra: {
-									line: {
-										type: 'straight'
-									}
-								},
-								xAxis: {
-									rotateLabel: true,
-									fontSize: this.chartsFontSize,
-									itemCount: 8
-								},
-								enableScroll: true
-							},
-							{
-								...chartsConfig,
-								canvasId: item.id,
-								type: 'column',
-								series: [{
-									name: item.title,
-									data: item.value.map(t => t.value)
-								}],
-								categories: item.value.map(t => t.name),
-								xAxis: {
-									rotateLabel: true,
-									fontSize: this.chartsFontSize
-								}
-							}
-						][item.type]
-					)
-
-					chartsObject[item.id] = charts
-				})
-			},
-
-			// 初始化图表
-			initCharts() {
-				// （阿里小程序）设置图表尺寸为2倍
-				// #ifdef MP-ALIPAY
-				const pixelRatio = uni.getSystemInfoSync().pixelRatio
-				if (pixelRatio > 1) {
-					this.pixelRatio = 2
-					this.chartsFontSize = 15
-				}
-				// #endif
-
-				this.cWidth = uni.upx2px(750)
-				this.cHeight = uni.upx2px(500)
-				chartsConfig = {
-					$this: this,
-					pixelRatio: this.pixelRatio,
-					width: this.cWidth * this.pixelRatio,
-					height: this.cHeight * this.pixelRatio,
-					background: '#FFFFFF',
-					dataLabel: true,
-					padding: [20, 15, 5, 15]
-				}
-			},
-
-			// 图表点击事件
-			chartTap(chartItem, e) {
-				const format = ({
-					name,
-					data
-				}, category) => `${category || ''} ${name}: ${data}`
-
-				// #ifdef MP-DINGTALK
-				const detail = e.detail
-				const item = detail
-				e.mp.changedTouches = [item]
-				// #endif
-
-				chartsObject[chartItem.id].showToolTip(e, {
-					format
-				})
-			},
-
-			// 图表拖动事件（开始）
-			touchStart(chartId, e) {
-				chartsObject[chartId].scrollStart(e)
-			},
-
-			// 图表拖动事件（拖动）
-			touchMove(chartId, e) {
-				chartsObject[chartId].scroll(e)
-			},
-
-			// 图表拖动事件（结束）
-			touchEnd(chartId, e) {
-				chartsObject[chartId].scrollEnd(e)
-			},
-
-			// 格式化日期的显示（新闻列表、通知公告等）
-			postDateTime(timeStr) {
-				return moment(timeStr).fromNow()
-			},
-
-			// 点击功能按钮
-			funcListClick(item) {
-				if (item.F_IsSystem === 2) {
-					this.NAV_TO(`/pages/customapp/list?formId=${item.F_FormId}`, item, true)
-					return
-				}
-
-				this.NAV_TO(`/pages/${item.F_Url}/list`)
-			},
-
-			// 点击通知公告的标题
-			noticeClick(item) {
-				this.NAV_TO('/pages/home/notice', item, true)
-			},
-
-			// #ifndef H5
-			// 点击左上角扫码图标，H5 无此功能
-			scanClick() {
-				uni.scanCode({
-					scanType: ['qrCode', 'barCode'],
-					success: ({
-						result,
-						charSet
-					}) => {
-						// 您可以在这里自行定制扫码后的功能
-					}
-				})
-			},
-			// #endif
-
-			// 点击更多功能按钮
-			moreClick(openSearch) {
-				this.NAV_TO(`/pages/home/more${openSearch ? '?search=1' : ''}`)
-			},
-
-			// 点击右上角的消息按钮
-			msgClick() {
-				this.TAB_TO('/pages/msg')
-			}
-		},
-
-		computed: {
-			// 「我的功能」区域按钮列表
-			funcListDisplay() {
-				const {
-					myList,
-					listData
-				} = this
-				const myFuncList = myList.reduce((list, id) => {
-					if (listData.find(t => t.F_Id === id)) {
-						return [...list, listData.find(t => t.F_Id === id)]
-					}
-					return list
-				}, [])
-
-				return myFuncList
-			},
-
-			// imgData 数组的长度
-			imgCount() {
-				return this.imgData.length
-			}
+import moment from "moment";
+import mapValues from "lodash/mapValues";
+import uCharts from "@/common/u-charts.js";
+
+// 用于保存图表操作对象
+let chartsObject = {};
+let chartsConfig = {};
+
+export default {
+  data() {
+    return {
+      imgData: [],
+      listData: [],
+      myList: [],
+
+      countData: [],
+      noticeData: [],
+      chartData: [],
+
+      pixelRatio: 1,
+      cWidth: "",
+      cHeight: "",
+      chartsFontSize: 10,
+    };
+  },
+
+  async onLoad(param) {
+    await this.init(param);
+  },
+
+  // 本页面开启下拉刷新，用于刷新首页数据
+  onPullDownRefresh() {
+    this.refresh().then(() => {
+      this.TOAST("已更新首页数据");
+      uni.stopPullDownRefresh();
+    });
+  },
+
+  methods: {
+    // 页面初始化
+    async init(param) {
+      this.HIDE_LOADING();
+
+      // 有参数表示可能是打开分享消息；将数据存入全局变量以备后续跳转
+      if (param && param.learun && param.pagePath) {
+        this.SET_GLOBAL("jumpParam", param);
+      }
+
+      // 登录状态无效，则跳转到登录页
+      const stateValid = await this.checkLoginState();
+      if (!stateValid) {
+        this.RELAUNCH_TO("/pages/login");
+        return;
+      }
+      // 图表相关参数初始化
+      this.initCharts();
+
+      // 加载页面数据和全局数据
+      await this.FETCH_CLIENTDATA();
+      await this.refresh();
+
+      // 监听「我的应用」列表修改
+      this.ON("home-list-change", () => {
+        this.HTTP_GET("learun/adms/function/mylist").then((newList) => {
+          this.myList = newList;
+        });
+      });
+
+      this.SET_STORAGE("nextTime", null);
+
+      // 处理小程序分享消息跳转
+      // #ifdef MP
+      const jumpParam = this.GET_GLOBAL("jumpParam");
+      if (jumpParam) {
+        this.SET_GLOBAL("jumpParam", null);
+        this.MP_SHARE_DECODE(jumpParam);
+      }
+      // #endif
+      //微信推送跳转
+      if (!!param.page) {
+        //通知公告
+        if (param.page == "notice") {
+			this.NAV_TO("/pages/LR_OAModule/list");
+        }
+        //邮件
+        if (param.page == "mail") {
+          this.NAV_TO("/pages/EducationalAdministration/SYS_ReceiveMessage/list");
+        }
+        //OA待办
+        if (param.page == "oa") {
+          this.NAV_TO("/pages/nworkflow/myflow/list");
+        }
+		//公文下发
+		if (param.page == "file") {
+			this.NAV_TO("/pages/EducationalAdministration/Sys_ReceiveFile/list");
 		}
-	}
+        return;
+      }
+    },
+
+    // 验证登录状态
+    async checkLoginState() {
+      const token = this.GET_GLOBAL("token") || uni.getStorageSync("token");
+      if (!token || token === "null" || token === "undefined") {
+        this.RELAUNCH_TO("/pages/login");
+        this.HIDE_LOADING();
+
+        return false;
+      }
+      this.SET_GLOBAL("token", token);
+
+      // 判断是否有 loginUser 对象
+      if (this.GET_GLOBAL("loginUser")) {
+        return true;
+      }
+
+      // 拉取用户信息验证登录态；如果失败则跳转至登录页
+      const userInfo = await this.HTTP_GET("learun/adms/user/info");
+      if (!userInfo) {
+        this.SET_GLOBAL("token", null);
+        this.SET_STORAGE("token", null);
+        return false;
+      }
+
+      // 有登录态，则设置用户信息和全局数据
+      const { baseinfo, mpinfo, post, role } = userInfo;
+      const user = { ...baseinfo, post, role };
+      if (mpinfo && Array.isArray(mpinfo) && mpinfo.includes(this.PLATFORM)) {
+        user.miniProgram = true;
+      }
+      this.SET_GLOBAL("loginUser", user);
+
+      return true;
+    },
+
+    // 刷新首页数据
+    async refresh() {
+      // 清空页面数据
+      chartsObject = {};
+
+      this.imgData = [];
+      this.listData = [];
+      this.myList = [];
+
+      this.countData = [];
+      this.noticeData = [];
+      this.chartData = [];
+
+      // 同时发出请求，获取轮播图、所有功能列表、我的功能列表、商机通知提醒图表数据
+      // 商机、通知提醒图表数据，获取的是数据ID，所以还需要进一步请求
+      const [imgData, listData, myList, settingData] = await Promise.all([
+        this.HTTP_GET(
+          "learun/adms/desktop/imgid" +
+            (this.CONFIG("isDistributed") == true ? "?isDistributed=true" : "")
+        ),
+        this.HTTP_GET("learun/adms/function/list").then(
+          (result) => result.data
+        ),
+        this.HTTP_GET("learun/adms/function/mylist"),
+        this.HTTP_GET("learun/adms/desktop/setting").then(
+          (result) => result.data
+        ),
+      ]);
+      this.imgData = imgData;
+      if (!this.CONFIG("isDistributed"))
+        // 轮播图需要加上 url 前缀
+        this.imgData = imgData.map((t) => this.API + `/desktop/img?data=${t}`);
+
+      // 功能区按钮需要处理 icon
+      this.listData = listData.map((item) => {
+        const icon = item.F_Icon
+          ? item.F_Icon.replace(`iconfont icon-`, ``)
+          : "";
+        const existsIcon = this.getUiIcons().some((t) => t === icon);
+
+        return {
+          ...item,
+          icon: existsIcon ? icon : "roundright",
+        };
+      });
+
+      // 我的应用列表需要过滤掉不存在的按钮
+      this.myList = myList.filter((t) =>
+        listData.find((item) => item.F_Id === t)
+      );
+
+      // 发出请求，获取商机信息、消息通知信息、图表信息；三类数据全部同时请求
+      await Promise.all([
+        ...settingData.target.map((item) =>
+          this.HTTP_GET("learun/adms/desktop/data", {
+            type: "Target",
+            id: item.F_Id,
+          }).then((data) => {
+            if (data && data.value) {
+              const { value } = data;
+              this.countData.push({
+                title: item.F_Name,
+                value,
+              });
+            }
+          })
+        ),
+
+        ...settingData.list.map((item) =>
+          this.HTTP_GET("learun/adms/desktop/data", {
+            type: "list",
+            id: item.F_Id,
+          }).then((data) => {
+            if (data && data.value) {
+              const { value } = data;
+              this.noticeData.push({
+                title: item.F_Name,
+                content: value,
+              });
+            }
+          })
+        ),
+
+        ...settingData.chart.map((item) =>
+          this.HTTP_GET("learun/adms/desktop/data", {
+            type: "chart",
+            id: item.F_Id,
+          }).then((data) => {
+            if (data && data.value) {
+              const { value } = data;
+              this.chartData.push({
+                title: item.F_Name,
+                value,
+                id: item.F_Id,
+                type: item.F_Type,
+              });
+            }
+          })
+        ),
+      ]);
+
+      // 渲染图表
+      this.chartData.forEach((item) => {
+        // 根据 item.type 的值选用对应的图表初始化配置项
+        // 0=环形图；1=折线图；2=柱状图
+        const charts = new uCharts(
+          [
+            {
+              ...chartsConfig,
+              canvasId: item.id,
+              type: "ring",
+              series: item.value.map((t) => ({
+                name: t.name,
+                data: t.value,
+              })),
+              extra: {
+                pie: {
+                  offsetAngle: -45,
+                  ringWidth: 20,
+                  labelWidth: 15,
+                },
+              },
+              legend: {
+                lineHeight: 20,
+              },
+            },
+            {
+              ...chartsConfig,
+              canvasId: item.id,
+              type: "line",
+              series: [
+                {
+                  name: item.title,
+                  data: item.value.map((t) => t.value),
+                },
+              ],
+              categories: item.value.map((t) => t.name),
+              extra: {
+                line: {
+                  type: "straight",
+                },
+              },
+              xAxis: {
+                rotateLabel: true,
+                fontSize: this.chartsFontSize,
+                itemCount: 8,
+              },
+              enableScroll: true,
+            },
+            {
+              ...chartsConfig,
+              canvasId: item.id,
+              type: "column",
+              series: [
+                {
+                  name: item.title,
+                  data: item.value.map((t) => t.value),
+                },
+              ],
+              categories: item.value.map((t) => t.name),
+              xAxis: {
+                rotateLabel: true,
+                fontSize: this.chartsFontSize,
+              },
+            },
+          ][item.type]
+        );
+
+        chartsObject[item.id] = charts;
+      });
+    },
+
+    // 初始化图表
+    initCharts() {
+      // （阿里小程序）设置图表尺寸为2倍
+      // #ifdef MP-ALIPAY
+      const pixelRatio = uni.getSystemInfoSync().pixelRatio;
+      if (pixelRatio > 1) {
+        this.pixelRatio = 2;
+        this.chartsFontSize = 15;
+      }
+      // #endif
+
+      this.cWidth = uni.upx2px(750);
+      this.cHeight = uni.upx2px(500);
+      chartsConfig = {
+        $this: this,
+        pixelRatio: this.pixelRatio,
+        width: this.cWidth * this.pixelRatio,
+        height: this.cHeight * this.pixelRatio,
+        background: "#FFFFFF",
+        dataLabel: true,
+        padding: [20, 15, 5, 15],
+      };
+    },
+
+    // 图表点击事件
+    chartTap(chartItem, e) {
+      const format = ({ name, data }, category) =>
+        `${category || ""} ${name}: ${data}`;
+
+      // #ifdef MP-DINGTALK
+      const detail = e.detail;
+      const item = detail;
+      e.mp.changedTouches = [item];
+      // #endif
+
+      chartsObject[chartItem.id].showToolTip(e, {
+        format,
+      });
+    },
+
+    // 图表拖动事件（开始）
+    touchStart(chartId, e) {
+      chartsObject[chartId].scrollStart(e);
+    },
+
+    // 图表拖动事件（拖动）
+    touchMove(chartId, e) {
+      chartsObject[chartId].scroll(e);
+    },
+
+    // 图表拖动事件（结束）
+    touchEnd(chartId, e) {
+      chartsObject[chartId].scrollEnd(e);
+    },
+
+    // 格式化日期的显示（新闻列表、通知公告等）
+    postDateTime(timeStr) {
+      return moment(timeStr).fromNow();
+    },
+
+    // 点击功能按钮
+    funcListClick(item) {
+      if (item.F_IsSystem === 2) {
+        this.NAV_TO(
+          `/pages/customapp/list?formId=${item.F_FormId}`,
+          item,
+          true
+        );
+        return;
+      }
+
+      this.NAV_TO(`/pages/${item.F_Url}/list`);
+    },
+
+    // 点击通知公告的标题
+    noticeClick(item) {
+		console.log(item);
+      this.NAV_TO("/pages/home/notice", item, true);
+    },
+    informClick(titleName) {
+      if (titleName == "通知公告") {
+        this.NAV_TO("/pages/LR_OAModule/list", "", true);
+      }
+    },
+
+    // #ifndef H5
+    // 点击左上角扫码图标，H5 无此功能
+    scanClick() {
+      uni.scanCode({
+        scanType: ["qrCode", "barCode"],
+        success: ({ result, charSet }) => {
+          // 您可以在这里自行定制扫码后的功能
+        },
+      });
+    },
+    // #endif
+
+    // 点击更多功能按钮
+    moreClick(openSearch) {
+      this.NAV_TO(`/pages/home/more${openSearch ? "?search=1" : ""}`);
+    },
+
+    // 点击右上角的消息按钮
+    msgClick() {
+      this.TAB_TO("/pages/msg");
+    },
+  },
+
+  computed: {
+    // 「我的功能」区域按钮列表
+    funcListDisplay() {
+      const { myList, listData } = this;
+      const myFuncList = myList.reduce((list, id) => {
+        if (listData.find((t) => t.F_Id === id)) {
+          return [...list, listData.find((t) => t.F_Id === id)];
+        }
+        return list;
+      }, []);
+
+      return myFuncList;
+    },
+
+    // imgData 数组的长度
+    imgCount() {
+      return this.imgData.length;
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
-	.page {
-		background-color: #f3f3f3;
-
-		.header {
-			height: 100rpx;
-			background-color: #0c86d8;
-			display: flex;
-			align-items: center;
-
-			.header-left {
-				flex-grow: 0;
-			}
-
-			.header-mid {
-				flex-grow: 1;
-				background-color: #3d9ee0;
-				line-height: 60rpx;
-				height: 60rpx;
-				font-size: 24rpx;
-				color: #fff;
-				border-radius: 6rpx;
-			}
-
-			.header-right {
-				flex-grow: 0;
-			}
-		}
-
-		.content {
-			background-color: #fff;
-		}
-
-		.function-list {
-			padding-bottom: 0;
-
-			.cu-item {
-				.app-item {
-					border-radius: 50%;
-					height: 45px;
-					width: 45px;
-				}
-
-				&:nth-child(7n + 1)>.app-item {
-					background-color: #62bbff;
-				}
-
-				&:nth-child(7n + 2)>.app-item {
-					background-color: #7bd2ff;
-				}
-
-				&:nth-child(7n + 3)>.app-item {
-					background-color: #ffd761;
-				}
-
-				&:nth-child(7n + 4)>.app-item {
-					background-color: #fe955c;
-				}
-
-				&:nth-child(7n + 5)>.app-item {
-					background-color: #ff6283;
-				}
-
-				&:nth-child(7n + 6)>.app-item {
-					background-color: #60e3f3;
-				}
-
-				&:nth-child(7n)>.app-item {
-					background-color: #acc8fe;
-				}
-			}
-		}
-
-		.function-more-btn {
-			display: inline-block;
-			border: currentColor 1px solid;
-			border-radius: 2px;
-			padding: 10rpx 50rpx;
-		}
-
-		.count-list {
-			&:after {
-				content: '';
-				clear: both;
-				display: table;
-			}
-
-			.count-item-value {
-				color: #0188d2;
-				font-size: 24px;
-			}
-		}
-
-		.chart-list {
-			background-color: #fff;
-			overflow: hidden;
-		}
-	}
+.page {
+  background-color: #f3f3f3;
+
+  .header {
+    height: 100rpx;
+    background-color: #0c86d8;
+    display: flex;
+    align-items: center;
+
+    .header-left {
+      flex-grow: 0;
+    }
+
+    .header-mid {
+      flex-grow: 1;
+      background-color: #3d9ee0;
+      line-height: 60rpx;
+      height: 60rpx;
+      font-size: 24rpx;
+      color: #fff;
+      border-radius: 6rpx;
+    }
+
+    .header-right {
+      flex-grow: 0;
+    }
+  }
+
+  .content {
+    background-color: #fff;
+  }
+
+  .function-list {
+    padding-bottom: 0;
+
+    .cu-item {
+      .app-item {
+        border-radius: 50%;
+        height: 45px;
+        width: 45px;
+      }
+
+      &:nth-child(7n + 1) > .app-item {
+        background-color: #62bbff;
+      }
+
+      &:nth-child(7n + 2) > .app-item {
+        background-color: #7bd2ff;
+      }
+
+      &:nth-child(7n + 3) > .app-item {
+        background-color: #ffd761;
+      }
+
+      &:nth-child(7n + 4) > .app-item {
+        background-color: #fe955c;
+      }
+
+      &:nth-child(7n + 5) > .app-item {
+        background-color: #ff6283;
+      }
+
+      &:nth-child(7n + 6) > .app-item {
+        background-color: #60e3f3;
+      }
+
+      &:nth-child(7n) > .app-item {
+        background-color: #acc8fe;
+      }
+    }
+  }
+
+  .function-more-btn {
+    display: inline-block;
+    border: currentColor 1px solid;
+    border-radius: 2px;
+    padding: 10rpx 50rpx;
+  }
+
+  .count-list {
+    &:after {
+      content: "";
+      clear: both;
+      display: table;
+    }
+
+    .count-item-value {
+      color: #0188d2;
+      font-size: 24px;
+    }
+  }
+
+  .chart-list {
+    background-color: #fff;
+    overflow: hidden;
+  }
+}
 </style>
 
 <style lang="less">
-	#home {
-		width: 750rpx;
-		overflow-x: hidden;
-
-		.function-list .cu-item text[class*='cuIcon'] {
-			margin-top: 0 !important;
-		}
-	}
+#home {
+  width: 750rpx;
+  overflow-x: hidden;
+
+  .function-list .cu-item text[class*="cuIcon"] {
+    margin-top: 0 !important;
+  }
+}
 </style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/more.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/more.vue
index ddc629144..fac0dfe5c 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/more.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/more.vue	
@@ -104,8 +104,8 @@ export default {
 
       // 同时发出请求，获取“所有功能按钮列表”和“我的功能按钮列表”
       const [allList, myList] = await Promise.all([
-        this.HTTP_GET('/function/list').then(result => result.data),
-        this.HTTP_GET('/function/mylist')
+        this.HTTP_GET('learun/adms/function/list').then(result => result.data),
+        this.HTTP_GET('learun/adms/function/mylist')
       ])
 
       this.myList = myList.filter(t => allList.find(item => item.F_Id === t))
@@ -132,7 +132,7 @@ export default {
       }
 
       const success = await this.HTTP_POST(
-        '/function/mylist/update',
+        'learun/adms/function/mylist/update',
         this.editList.join(','),
         '「我的应用」列表更新失败'
       )
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/index/index.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/index/index.vue
new file mode 100644
index 000000000..5f4e8783f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/index/index.vue	
@@ -0,0 +1,55 @@
+<template>
+	<view class="content">
+		
+		<button class="popup-btn" @tap="popup_bottom()">请选择</button>
+		<view>{{address}}</view>
+		<linkAddress
+			ref="linkAddress"
+			:height="height"
+			@confirmCallback="confirmCallback()"
+		>
+		</linkAddress>
+	</view>
+</template>
+
+<script>
+	import linkAddress from '../../components/xuan-linkAddress/xuan-linkAddress.vue'
+	export default {
+		components:{
+			linkAddress
+		},
+		data() {
+			return {
+				height: '500px',
+				address:''
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			//点击弹出弹窗
+			popup_bottom: function() {
+				this.height = '550rpx';
+				//显示
+				this.show_popup();
+				
+			},
+			//显示弹窗
+			show_popup: function() {
+				this.$refs.linkAddress.show();
+			},
+			//回掉
+			confirmCallback: function() {
+				let ads=this.$store.state.user_address;
+				this.address=ads.province+ads.city+ads.district;
+			}
+		}
+	}
+</script>
+
+<style>
+	.popup-btn{
+		margin-top: 10px;
+	}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue
index fda52e4db..4d24ac399 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue	
@@ -138,7 +138,7 @@ export default {
       // 不是小程序，则提交用户名、密码登录
       // 是小程序，则申请授权码登录
       if (!type) {
-        let postResult = await this.POST('/user/login', { username, password: this.MD5(password) })
+        let postResult = await this.POST('learun/adms/user/login', { username, password: this.MD5(password) })
         if(postResult[1].data.code=='200'){
           loginResult=postResult[1].data.data;
         }else{
@@ -152,7 +152,7 @@ export default {
           return
         }
 
-        loginResult = await this.HTTP_POST('/user/openid_login', { code, type }, '登录时发生错误')
+        loginResult = await this.HTTP_POST('learun/adms/user/openid_login', { code, type }, '登录时发生错误')
       }
 
       if (!loginResult) {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg.vue
index 7d7557e97..bd59cb137 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg.vue	
@@ -79,7 +79,7 @@ export default {
 
     // 拉取消息
     async fetchMsg() {
-      const message = await this.HTTP_GET('/im/contacts', this.nextTime, '加载信息时通讯出错')
+      const message = await this.HTTP_GET('learun/adms/im/contacts', this.nextTime, '加载信息时通讯出错')
       if (!message) {
         return
       }
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg/chat.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg/chat.vue
index cd9a1976f..1b8e6bd8a 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg/chat.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg/chat.vue	
@@ -81,7 +81,7 @@ export default {
       this.isSystem = sys
       this.SET_TITLE(name)
 
-      const message = await this.HTTP_GET('/im/msg/lastlist', id)
+      const message = await this.HTTP_GET('learun/adms/im/msg/lastlist', id)
       // 记录最晚消息的时间点
       const nextTime = message[0] && message[0].F_CreateDate
       this.nextTime = moment(nextTime).format('YYYY-MM-DD HH:mm:ss')
@@ -110,7 +110,7 @@ export default {
         return
       }
 
-      const message = await this.HTTP_GET('/im/msg/list2', {
+      const message = await this.HTTP_GET('learun/adms/im/msg/list2', {
         otherUserId: this.chatUserId,
         time: this.nextTime
       })
@@ -126,7 +126,7 @@ export default {
 
     // 拉取之前的消息，用于下拉加载
     async fetchBefore() {
-      const message = await this.HTTP_GET('/im/msg/list', {
+      const message = await this.HTTP_GET('learun/adms/im/msg/list', {
         otherUserId: this.chatUserId,
         time: this.earliestTimePoint
       })
@@ -151,7 +151,7 @@ export default {
       this.ready = false
       this.buttonDisabled = true
       const result = await this.HTTP_POST(
-        '/im/send',
+        'learun/adms/im/send',
         { userId: this.chatUserId, content: this.msgInput },
         '消息发送失败'
       )
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue
index a8fc0a996..0ae3c6381 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue	
@@ -113,7 +113,7 @@ export default {
         return
       }
 
-      const success = await this.HTTP_POST('/user/openid_bind', { code, type }, '绑定失败')
+      const success = await this.HTTP_POST('learun/adms/user/openid_bind', { code, type }, '绑定失败')
       if (!success) {
         return
       }
@@ -134,7 +134,7 @@ export default {
         return
       }
 
-      const success = await this.HTTP_POST('/user/openid_unbind', { type: this.PLATFORM }, '解除绑定失败')
+      const success = await this.HTTP_POST('learun/adms/user/openid_unbind', { type: this.PLATFORM }, '解除绑定失败')
       if (!success) {
         return
       }
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/password.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/password.vue
index 1685964dc..e3ca88e12 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/password.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/password.vue	
@@ -39,7 +39,7 @@ export default {
       }
 
       const success = await this.HTTP_POST(
-        '/user/modifypw',
+        'learun/adms/user/modifypw',
         {
           newpassword: this.MD5(newPwd),
           oldpassword: this.MD5(oldPwd)
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/myAttendance/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/myAttendance/list.vue
new file mode 100644
index 000000000..c91be8a0a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/myAttendance/list.vue	
@@ -0,0 +1,353 @@
+<template>
+	<view class="page">
+		<view class="timeTable_sec1">
+			<view class="tSec1Box" id="semester">
+				<image src="~@/common/images/timeT1-1.png" mode="widthFix"></image>
+				<text>{{ semester }}</text>
+			</view>
+			<!--<span class="tSec1Line"></span>-->
+			<view class="tSec1Box" id="weekTime">
+				<text class="text-xxl cuIcon cuIcon-back" @click="timeTap(1)"></text>
+				<text>{{todayWeek.Monday}}</text>
+				-
+				<text>{{todayWeek.Sunday}}</text>
+				<text class="text-xxl cuIcon cuIcon-right"  @click="timeTap(2)"></text>
+			</view>
+		</view>
+		<view class="timeTable_sec2">
+			<view class="tSec2Top">
+				<view class="tSec2TopLi" v-for="(item, ind) in weekArr" :key="item.en" @click="liTap(ind)" :class="ind == num? 'active' : ''">
+					<text>{{ item.en }}</text>
+					<text>{{ item.cn }}</text>
+				</view>
+			</view>
+			<view class="tSec2Box">
+				<view class="tSec2Con" v-for="(items, i) in dataArr" :key="items.num" v-show="i == num">
+					<view class="tSec2List">
+						<view v-if="items.lessonData.length <= 0" class="tSec2ListLi"><view class="noHtml">该时间段没有课程</view></view>
+						<view v-if="items.lessonData.length > 0">
+							<view class="tSec2ListLi" v-for="(k, j) in items.lessonData" :key="j" @click="classTap(k)">
+								<view class="tSec2ListL">第 {{ k.sectionTime }} 节</view>
+								<view class="tSec2ListR">
+									<view class="tSec2ListBox">
+										<view class="tSec2ListT">{{ k.LessonName }}</view>
+										<view class="tSec2ListTxt">
+											<text class="text-xxl cuIcon cuIcon-profile"></text>
+											{{ k.EmpName }}
+										</view>
+									</view>
+									<view class="tSec2Location">
+										<text class="text-xxl cuIcon cuIcon-location"></text>
+										{{ k.ClassroomName }}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import common from '@/common/js/common.js'
+export default {
+	data() {
+		return {
+			semester: '',
+			num: 0,
+			user: null,
+			weekDayTime: 0,
+			todayWeek: {},
+			dataArr: [],
+			weekArr: [
+				{
+					en: 'MON',
+					cn: '星期一'
+				},
+				{
+					en: 'TUE',
+					cn: '星期二'
+				},
+				{
+					en: 'WED',
+					cn: '星期三'
+				},
+				{
+					en: 'THU',
+					cn: '星期四'
+				},
+				{
+					en: 'FRI',
+					cn: '星期五'
+				},
+				{
+					en: 'SAT',
+					cn: '星期六'
+				},
+				{
+					en: 'SUN',
+					cn: '星期日'
+				}
+			]
+		};
+	},
+	methods: {
+		async init() {
+			let _this = this;
+			_this.todayWeek = common.weekday();
+			_this.semester = common.judgeDate();
+			_this.weekDayTime = 7 * common.oneDayTime();
+			_this.user = _this.GET_GLOBAL('loginUser');
+			_this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
+		},
+		liTap(ind) {
+			this.num = ind;
+		},
+		timeTap(num) {
+			let _this = this;
+			if (num == 1) {
+			    _this.todayWeek.MondayTime = _this.todayWeek.MondayTime - _this.weekDayTime;
+			    _this.todayWeek.SundayTime = _this.todayWeek.SundayTime - _this.weekDayTime;
+			} else {
+			    _this.todayWeek.MondayTime = _this.todayWeek.MondayTime + _this.weekDayTime;
+			    _this.todayWeek.SundayTime = _this.todayWeek.SundayTime + _this.weekDayTime;
+			}
+			_this.num = 0;
+			_this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime);
+			_this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime);
+			_this.semester = common.judgeDate(_this.todayWeek.SundayTime);
+			_this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
+		},
+		loadData(start, end) {
+		    var param = { StartDate: start, EndDate: end };
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('learun/adms/timetable/list', param, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				_this.ProcessingData(res);
+			});
+			
+		},
+		ProcessingData(data) {
+			let dataM = [
+				{
+					weekTime: 1,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 2,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 3,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 4,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 5,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 6,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 7,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				}
+			];
+			data.forEach((n, i) => {
+				n.sectionTime = n.LessonTime.slice(1);
+				dataM.forEach((k, j) => {
+					if (k.weekTime == n.LessonTime.slice(0, 1)) {
+						k.lessonData.push(n);
+					}
+				});
+			});
+			dataM.forEach((n, i) => {
+				n.lessonData.sort(common.compare('sectionTime'));
+			});
+			this.dataArr = dataM;
+		},
+		classTap(data) {
+			let _this = this;
+			// console.log(_this.user)
+			this.NAV_TO('./single', data, true);
+		}
+	},
+	created() {
+		this.init()
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.page{
+	background: #fff;
+}
+.timeTable_sec1 {
+	padding: 14px 12px;
+	text-align: center;
+	background: #0075c4;
+	color: #94d4ff;
+	font-size: 0;
+}
+.tSec1Box > * {
+	display: inline-block;
+	vertical-align: middle;
+}
+.tSec1Line {
+	height: 13px;
+	width: 1px;
+	background: #94d4ff;
+	margin: 0 10px;
+}
+.tSec1Box {
+	font-size: 15px;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+#semester {
+	margin-bottom: 10px;
+}
+#weekTime {
+}
+#weekTime text {
+	margin: 0 10px;
+}
+.tSec1Box > text {
+	width: auto;
+	text-align: center;
+	line-height: 22px;
+}
+.tSec1Box image {
+	width: 15px;
+	margin-right: 2px;
+}
+.tSec1Box text:after {
+	display: none;
+}
+.timeTable_sec2 {
+	margin-bottom: 30px;
+}
+.tSec2Top {
+	padding: 0 12px;
+	background: #0075c4;
+	height: 55px;
+	text-align: center;
+	overflow: hidden;
+}
+.tSec2TopLi {
+	width: 14.285714%;
+	float: left;
+	line-height: 18px;
+	padding: 9px 0 9px;
+	color: #fff;
+	font-size: 13px;
+	border-right: 1px solid #1084d2;
+	border-top: 1px solid #1084d2;
+}
+.tSec2TopLi:first-child {
+	border-left: 1px solid #1084d2;
+}
+.tSec2TopLi.active {
+	color: #0075c4;
+	background: #fff;
+	border-color: #fff;
+}
+.tSec2TopLi text {
+	display: block;
+}
+
+.tSec2TopLi text:first-child {
+	letter-spacing: 2px;
+	text-transform: uppercase;
+}
+.tSec2Box {
+	padding: 0 12px;
+	margin-top: 10px;
+}
+.tSec2Con {
+	border-left: 1px solid #d5eaf7;
+	border-right: 1px solid #d5eaf7;
+	border-top: 1px solid #d5eaf7;
+	// display: none;
+}
+.tSec2Con:first-child {
+	display: block;
+}
+.tSec2List {
+	margin-top: 10px;
+}
+.tSec2List:first-child {
+	margin-top: 0;
+}
+.tSec2ListLi {
+	border-bottom: 1px solid #d5eaf7;
+	overflow: hidden;
+	height: 60px;
+}
+.tSec2ListL {
+	float: left;
+	background: #e8f6ff;
+	height: 100%;
+	width: 25%;
+	text-align: center;
+	line-height: 36px;
+	padding: 11px 0;
+	font-size: 14px;
+	color: #646464;
+}
+.tSec2ListR {
+	float: left;
+	width: 75%;
+	height: 100%;
+	line-height: 18px;
+	padding: 4px 0;
+	overflow: hidden;
+}
+.tSec2ListBox {
+	width: 70%;
+	float: left;
+	padding-left: 5px;
+}
+.tSec2ListT {
+	color: #3e3e3e;
+	font-size: 15px;
+	margin: 5px 0;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.tSec2ListTxt {
+	color: #888888;
+	font-size: 13px;
+}
+.tSec2Location {
+	width: 30%;
+	float: left;
+	line-height: 44px;
+	font-size: 13px;
+	color: #888888;
+}
+.noHtml {
+	height: 100%;
+	line-height: 60px;
+	text-align: center;
+	font-size: 14px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/myAttendance/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/myAttendance/single.vue
new file mode 100644
index 000000000..db1c4bdef
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/myAttendance/single.vue	
@@ -0,0 +1,301 @@
+<template>
+	<view class="page">
+		<view class="timeTable_sec3">
+			<view class="tSec3Box">
+				<view class="tSec3Time">
+					<text>{{ data.date }}</text>
+					第{{ data.time }}节
+				</view>
+			</view>
+		</view>
+		<view class="timeTable_sec4">
+			<view class="tSec4Box">
+				<view class="tSec4T">
+					<view>{{ data.lessonName }}</view>
+					<view>{{ data.classRoomName }}教室</view>
+				</view>
+				<view class="tSec4Con">
+					<view class="studSeeSec2Txt">
+						<view>
+							<text>{{ data.shouldArrive }}</text>
+							人
+						</view>
+						<view>应到</view>
+					</view>
+					<view class="studSeeSec2Line"></view>
+					<view class="studSeeSec2Txt">
+						<view>
+							<text>{{ data.turnTo }}</text>
+							人
+						</view>
+						<view>实到</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="timeTable_sec2">
+			<view class="tSec2Box2">
+				<view class="tSec2Con2">
+					<view class="studCheckList">
+						<view class="studCheckLi" v-for="(k, i) in data.result" :key="k.StuName">
+							<view style="float:right; margin-top: 7px;" class="studCheckStatue" :class="type(k.Sort)">
+								<text></text>
+								{{ k.Sort }}
+							</view>
+							<view class="studCheckTxt">
+								<image src="~@/common/images/person.png" mode="widthFix"></image>
+								<text style="margin-left:0">
+									{{ k.StuName }}
+								</text>
+								<image src="~@/common/images/location.png" mode="widthFix"></image>
+								{{ k.ClassName }}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			pageInfo: null,
+			data: {}
+		};
+	},
+	methods: {
+		init() {
+			let _this = this;
+			_this.pageInfo = _this.GET_PARAM(); //获取页面传递参数
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('learun/adms/timetable/StuList', _this.pageInfo, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				_this.data = res;
+			});
+		}
+	},
+	computed: {
+		type() {
+			return str => {
+				let sort = '';
+				switch (str) {
+				    case "迟到":
+				        sort = "studCheckStatue2";
+				        break;
+				    case "早退":
+				        sort = "studCheckStatue2";
+				        break;
+				    case "病假":
+				        sort = "studCheckStatue4";
+				        break;
+				    case "事假":
+				        sort = "studCheckStatue2";
+				        break;
+				    case "准时":
+				        sort = "studCheckStatue1";
+				        break;
+				    case "旷课":
+				        sort = "studCheckStatue3";
+				        break;
+				    default:
+				}
+	
+				return sort;
+			};
+		}
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.timeTable_sec2 {
+	margin-bottom: 30px;
+}
+
+.tSec2Box2 {
+	/*padding: 0 12px;*/
+	background: #fff;
+}
+
+.tSec2Con2 {
+	display: none;
+}
+
+.tSec2Con2:first-child {
+	display: block;
+}
+
+.studCheckLi {
+	border-bottom: 1px solid #d5eaf7;
+	padding: 8px 12px;
+	font-size: 15px;
+}
+
+.studCheckT {
+	font-size: 15px;
+	color: #6e6e6e;
+}
+
+.studCheckT image {
+	width: 11px;
+	position: relative;
+	margin-right: 5px;
+}
+
+.studCheckTxt {
+	font-size: 13px;
+	color: #9d9e9e;
+	margin: 7px 0;
+}
+
+.studCheckTxt text {
+	margin: 0 30px;
+	display: inline-block;
+	width: 100px;
+}
+
+.studCheckTxt image {
+	width: 12px;
+	position: relative;
+	margin-right: 3px;
+	top: 1px;
+}
+
+.studCheckStatue {
+	font-size: 13px;
+}
+
+.studCheckStatue text {
+	display: inline-block;
+	width: 8px;
+	height: 8px;
+	position: relative;
+	margin-right: 5px;
+	vertical-align: middle;
+	top: -2px;
+}
+
+.studCheckStatue1 {
+	color: #0089fe;
+}
+
+.studCheckStatue1 text {
+	background: #0089fe;
+}
+
+.studCheckStatue2 {
+	color: #f2b60a;
+}
+
+.studCheckStatue2 text {
+	background: #f2b60a;
+}
+
+.studCheckStatue3 {
+	color: #e24545;
+}
+
+.studCheckStatue3 text {
+	background: #e24545;
+}
+
+.studCheckStatue4 {
+	color: #29cf41;
+}
+
+.studCheckStatue4 text {
+	background: #29cf41;
+}
+
+.noHtml {
+	height: 100%;
+	line-height: 60px;
+	text-align: center;
+	font-size: 14px;
+}
+
+.timeTable_sec3 {
+	padding: 0px 12px 1px;
+	text-align: center;
+	background: #0c86d8;
+	height: 100px;
+}
+
+.tSec3Time {
+	text-align: right;
+	line-height: 24px;
+	font-size: 14px;
+	color: #fff;
+}
+
+.tSec3Time text {
+	float: left;
+}
+
+.timeTable_sec4 {
+	padding: 0 12px;
+	margin-top: -65px;
+	margin-bottom: 10px;
+}
+
+.tSec4Box {
+	background: #fff;
+	padding: 20px 0;
+	text-align: center;
+	font-size: 0;
+	border-radius: 4px;
+}
+
+.tSec4T {
+	text-align: center;
+	margin-bottom: 10px;
+}
+
+.tSec4T view:first-child {
+	color: #1a1a1a;
+	font-size: 16px;
+	margin-bottom: 5px;
+}
+
+.tSec4T view:last-child {
+	color: #7a7a7a;
+	font-size: 13px;
+}
+
+.tSec4Con > * {
+	display: inline-block;
+	vertical-align: middle;
+}
+
+.tSec4Con .studSeeSec2Line {
+	height: 25px;
+	width: 1px;
+	background: #d6dfe2;
+	margin: 0 40px;
+}
+
+.tSec4Con .studSeeSec2Txt {
+	color: #8a8a8a;
+}
+
+.tSec4Con .studSeeSec2Txt view:first-child {
+	font-size: 13px;
+}
+
+.tSec4Con .studSeeSec2Txt view:first-child text {
+	font-size: 20px;
+	color: #0089fe;
+	margin-right: 5px;
+}
+
+.tSec4Con .studSeeSec2Txt view:last-child {
+	font-size: 15px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice/list.vue
new file mode 100644
index 000000000..46347e52f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice/list.vue	
@@ -0,0 +1,296 @@
+<template>
+	<view class="notice">
+		<!--标题-->
+		<view class="noticeT">西昌民族幼儿师范高等专科学校</view>
+		<view class="noticeT">2019年新生入学须知</view>
+		<!--简介-->
+		<view class="noticeBox">
+			<view class="noticeTitle">亲爱的同学：</view>
+			<view class="noticeTxt">
+				<text>姓名：</text>
+				<text id="StuName">{{ entity.StuName }}</text>
+			</view>
+			<view class="noticeTxt">
+				<text>学号：</text>
+				<text id="StuNo">{{ entity.StuNo }}</text>
+			</view>
+			<view class="noticeTxt">
+				<text>系：</text>
+				<text id="DeptNo">{{ entity.DeptNo }}</text>
+			</view>
+			<view class="noticeTxt">
+				<text>专业：</text>
+				<text id="MajorNo">{{ entity.MajorNo }}</text>
+			</view>
+			<view class="noticeTxt">
+				<text>班级：</text>
+				<text id="ClassNo">{{ entity.ClassNo }}</text>
+			</view>
+			<view class="noticeTxt">
+				<text>辅导员：</text>
+				<text id="ClassTutorName">{{ entity.ClassTutorName }}</text>
+			</view>
+			<view class="noticeTxt">
+				<text>电话：</text>
+				<text id="ClassTutorMobile">{{ entity.ClassTutorMobile }}</text>
+			</view>
+			<view class="noticeTxt">
+				<text>宿舍：</text>
+				<text id="Dormitory">{{ entity.DormitoryName }}</text>
+			</view>
+		</view>
+		<!--报到内容-->
+		<view class="noticeBox">
+			<view class="noticeTitle">报到内容</view>
+			<view class="noticeTxt">
+				<text>是否完善个人信息</text>
+				<text id="IsCompleteInfo">{{ entity.IsCompleteInfo }}</text>
+			</view>
+			<view class="noticeTxt">
+				<text>交档案状态</text>
+				<text id="CollectFileStatus">{{ CollectFileStatus }}</text>
+			</view>
+			<view class="noticeTxt">
+				<text>新生缴费</text>
+				<text id="PayFeeStatus">{{ PayFeeStatus }}</text>
+			</view>
+			<view class="noticeTxt">
+				<text>领取宿舍钥匙和校园卡</text>
+				<text id="GetKeyStatus">{{ GetKeyStatus }}</text>
+			</view>
+			<view class="noticeLine"></view>
+			<!--报到联系电话-->
+			<view class="noticeTitle">报到联系电话</view>
+			<view class="noticeTxt">
+				<text>学前教育系</text>
+				<text>13778660186</text>
+			</view>
+			<view class="noticeTxt">
+				<text>小学教育系</text>
+				<text>18009039863</text>
+			</view>
+			<view class="noticeTxt">
+				<text>艺术教育系</text>
+				<text>18383465555</text>
+			</view>
+			<view class="noticeTxt">
+				<text>艺术教育系</text>
+				<view>
+					<view>18048999880</view>
+					<view>13981592572</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="noticeTxt">欢迎就读西昌民族幼儿师范高等专科学校！</view>
+		<view class="noticeTxt">现将新生报到有关事项通知如下，请认真阅读并做好入学准备。</view>
+
+		<view class="noticeTitle">一、入学时间安排</view>
+		<view class="noticeTxt">（一）报到时间：2019年9月7日——9月8日 8:30-12：00 13:00-17：00</view>
+		<view class="noticeTxt">（二）国防教育、入学教育时间：2019年9月9日——9月25日</view>
+		<view class="noticeTxt">（三）体检时间：2019年9月26日——27日</view>
+		<view class="noticeTxt">（四）正式行课时间：2019年9月27日19:00</view>
+
+		<view class="noticeTitle">二、报到地点</view>
+		<view class="noticeTxt">西昌民族幼儿师范高等专科学校体育馆（西门）。</view>
+
+		<view class="noticeTitle">三、收费标准</view>
+		<view class="noticeBox">
+			<view class="noticeTitle">专业名称：学前教育</view>
+			<view class="noticeTxt">
+				<text>学费</text>
+				<text>3700(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>住宿费</text>
+				<text>1000(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>书本费</text>
+				<text>600(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>合计</text>
+				<text>5300(元/年)</text>
+			</view>
+			<view class="noticeLine"></view>
+			<view class="noticeTitle">专业名称：小学教育</view>
+			<view class="noticeTxt">
+				<text>学费</text>
+				<text>3700(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>住宿费</text>
+				<text>1000(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>书本费</text>
+				<text>600(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>合计</text>
+				<text>5300(元/年)</text>
+			</view>
+			<view class="noticeLine"></view>
+			<view class="noticeTitle">专业名称：艺术教育</view>
+			<view class="noticeTxt">
+				<text>学费</text>
+				<text>3700(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>住宿费</text>
+				<text>1000(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>书本费</text>
+				<text>600(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>合计</text>
+				<text>5300(元/年)</text>
+			</view>
+			<view class="noticeLine"></view>
+			<view class="noticeTitle">专业名称：美术教育</view>
+			<view class="noticeTxt">
+				<text>学费</text>
+				<text>5000(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>住宿费</text>
+				<text>1000(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>书本费</text>
+				<text>600(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>合计</text>
+				<text>6600(元/年)</text>
+			</view>
+			<view class="noticeLine"></view>
+			<view class="noticeTitle">专业名称：会计</view>
+			<view class="noticeTxt">
+				<text>学费</text>
+				<text>3700(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>住宿费</text>
+				<text>1000(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>书本费</text>
+				<text>600(元/年)</text>
+			</view>
+			<view class="noticeTxt">
+				<text>合计</text>
+				<text>5300(元/年)</text>
+			</view>
+			<view class="noticeTitle">备注：</view>
+			<view class="noticeTxt">1、书本费多退少补；</view>
+			<view class="noticeTxt">2、住宿费1200元/年.生（2人间,仅供身体障碍学生使用）。</view>
+		</view>
+		<view class="noticeTxt">其它费用：</view>
+		<view class="noticeTxt">（一）公寓用品：学校不统一提供公寓用品，学生可自带，也可在供应商处购买（学生公寓床铺尺寸为90cm*200cm）。</view>
+		<view class="noticeTxt">（二）保险费用：学生自愿购买城镇基本医疗保险、学生平安保险。</view>
+		<view class="noticeTxt">（三）体 检 费：学校统一组织体检，学生按医院收费标准缴费。</view>
+		<view class="noticeTxt">（四）军训服装：学生自行在供应商处购买。</view>
+		<view class="noticeTxt">（五）新生报到后到各系部领取校园一卡通，并自行预存生活费用。</view>
+
+		<view class="noticeTitle">四、携带资料</view>
+		<view class="noticeTxt">报到时带录取通知书、第二代身份证、近期免冠1吋、2吋标准照各5张（蓝底、白底均可）、党（团）员关系介绍信、考生档案。</view>
+
+		<view class="noticeTitle">五、请假规定</view>
+		<view class="noticeTxt">因特殊原因不能按规定时间到学校报到的新生须提前向学校招生就业处履行请假手续（书面、短信或微信），逾期未报到者视为自动放弃入学资格。</view>
+
+		<view class="noticeTitle">六、户籍迁移</view>
+		<view class="noticeTxt">按照公安部有关规定，户口迁移遵循自愿原则。</view>
+
+		<view class="noticeText">西昌民族幼儿师范高等专科学校</view>
+		<view class="noticeText">二0一九年九月一日</view>
+	</view>
+</template>
+
+<script>
+export default{
+	data() {
+		return {
+			entity: {}
+		}
+	},
+	methods:{
+		init() {
+			let userinfo = this.GET_GLOBAL('loginUser');
+			let _this = this;
+			//数据绑定
+			_this.LOADING('加载数据中…');
+			// _this.HIDE_LOADING();
+			_this.HTTP_GET('StuInfoFresh/stuInfoFreshEntity', userinfo.account, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				console.log(res)
+				if (res) {
+				    _this.entity = res['StuInfoFreshEntity'];
+				}
+			});
+		}
+	},
+	computed:{
+		PayFeeStatus() {
+			return this.entity.PayFeeStatus == "1" ? "已缴费" : "未缴费"
+		},
+		CollectFileStatus() {
+			return this.entity.CollectFileStatus == "1" ? "已提交" : "未提交"
+		},
+		GetKeyStatus() {
+			return this.entity.GetKeyStatus == "1" ? "已领取" : "未领取"
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+.notice {
+	padding: 10px 12px;
+	background: #fff;
+}
+.noticeT {
+	font-size: 20px;
+	line-height: 26px;
+	text-align: center;
+}
+.noticeTitle {
+	font-size: 16px;
+	/* border-top: 10px #f9f9f9 solid; */
+	/* margin: 0 -12px; */
+	margin: 15px 0 10px;
+}
+.noticeBox {
+	margin: 10px 0;
+	padding: 12px;
+	background: #f9f9f9;
+	border-radius: 14px;
+}
+.noticeBox .noticeTitle:first-child {
+	margin-top: 0;
+}
+.noticeTxt,
+.noticeText {
+	font-size: 14px;
+	line-height: 24px;
+	overflow: hidden;
+	margin: 5px 0;
+}
+.noticeText {
+	text-align: right;
+}
+.noticeTxt > *:last-child {
+	float: right;
+}
+.noticeLine {
+	height: 1px;
+	margin: 10px 0;
+	background: #e4e4e4;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue
new file mode 100644
index 000000000..9176e0787
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue	
@@ -0,0 +1,251 @@
+<template>
+	<view class="enSecBox">
+	    <!-- 已完成 类名 sSec1Type1 图片   enter1-1 enter1-2 enter1-3 enter1-4 enter1-5-->
+	    <!-- 未完成 类名 sSec1Type2 图片   enter2-1 enter2-2 enter2-3 enter2-4 enter2-5-->
+	    <!-- 可以点击类名  sSec1Tap -->
+	    <view class="ensHeader">
+	        <view class="ensTime">2020</view>
+	        <view class="ensHeadT">新生入校流程</view>
+	    </view>
+	    <view class="ensSec1">
+	        <view class="eSec1Box">
+	            <view class="eSec1Top">step<text>1</text></view>
+	            <view :class="one? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="IsCompleteInfo" @click="tapList('../welcome/list')">
+					<image src="~@/common/images/enter1-1.png" mode="widthFix" v-if="one"></image>
+					<image src="~@/common/images/enter2-1.png" mode="widthFix" v-else></image>
+	                <view class="sSec1Txt">
+	                    完善学生信息
+	                </view>
+	                <view class="sSec1State" v-if="one">完成</view>
+	                <view class="sSec1State" v-else>未完成</view>
+	            </view>
+	        </view>
+	        <view class="eSec1Box">
+				<image src="~@/common/images/enter1-6.png" class="sSecDown" mode="widthFix"></image>
+	            <view class="eSec1Top">step<text>2</text></view>
+	            <view :class="twoOne? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="PayFeeStatus">
+					<image src="~@/common/images/enter1-2.png" mode="widthFix" v-if="twoOne"></image>
+					<image src="~@/common/images/enter2-2.png" mode="widthFix" v-else></image>
+	                <view class="sSec1Txt">
+	                    线上缴费
+	                    <text>( 已缴费、未缴费 )</text>
+	                </view>
+	                <view class="sSec1State" v-if="twoOne">完成</view>
+	                <view class="sSec1State" v-else>未完成</view>
+	            </view>
+	            <view :class="twoTwo? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="StudentLoan" @click="tapList('../EducationalAdministration/StuInfoFresh/StudentLoan/list')">
+					<image src="~@/common/images/enter1-3.png" mode="widthFix" v-if="twoTwo"></image>
+					<image src="~@/common/images/enter2-3.png" mode="widthFix" v-else></image>
+	                <view class="sSec1Txt">
+	                    助学贷款
+	                    <text>( 填写贷款回执码 )</text>
+	                </view>
+	                <view class="sSec1State" v-if="twoTwo">完成</view>
+	                <view class="sSec1State" v-else>未完成</view>
+	            </view>
+	            <view :class="twoThree? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="OnsitePayFeeStatus">
+					<image src="~@/common/images/enter1-4.png" mode="widthFix" v-if="twoThree"></image>
+					<image src="~@/common/images/enter2-4.png" mode="widthFix" v-else></image>
+	                <view class="sSec1Txt">
+	                    现场缴费
+	                    <text>( 已缴费、缓交、部分缴费、未缴费 )</text>
+	                </view>
+	                <view class="sSec1State" v-if="twoThree">完成</view>
+	                <view class="sSec1State" v-else>未完成</view>
+	            </view>
+	        </view>
+	        <view class="eSec1Box">
+	            <image src="~@/common/images/enter1-6.png" class="sSecDown" mode="widthFix"></image>
+	            <view class="eSec1Top">step<text>3</text></view>
+	            <view :class="three? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="RegisterStatus" @click="tapList('../EducationalAdministration/StuInfoFresh/RegisterQRCode/list')">
+					<image src="~@/common/images/enter1-5.png" mode="widthFix" v-if="three"></image>
+					<image src="~@/common/images/enter2-5.png" mode="widthFix" v-else></image>
+	                <view class="sSec1Txt">
+	                    报到注册
+	                    <text>( 生成报到二维码，并显示报到教室 )</text>
+	                </view>
+	                <view class="sSec1State" v-if="three">完成</view>
+	                <view class="sSec1State" v-else>未完成</view>
+	            </view>
+	        </view>
+	    </view>
+	</view>
+</template>
+
+<script>
+export default{
+	data() {
+		return {
+			one: '',
+			twoOne: '',
+			twoTwo: '',
+			twoThree: '',
+			three: '',
+			userinfo: {},
+			data: {
+				StuInfoFreshEntity:{},
+				StuInfoFreshFamilyList: [],
+				StuInfoFreshEmergePeopleList: []
+			}
+		}
+	},
+	methods:{
+		init() {
+			let _this = this;
+			_this.userinfo = _this.GET_GLOBAL('loginUser'); //获取登录信息
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('StuInfoFresh/stuInfoFreshEntity', _this.userinfo.account, '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				console.log(res);
+				_this.data = _this.COPY(res);
+				if (this.data["StuInfoFreshFamilyList"].length && this.data["StuInfoFreshFamilyList"].length > 0) {
+					_this.one =  true
+				} else {
+					_this.one = false
+				}
+				
+				if (_this.data["StuInfoFreshEntity"].PayFeeStatus == "1") {
+				    _this.twoOne =  true
+				} else {
+					_this.twoOne = false
+				}
+				
+				if (_this.data["StuInfoFreshEntity"].StudentLoanStatus == "1") {
+					_this.twoTwo =  true
+				} else {
+					_this.twoTwo = false
+				}
+				
+				if (_this.data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") {
+					_this.twoThree =  true
+				} else {
+					_this.twoThree = false
+				}
+				
+				if (_this.data["StuInfoFreshEntity"].RegisterStatus == "1") {
+					_this.three =  true
+				} else {
+					_this.three = false
+				}
+			});
+		},
+		tapList(str) {
+			this.NAV_TO(str, {}, true);
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+.enSecBox{
+	min-height: 100%;
+	background-color: #fff;
+	padding-bottom: 20px;
+}
+.ensTime{
+	position: relative;
+	text-align: center;
+	line-height: 24px;
+	font-size: 14px;
+	color: #B8E2FF;
+}
+.ensTime:after,.ensTime::before{
+	content: '';
+	width: 6px;
+	height: 6px;
+	background-color: #B8E2FF;
+	border-radius: 50%;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	margin: auto;
+}
+.ensTime:after{
+	right: 20%;
+}
+.ensTime::before{
+	left: 20%;
+}
+.ensHeader{
+	background-color: #0C86D8;
+	padding: 20px 0;
+}
+.ensHeadT{
+	font-size: 18px;
+	color: #fff;
+	text-align: center;
+	margin-top: 15px;
+}
+.ensSec1{
+	padding: 0 15px;
+}
+.eSec1Box{
+	position: relative;
+	margin-top: 20px;
+}
+.eSec1Box:first-child{
+	margin-top: 10px;
+}
+.sSecDown{
+	position: absolute;
+	width: 25px;
+	left: 0;
+	right: 0;
+	top: -4px;
+	margin: auto;
+}
+.eSec1Top{
+	font-size: 14px;
+	font-weight: bold;
+	color: #ABDDFF;
+	font-style: italic;
+	padding-left: 18px;
+}
+.eSec1Top text {
+	color: #0C86D8;
+	font-size: 20px;
+	margin-left: 5px;
+}
+.sSec1Con{
+	padding: 5px 15px 5px 25px;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-top: 10px;
+}
+.sSec1Type1{
+	border: 2px solid #AEE8CF;
+	border-radius: 30px;
+}
+.sSec1Type1 .sSec1State{
+	color: #12B215;
+}
+.sSec1Type2{
+	border: 2px solid #B8E2FF;
+	border-radius: 32px;
+}
+.sSec1Type2 .sSec1State{
+	color: #17AAEE;
+}
+.sSec1Con > image{
+	width: 30px;
+}
+.sSec1State{
+	font-size: 14px;
+} 
+.sSec1Txt{
+	font-size: 16px;
+	text-align: center;
+	color: #1A1A1A;
+	margin: 5px 0;
+}
+.sSec1Txt text{
+	display: block;
+	color: #9A9A9A;
+	margin-top: 2px;
+	font-size: 12px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/list.vue
index b376ea0b8..bfbed136e 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/list.vue	
@@ -136,7 +136,7 @@ export default {
 
       this.LOADING('加载任务中…')
       const result = await this.HTTP_GET(
-        ['/newwf/mylist', '/newwf/mytask', '/newwf/mytaskmaked'][tab],
+        ['learun/adms/newwf/mylist', 'learun/adms/newwf/mytask', 'learun/adms/newwf/mytaskmaked'][tab],
         {
           pagination: { rows: 10, page: pageInfo.page, sidx: 'F_CreateDate', sord: 'DESC' },
           queryJson: JSON.stringify(this.searchData)
@@ -238,7 +238,7 @@ export default {
       }
 
       this.LOADING('正在删除…')
-      this.HTTP_POST('/newwf/deldraft', this.selectItem.F_Id, '删除草稿时发生错误').then(success => {
+      this.HTTP_POST('learun/adms/newwf/deldraft', this.selectItem.F_Id, '删除草稿时发生错误').then(success => {
         this.HIDE_LOADING()
         if (!success) {
           return
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue
index 2663b5d07..0496ef9c4 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue	
@@ -157,7 +157,7 @@ export default {
       }
 
       const success = await this.HTTP_POST(
-        this.type === 'sign' ? '/newwf/sign' : '/newwf/audit',
+        this.type === 'sign' ? 'learun/adms/newwf/sign' : 'learun/adms/newwf/audit',
         postData,
         `提交[${this.typeText}]时发生错误`
       )
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/list.vue
index 1d940b30f..24a60f836 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/list.vue	
@@ -64,7 +64,7 @@ export default {
 
       this.LOADING('加载流程信息…')
       const result = await this.HTTP_GET(
-        '/newwf/schemelist',
+        'learun/adms/newwf/schemelist',
         {
           pagination: { rows: 10, page: this.page, sidx: 'F_Name', sord: 'DESC' },
           queryJson: JSON.stringify(this.searchData)
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/single.vue
index 8dccf21ae..7691f9422 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/single.vue	
@@ -138,7 +138,7 @@ export default {
       this.LOADING('正在提交…')
       const formValue = this.$refs.form.getFormValue()
       const postData = await this.getPostData(formValue, this.scheme)
-      this.HTTP_POST('/newwf/draft', postData, '提交草稿时发生失败，未能成功保存').then(success => {
+      this.HTTP_POST('learun/adms/newwf/draft', postData, '提交草稿时发生失败，未能成功保存').then(success => {
         this.HIDE_LOADING()
         if (!success) {
           return
@@ -175,7 +175,7 @@ export default {
       postData.level = this.level
       postData.auditors = JSON.stringify({})
 
-      const url = isAgain ? '/newwf/againcreate' : '/newwf/create'
+      const url = isAgain ? 'learun/adms/newwf/againcreate' : 'learun/adms/newwf/create'
       const tips = `流程${isAgain ? '重新' : ''}发起失败`
       this.HTTP_POST(url, postData, tips).then(success => {
         this.HIDE_LOADING()
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js
index ec87bec2d..c3689c50f 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js	
@@ -257,7 +257,7 @@ export default {
      * 
      */
     async fetchProcessInfo({ code, processId, taskId }) {
-      const url = processId ? '/newwf/processinfo' : '/newwf/scheme'
+      const url = processId ? 'learun/adms/newwf/processinfo' : 'learun/adms/newwf/scheme'
       const reqObj = { processId }
       if (taskId) {
         reqObj.taskId = taskId
@@ -301,7 +301,7 @@ export default {
       const { wfForms } = currentNode
 
       const data = wfForms.filter(t => t.formId).map(t => ({ id: t.formId, ver: '' }))
-      const schemeData = await this.HTTP_GET('/form/scheme', data)
+      const schemeData = await this.HTTP_GET('learun/adms/form/scheme', data)
 
       return schemeData || {}
     },
@@ -321,7 +321,7 @@ export default {
           keyValue
         }))
 
-      const formData = await this.HTTP_GET('/form/data', reqData)
+      const formData = await this.HTTP_GET('learun/adms/form/data', reqData)
 
       return formData || {}
     }
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/onlienpay/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/onlienpay/list.vue
new file mode 100644
index 000000000..119def8ea
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/onlienpay/list.vue	
@@ -0,0 +1,15 @@
+<template>
+	<view class="page"><web-view :src="url"></web-view></view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			url: "http://112.45.152.8:8001/u8pay/index.jsp"
+		};
+	}
+};
+</script>
+
+<style></style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/signup.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/signup.vue
index abe22abd1..5b7eee73e 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/signup.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/signup.vue	
@@ -153,7 +153,7 @@ export default {
 
       // 根据不同的登录方式，调用 API
       const result = await this.HTTP_POST(
-        '/user/login',
+        'learun/adms/user/login',
         { username: this.phone, password: this.MD5(this.code) },
         '登录失败'
       )
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/stuExamArrangement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/stuExamArrangement/list.vue
new file mode 100644
index 000000000..15ba41eab
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/stuExamArrangement/list.vue	
@@ -0,0 +1,349 @@
+<template>
+	<view class="page">
+		<view class="timeTable_sec1">
+			<view class="tSec1Box" id="semester">
+				<image src="~@/common/images/timeT1-1.png" mode="widthFix"></image>
+				<text>{{ semester }}</text>
+			</view>
+			<!--<text class="tSec1Line"></text>-->
+			<view class="tSec1Box" id="weekTime">
+				<text class="text-xxl cuIcon cuIcon-back" @click="timeTap(1)"></text>
+				<text>{{ todayWeek.Monday }}</text>
+				-
+				<text>{{ todayWeek.Sunday }}</text>
+				<text class="text-xxl cuIcon cuIcon-right" @click="timeTap(2)"></text>
+			</view>
+		</view>
+		<view class="timeTable_sec2">
+			<view class="tSec2Top">
+				<view class="tSec2TopLi" v-for="(item, ind) in weekArr" :key="item.en" @click="liTap(ind)" :class="ind == num ? 'active' : ''">
+					<text>{{ item.en }}</text>
+					<text>{{ item.cn }}</text>
+				</view>
+			</view>
+			<view class="tSec2Box">
+				<view class="tSec2Con" v-for="(items, i) in dataArr" :key="items.num" v-show="i == num">
+					<view class="tSec2List">
+						<view v-if="items.lessonData.length <= 0" class="tSec2ListLi"><view class="noHtml">该时间段没有考试</view></view>
+						<view v-if="items.lessonData.length > 0">
+							<view class="tSec2ListLi" v-for="(k, j) in items.lessonData" :key="k.LessonName">
+								<view class="tSec2ListL">第 {{ k.sectionTime }} 节</view>
+								<view class="tSec2ListR">
+									<view class="tSec2ListBox">
+										<view class="tSec2ListT">{{ k.LessonName }}</view>
+										<view class="tSec2ListTxt">
+											<text class="text-xxl cuIcon cuIcon-profile"></text>
+											{{ k.EmpName }}
+										</view>
+									</view>
+									<view class="tSec2Location">
+										<text class="text-xxl cuIcon cuIcon-location"></text>
+										{{ k.ClassroomName }}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import common from '@/common/js/common.js';
+export default {
+	data() {
+		return {
+			semester: '',
+			num: 0,
+			weekDayTime: 0,
+			todayWeek: {},
+			dataArr: [],
+			weekArr: [
+				{
+					en: 'MON',
+					cn: '星期一'
+				},
+				{
+					en: 'TUE',
+					cn: '星期二'
+				},
+				{
+					en: 'WED',
+					cn: '星期三'
+				},
+				{
+					en: 'THU',
+					cn: '星期四'
+				},
+				{
+					en: 'FRI',
+					cn: '星期五'
+				},
+				{
+					en: 'SAT',
+					cn: '星期六'
+				},
+				{
+					en: 'SUN',
+					cn: '星期日'
+				}
+			]
+		};
+	},
+	methods: {
+		init() {
+			let _this = this;
+			_this.todayWeek = common.weekday();
+			_this.semester = common.judgeDate();
+			_this.weekDayTime = 7 * common.oneDayTime();
+			_this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
+		},
+		liTap(ind) {
+			this.num = ind;
+		},
+		timeTap(num) {
+			let _this = this;
+			if (num == 1) {
+				_this.todayWeek.MondayTime = _this.todayWeek.MondayTime - _this.weekDayTime;
+				_this.todayWeek.SundayTime = _this.todayWeek.SundayTime - _this.weekDayTime;
+			} else {
+				_this.todayWeek.MondayTime = _this.todayWeek.MondayTime + _this.weekDayTime;
+				_this.todayWeek.SundayTime = _this.todayWeek.SundayTime + _this.weekDayTime;
+			}
+			_this.num = 0;
+			_this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime);
+			_this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime);
+			_this.semester = common.judgeDate(_this.todayWeek.SundayTime);
+			_this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
+		},
+		loadData(start, end) {
+			var param = { startTime: start, endTime: end };
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('arrangeExam/stuList', param, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				//console.log(res);
+				_this.ProcessingData(res);
+				//console.log(_this.dataArr);
+			});
+		},
+		ProcessingData(data) {
+			let dataM = [
+				{
+					weekTime: 1,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 2,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 3,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 4,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 5,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 6,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 7,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				}
+			];
+			console.log(data)
+			data.forEach((n, i) => {
+				n.sectionTime = n.LessonTime.slice(1);
+				dataM.forEach((k, j) => {
+					if (k.weekTime == n.LessonTime.slice(0, 1)) {
+						k.lessonData.push(n);
+					}
+				});
+			});
+			dataM.forEach((n, i) => {
+				n.lessonData.sort(common.compare('sectionTime'));
+			});
+			this.dataArr = dataM;
+		}
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.page {
+	background: #fff;
+	padding-bottom: 1px;
+}
+.timeTable_sec1 {
+	padding: 14px 12px;
+	text-align: center;
+	background: #0075c4;
+	color: #94d4ff;
+	font-size: 0;
+}
+.tSec1Box > * {
+	display: inline-block;
+	vertical-align: middle;
+}
+.tSec1Line {
+	height: 13px;
+	width: 1px;
+	background: #94d4ff;
+	margin: 0 10px;
+}
+.tSec1Box {
+	font-size: 15px;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+#semester {
+	margin-bottom: 10px;
+}
+#weekTime {
+}
+#weekTime text {
+	margin: 0 10px;
+}
+.tSec1Box > text {
+	width: auto;
+	text-align: center;
+	line-height: 22px;
+}
+.tSec1Box image {
+	width: 15px;
+	margin-right: 2px;
+}
+.tSec1Box text:after {
+	display: none;
+}
+.timeTable_sec2 {
+	margin-bottom: 30px;
+	background-color: #fff;
+}
+.tSec2Top {
+	padding: 0 12px;
+	background: #0075c4;
+	height: 55px;
+	text-align: center;
+	overflow: hidden;
+}
+.tSec2TopLi {
+	width: 14.285714%;
+	float: left;
+	line-height: 18px;
+	padding: 9px 0 9px;
+	color: #fff;
+	font-size: 13px;
+	border-right: 1px solid #1084d2;
+	border-top: 1px solid #1084d2;
+}
+.tSec2TopLi:first-child {
+	border-left: 1px solid #1084d2;
+}
+.tSec2TopLi.active {
+	color: #0075c4;
+	background: #fff;
+	border-color: #fff;
+}
+.tSec2TopLi text {
+	display: block;
+}
+
+.tSec2TopLi text:first-child {
+	letter-spacing: 2px;
+	text-transform: uppercase;
+}
+.tSec2Box {
+	padding: 0 12px;
+	margin-top: 10px;
+}
+.tSec2Con {
+	border-left: 1px solid #d5eaf7;
+	border-right: 1px solid #d5eaf7;
+	border-top: 1px solid #d5eaf7;
+	// display: none;
+}
+.tSec2Con:first-child {
+	display: block;
+}
+.tSec2List {
+	margin-top: 10px;
+}
+.tSec2List:first-child {
+	margin-top: 0;
+}
+.tSec2ListLi {
+	border-bottom: 1px solid #d5eaf7;
+	overflow: hidden;
+	height: 60px;
+}
+.tSec2ListL {
+	float: left;
+	background: #e8f6ff;
+	height: 100%;
+	width: 25%;
+	text-align: center;
+	line-height: 36px;
+	padding: 11px 0;
+	font-size: 14px;
+	color: #646464;
+}
+.tSec2ListR {
+	float: left;
+	width: 75%;
+	height: 100%;
+	line-height: 18px;
+	padding: 4px 0;
+	overflow: hidden;
+}
+.tSec2ListBox {
+	width: 70%;
+	float: left;
+	padding-left: 5px;
+}
+.tSec2ListT {
+	color: #3e3e3e;
+	font-size: 15px;
+	margin: 5px 0;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.tSec2ListTxt {
+	color: #888888;
+	font-size: 13px;
+}
+.tSec2Location {
+	width: 30%;
+	float: left;
+	line-height: 44px;
+	font-size: 13px;
+	color: #888888;
+}
+.noHtml {
+	height: 100%;
+	line-height: 60px;
+	text-align: center;
+	font-size: 14px;
+}
+</style>
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
new file mode 100644
index 000000000..c91be8a0a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/list.vue	
@@ -0,0 +1,353 @@
+<template>
+	<view class="page">
+		<view class="timeTable_sec1">
+			<view class="tSec1Box" id="semester">
+				<image src="~@/common/images/timeT1-1.png" mode="widthFix"></image>
+				<text>{{ semester }}</text>
+			</view>
+			<!--<span class="tSec1Line"></span>-->
+			<view class="tSec1Box" id="weekTime">
+				<text class="text-xxl cuIcon cuIcon-back" @click="timeTap(1)"></text>
+				<text>{{todayWeek.Monday}}</text>
+				-
+				<text>{{todayWeek.Sunday}}</text>
+				<text class="text-xxl cuIcon cuIcon-right"  @click="timeTap(2)"></text>
+			</view>
+		</view>
+		<view class="timeTable_sec2">
+			<view class="tSec2Top">
+				<view class="tSec2TopLi" v-for="(item, ind) in weekArr" :key="item.en" @click="liTap(ind)" :class="ind == num? 'active' : ''">
+					<text>{{ item.en }}</text>
+					<text>{{ item.cn }}</text>
+				</view>
+			</view>
+			<view class="tSec2Box">
+				<view class="tSec2Con" v-for="(items, i) in dataArr" :key="items.num" v-show="i == num">
+					<view class="tSec2List">
+						<view v-if="items.lessonData.length <= 0" class="tSec2ListLi"><view class="noHtml">该时间段没有课程</view></view>
+						<view v-if="items.lessonData.length > 0">
+							<view class="tSec2ListLi" v-for="(k, j) in items.lessonData" :key="j" @click="classTap(k)">
+								<view class="tSec2ListL">第 {{ k.sectionTime }} 节</view>
+								<view class="tSec2ListR">
+									<view class="tSec2ListBox">
+										<view class="tSec2ListT">{{ k.LessonName }}</view>
+										<view class="tSec2ListTxt">
+											<text class="text-xxl cuIcon cuIcon-profile"></text>
+											{{ k.EmpName }}
+										</view>
+									</view>
+									<view class="tSec2Location">
+										<text class="text-xxl cuIcon cuIcon-location"></text>
+										{{ k.ClassroomName }}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import common from '@/common/js/common.js'
+export default {
+	data() {
+		return {
+			semester: '',
+			num: 0,
+			user: null,
+			weekDayTime: 0,
+			todayWeek: {},
+			dataArr: [],
+			weekArr: [
+				{
+					en: 'MON',
+					cn: '星期一'
+				},
+				{
+					en: 'TUE',
+					cn: '星期二'
+				},
+				{
+					en: 'WED',
+					cn: '星期三'
+				},
+				{
+					en: 'THU',
+					cn: '星期四'
+				},
+				{
+					en: 'FRI',
+					cn: '星期五'
+				},
+				{
+					en: 'SAT',
+					cn: '星期六'
+				},
+				{
+					en: 'SUN',
+					cn: '星期日'
+				}
+			]
+		};
+	},
+	methods: {
+		async init() {
+			let _this = this;
+			_this.todayWeek = common.weekday();
+			_this.semester = common.judgeDate();
+			_this.weekDayTime = 7 * common.oneDayTime();
+			_this.user = _this.GET_GLOBAL('loginUser');
+			_this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
+		},
+		liTap(ind) {
+			this.num = ind;
+		},
+		timeTap(num) {
+			let _this = this;
+			if (num == 1) {
+			    _this.todayWeek.MondayTime = _this.todayWeek.MondayTime - _this.weekDayTime;
+			    _this.todayWeek.SundayTime = _this.todayWeek.SundayTime - _this.weekDayTime;
+			} else {
+			    _this.todayWeek.MondayTime = _this.todayWeek.MondayTime + _this.weekDayTime;
+			    _this.todayWeek.SundayTime = _this.todayWeek.SundayTime + _this.weekDayTime;
+			}
+			_this.num = 0;
+			_this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime);
+			_this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime);
+			_this.semester = common.judgeDate(_this.todayWeek.SundayTime);
+			_this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
+		},
+		loadData(start, end) {
+		    var param = { StartDate: start, EndDate: end };
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('learun/adms/timetable/list', param, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				_this.ProcessingData(res);
+			});
+			
+		},
+		ProcessingData(data) {
+			let dataM = [
+				{
+					weekTime: 1,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 2,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 3,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 4,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 5,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 6,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 7,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				}
+			];
+			data.forEach((n, i) => {
+				n.sectionTime = n.LessonTime.slice(1);
+				dataM.forEach((k, j) => {
+					if (k.weekTime == n.LessonTime.slice(0, 1)) {
+						k.lessonData.push(n);
+					}
+				});
+			});
+			dataM.forEach((n, i) => {
+				n.lessonData.sort(common.compare('sectionTime'));
+			});
+			this.dataArr = dataM;
+		},
+		classTap(data) {
+			let _this = this;
+			// console.log(_this.user)
+			this.NAV_TO('./single', data, true);
+		}
+	},
+	created() {
+		this.init()
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.page{
+	background: #fff;
+}
+.timeTable_sec1 {
+	padding: 14px 12px;
+	text-align: center;
+	background: #0075c4;
+	color: #94d4ff;
+	font-size: 0;
+}
+.tSec1Box > * {
+	display: inline-block;
+	vertical-align: middle;
+}
+.tSec1Line {
+	height: 13px;
+	width: 1px;
+	background: #94d4ff;
+	margin: 0 10px;
+}
+.tSec1Box {
+	font-size: 15px;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+#semester {
+	margin-bottom: 10px;
+}
+#weekTime {
+}
+#weekTime text {
+	margin: 0 10px;
+}
+.tSec1Box > text {
+	width: auto;
+	text-align: center;
+	line-height: 22px;
+}
+.tSec1Box image {
+	width: 15px;
+	margin-right: 2px;
+}
+.tSec1Box text:after {
+	display: none;
+}
+.timeTable_sec2 {
+	margin-bottom: 30px;
+}
+.tSec2Top {
+	padding: 0 12px;
+	background: #0075c4;
+	height: 55px;
+	text-align: center;
+	overflow: hidden;
+}
+.tSec2TopLi {
+	width: 14.285714%;
+	float: left;
+	line-height: 18px;
+	padding: 9px 0 9px;
+	color: #fff;
+	font-size: 13px;
+	border-right: 1px solid #1084d2;
+	border-top: 1px solid #1084d2;
+}
+.tSec2TopLi:first-child {
+	border-left: 1px solid #1084d2;
+}
+.tSec2TopLi.active {
+	color: #0075c4;
+	background: #fff;
+	border-color: #fff;
+}
+.tSec2TopLi text {
+	display: block;
+}
+
+.tSec2TopLi text:first-child {
+	letter-spacing: 2px;
+	text-transform: uppercase;
+}
+.tSec2Box {
+	padding: 0 12px;
+	margin-top: 10px;
+}
+.tSec2Con {
+	border-left: 1px solid #d5eaf7;
+	border-right: 1px solid #d5eaf7;
+	border-top: 1px solid #d5eaf7;
+	// display: none;
+}
+.tSec2Con:first-child {
+	display: block;
+}
+.tSec2List {
+	margin-top: 10px;
+}
+.tSec2List:first-child {
+	margin-top: 0;
+}
+.tSec2ListLi {
+	border-bottom: 1px solid #d5eaf7;
+	overflow: hidden;
+	height: 60px;
+}
+.tSec2ListL {
+	float: left;
+	background: #e8f6ff;
+	height: 100%;
+	width: 25%;
+	text-align: center;
+	line-height: 36px;
+	padding: 11px 0;
+	font-size: 14px;
+	color: #646464;
+}
+.tSec2ListR {
+	float: left;
+	width: 75%;
+	height: 100%;
+	line-height: 18px;
+	padding: 4px 0;
+	overflow: hidden;
+}
+.tSec2ListBox {
+	width: 70%;
+	float: left;
+	padding-left: 5px;
+}
+.tSec2ListT {
+	color: #3e3e3e;
+	font-size: 15px;
+	margin: 5px 0;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.tSec2ListTxt {
+	color: #888888;
+	font-size: 13px;
+}
+.tSec2Location {
+	width: 30%;
+	float: left;
+	line-height: 44px;
+	font-size: 13px;
+	color: #888888;
+}
+.noHtml {
+	height: 100%;
+	line-height: 60px;
+	text-align: center;
+	font-size: 14px;
+}
+</style>
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
new file mode 100644
index 000000000..a0a2db9b2
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/single.vue	
@@ -0,0 +1,507 @@
+<template>
+	<view class="page">
+		<view class="timeTable_sec3">
+		    <view class="tSec3Box">
+		        <view class="tSec3Time"><text></text> {{ pageInfo.LessonDate }} 第{{ pageInfo.LessonTime.substring(1) }}节 <text></text></view>
+		    </view>
+		</view>
+		
+		<view class="timeTable_sec4">
+		    <view class="tSec4Box">
+		        <view class="tSec4T">
+					<div>{{ pageInfo.LessonName }}</div>
+				</view>
+		        <view class="tSec4Con">
+		            <view class="studSeeSec2Txt" id="shouldArrive">
+						<text class="text-xxl cuIcon cuIcon-profile"></text> {{ pageInfo.EmpName }}
+						<text class="text-xxl cuIcon cuIcon-locationfill" style="margin-left: 10px;"></text> {{ pageInfo.ClassroomName }} 
+						<view><text>应到</text>  {{ weekData.records }} </view>
+		            </view>
+		        </view>
+		    </view>
+		</view>
+		
+		<view class="statusType">
+		    <view>
+		        <view class="statusTypeLi sStatue1"><text></text>准时</view>
+		        <view class="statusTypeLi sStatue2"><text></text>早退</view>
+		        <view class="statusTypeLi sStatue3"><text></text>旷课</view>
+		        <view class="statusTypeLi sStatue4"><text></text>病假</view>
+		        <view class="statusTypeLi sStatue5"><text></text>迟到</view>
+		        <view class="statusTypeLi sStatue6"><text></text>事假</view>
+		    </view>
+		</view>
+		<view class="timeTable_sec2">
+		    <view class="timeTableList">
+				<view v-if="weekData.rows.length == 0">暂时没有信息</view>
+				<view v-if="weekData.rows.length != 0">
+					<view 
+						:class="timeTableClass(k.Sort)" 
+						class="timeTableLi" v-for="(k, i) in weekData.rows" 
+						:key="k.StuNo" 
+						@click="tapTimeTable(i, timeTableClass(k.Sort))"
+					>
+						<view>{{ k.StuName }} <text class="text-xxl cuIcon cuIcon-ellipse"></text></view>
+					</view>
+				</view>
+		    </view>
+		</view>
+		<view class="timeTableAlert" :class="flag? 'active' : ''">
+		    <view class="timeTableAlertTop">
+		        <view class="timeTableAlertT">{{ weekData.rows[ind].StuName }}</view>
+		        <view class="timeTableAlertTxt">学号: {{ weekData.rows[ind].StuNo }} </view>
+		    </view>
+		    <view class="timeTableAlertList">
+		        <view 
+					v-for="(n, i) in Statue" 
+					:key="i" 
+					:class="n.className == className? 'active ' + n.className : n.className" 
+					class="timeTableAlertLi"
+					@click="tapStatus(i)"
+				><text></text>{{ n.txt }}</view>
+		    </view>
+		</view>
+		<view class="timeTableAlertZ" v-show="flag" @click="flag = false"></view>
+		<view class="timeTableBtn" @click="tapBtn">确定</view>
+	</view>
+</template>
+
+<script>
+export default{
+	data() {
+		return {
+			pageInfo: {},
+			weekData: {},
+			flag: false,
+			data: {},
+			className: '',
+			ind: 0,
+			Statue: [
+				{
+					className: 'sStatue1',
+					num: '0',
+					txt: '准时'
+				},
+				{
+					className: 'sStatue5',
+					num: '1',
+					txt: '迟到'
+				},
+				{
+					className: 'sStatue2',
+					num: '2',
+					txt: '早退'
+				},
+				{
+					className: 'sStatue4',
+					num: '3',
+					txt: '病假'
+				},
+				{
+					className: 'sStatue6',
+					num: '4',
+					txt: '事假'
+				},
+				{
+					className: 'sStatue3',
+					num: '5',
+					txt: '旷课'
+				}
+			]
+		}
+	},
+	methods:{
+		init() {
+			let _this = this;
+			let _postParam = {
+			    pagination: {
+			        rows: "1000",
+			        page: "1",
+			        sidx: 'ClassNo',
+			        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,
+			    })
+			};
+			
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('/teachattendance/students', _postParam, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				_this.weekData = _this.COPY(res);
+			});
+		},
+		tapTimeTable(num, str) {
+			this.className  = str;
+			this.ind = num;
+			this.flag = true;
+		},
+		tapStatus(num) {
+			this.weekData.rows[this.ind].Sort = this.Statue[num].txt;
+			this.weekData.rows[this.ind].kqType = this.Statue[num].num;
+			this.flag = false;
+		},
+		tapBtn() {
+			let _this = this;
+			_this.weekData.rows.forEach((n, i) => {
+				n.kqType = n.kqType != null? n.kqType : '0'
+			});
+			_this.CONFIRM('数字化校园提示', '无法获取小程序登录授权码', true).then(res => {
+				// console.log(_this.weekData.rows)
+				if(res){
+					_this.LOADING('保存数据中…');
+					_this.HTTP_POST('/Learun/adms/EducationalAdministration/StuAttendanceLeave/apply', 
+					{
+					    lessonTime: _this.pageInfo.LessonTime,
+					    lessonDate: _this.pageInfo.LessonDate,
+					    classRoomNo: _this.pageInfo.ClassRoomNo,
+					    dataJson: JSON.stringify(_this.weekData.rows)
+					}, '加载数据时出错').then(res => {
+						_this.HIDE_LOADING();
+						console.log(res);
+						if (res) {
+						    _this.TOAST('删除成功', 'success');
+						    _this.init();
+						}
+					});
+				}
+			})
+		}
+	},
+	computed: {
+		timeTableClass() {
+			return str => {
+				return !str ? 'sStatue1' : str == "准时" ? 'sStatue1' : str == "早退" ? 'sStatue2' : str == "旷课" ? 'sStatue3' : str == "病假" ? 'sStatue4' : str == "迟到" ? 'sStatue5' : 'sStatue6';
+			};
+		}
+	},
+	created() {
+		this.pageInfo = this.GET_PARAM(); //获取页面传递参数
+		this.init();
+	}
+}
+</script>
+
+<style lang="less" scoped>
+#semester2 {
+	margin-bottom: 10px;
+}
+
+#weekTime2 text {
+	margin: 0 10px;
+}
+
+.timeTable_sec2 {
+	margin-bottom: 30px;
+	background-color: #fff;
+}
+
+.noHtml {
+	height: 100%;
+	line-height: 60px;
+	text-align: center;
+	font-size: 14px;
+}
+
+.timeTable_sec3 {
+	padding: 0px 12px 1px;
+	text-align: center;
+	background: #0c86d8;
+	height: 35px;
+}
+
+.tSec3Time {
+	text-align: center;
+	line-height: 24px;
+	font-size: 14px;
+	color: #fff;
+}
+
+.tSec3Time text {
+	display: inline-block;
+	background-color: #b8e2ff;
+	width: 6px;
+	height: 6px;
+	border-radius: 50%;
+	vertical-align: middle;
+	position: relative;
+	top: -2px;
+	margin: 0 10px;
+}
+
+.timeTable_sec4 {
+	padding: 0 12px;
+	/* margin-top: -65px; */
+	margin-bottom: 10px;
+	background: #0075c4;
+}
+
+.tSec4T {
+	/* text-align: center; */
+	margin-bottom: 10px;
+	overflow: hidden;
+	font-size: 16px;
+	color: #fff;
+	padding-top: 10px;
+}
+
+.tSec4Con {
+	padding-bottom: 10px;
+}
+
+.tSec4Con .studSeeSec2Line {
+	height: 25px;
+	width: 1px;
+	background: #d6dfe2;
+	margin: 0 40px;
+}
+
+.tSec4Con .studSeeSec2Txt {
+	color: #4fb1f3;
+	font-size: 14px;
+}
+
+.tSec4Con .studSeeSec2Txt .text-xxl {
+	margin-right: 5px;
+	font-size: 16px;
+}
+
+.tSec4Con .studSeeSec2Txt view {
+	float: right;
+	font-size: 20px;
+	margin-top: -2px;
+}
+
+.tSec4Con .studSeeSec2Txt view text {
+	display: inline-block;
+	line-height: 20px;
+	font-size: 12px;
+	padding: 0 10px;
+	position: relative;
+	background: #4fb1f3;
+	color: #0075c4;
+	border-radius: 2px;
+	top: -3px;
+	margin-right: 10px;
+}
+
+.tSec4Con .studSeeSec2Txt view text:after {
+	content: '';
+	position: absolute;
+	border: 3px solid #4fb1f3;
+	border-right-color: transparent;
+	border-top-color: transparent;
+	border-bottom-color: transparent;
+	right: -6px;
+	top: 50%;
+	margin-top: -3px;
+}
+
+.timeTableList {
+	overflow: hidden;
+	padding: 3px 7px 18px;
+}
+
+.timeTableLi {
+	width: 33.333333%;
+	float: left;
+	font-size: 14px;
+	line-height: 16px;
+	margin-top: 14px;
+	padding: 0 7px;
+}
+
+.timeTableLi view {
+	border: 1px solid #daeffd;
+	padding: 13px 0;
+	text-align: center;
+	overflow: hidden;
+}
+
+.timeTableLi text {
+	font-size: 12px;
+	border-radius: 50%;
+	height: 14px;
+	width: 14px;
+	line-height: 12px;
+	position: relative;
+	top: -1px;
+	margin-left: 6px;
+}
+
+.timeTableBtn {
+	font-size: 16px;
+	margin: 10px 12px 20px;
+	background: #0c86d8;
+	border-radius: 4px;
+	text-align: center;
+	line-height: 40px;
+	height: 40px;
+	color: #fff;
+}
+
+.statusType {
+	padding: 10px 12px;
+	background: #fff;
+	overflow: hidden;
+	margin-bottom: 10px;
+}
+
+.statusTypeLi {
+	width: 16.666667%;
+	float: left;
+	/* text-align: center; */
+	font-size: 14px;
+	line-height: 16px;
+}
+
+.statusType text {
+	display: inline-block;
+	color: #fff;
+	line-height: 14px;
+	font-size: 12px;
+	border: 1px solid #cacaca;
+	border-radius: 50%;
+	height: 9px;
+	width: 9px;
+	line-height: 12px;
+	margin-right: 5px;
+	position: relative;
+	top: 0px;
+}
+
+/*正常*/
+.sStatue1 text {
+	background: #0089fe;
+	color: #0089fe;
+	border-color: #0089fe;
+}
+
+/*早退*/
+.sStatue2 text {
+	background: #f2b60a;
+	color: #f2b60a;
+	border-color: #f2b60a;
+}
+
+/*3旷课*/
+.sStatue3 text {
+	background: #e24545;
+	color: #e24545;
+	border-color: #e24545;
+}
+
+/*病假*/
+.sStatue4 text {
+	background: #29cf41;
+	color: #29cf41;
+	border-color: #29cf41;
+}
+
+/*迟到*/
+.sStatue5 text {
+	background: #ad5151;
+	color: #ad5151;
+	border-color: #ad5151;
+}
+
+/*事假*/
+.sStatue6 text {
+	background: #84f193;
+	color: #84f193;
+	border-color: #84f193;
+}
+
+.timeTableAlertZ {
+	width: 100%;
+	height: 100%;
+	z-index: 99;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	// display: none;
+}
+
+.timeTableAlert {
+	z-index: -1;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	margin: auto;
+	width: 80%;
+	height: 70%;
+	background: #fff;
+	border-radius: 4px;
+	filter: alpha(opacity=0);
+	-moz-opacity: 0;
+	-khtml-opacity: 0;
+	opacity: 0;
+	transition: all 0.3s;
+	-moz-transition: all 0.3s;
+	-ms-transition: all 0.3s;
+	-o-transition: all 0.3s;
+	-webkit-transition: all 0.3s;
+	overflow: hidden;
+}
+
+.timeTableAlert.active {
+	z-index: 999;
+	filter: alpha(opacity=100);
+	-moz-opacity: 1;
+	-khtml-opacity: 1;
+	opacity: 1;
+}
+
+.timeTableAlertTop {
+	background-color: #0c86d8;
+	padding: 10px 12px;
+}
+
+.timeTableAlertT {
+	color: #fff;
+	font-size: 16px;
+}
+
+.timeTableAlertTxt {
+	font-size: 14px;
+	color: #b8e2ff;
+	text-align: right;
+	margin-top: 5px;
+}
+
+.timeTableAlertList {
+	overflow: auto;
+	max-height: calc(100% - 62px);
+}
+
+.timeTableAlertLi {
+	line-height: 40px;
+	text-align: center;
+	font-size: 14px;
+	color: #1a1a1a;
+}
+
+.timeTableAlertLi.active {
+	background-color: #d1ecff !important;
+}
+
+.timeTableAlertLi:nth-child(2n) {
+	background-color: #fbfdff;
+}
+
+.timeTableAlertLi:nth-child(2n - 1) {
+	background-color: #ffffff;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue
new file mode 100644
index 000000000..ef2a9e1e2
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue	
@@ -0,0 +1,320 @@
+<template>
+	<view class="page">
+		<view class="timeTable_sec1">
+			<view class="tSec1Box" id="semester2">
+				<image src="~@/common/images/timeT1-1.png" mode="widthFix"></image>
+				<text>{{ semester }}</text>
+			</view>
+			<view class="tSec1Box" id="weekTime2">
+				<text class="text-xxl cuIcon cuIcon-back" @click="timeTap(1)"></text>
+				<text>{{todayWeek.Monday}}</text>
+				-
+				<text>{{todayWeek.Sunday}}</text>
+				<text class="text-xxl cuIcon cuIcon-right"  @click="timeTap(2)"></text>
+			</view>
+		</view>
+		<view class="timeTable_sec2">
+			<view class="tSec2Top2">
+				<view v-for="(item, ind) in weekArr" :key="item.en" @click="liTap(ind)" :class="ind == num? 'active' : ''">
+					<text>{{ item.en }}</text>
+					<text>{{ item.cn }}</text>
+				</view>
+			</view>
+			<view class="tSec2Box2">
+				<view class="tSec2Con2" v-for="(items, ind) in dataArr" :key="items.num" v-show="ind == num">
+					<view class="studCheckList">
+						<view class="studCheckLi" v-for="(k, index) in items.weekList" :key="k.LessonDate" v-if="items.weekList.length != 0">
+						    <view class="studCheckT">
+								<image mode="widthFix" src="~@/common/images/book.png"></image>
+								{{ k.LessonName }}
+							</view>
+						    <view class="studCheckTxt">
+								<image src="~@/common/images/time.png" mode="widthFix"></image>
+								{{ k.LessonDate }}
+								<image style="margin:0 5px 0 30px" src="~@/common/images/person.png" mode="widthFix"></image>
+								<text>
+									{{ k.Teacher }}
+								</text>
+								<image style="margin:0 5px 0 30px" src="~@/common/images/location.png" mode="widthFix"></image>
+								{{ k.ClassRoomName }}
+						    </view>
+						    <view class="studCheckStatue" :class="k.Sort == '迟到'? 'studCheckStatue2' : k.Sort == '早退'? 'studCheckStatue2' : k.Sort == '病假'? 'studCheckStatue4' : k.Sort == '事假'? 'studCheckStatue2' : k.Sort == '准时'? 'studCheckStatue1' : 'studCheckStatue3' ">
+								<text></text> {{ k.Sort }}
+						    </view>
+						</view>
+						<view class="noHtml" v-if="items.weekList.length == 0">
+							该时间段没有数据
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import common from '@/common/js/common.js'
+export default {
+	data() {
+		return {
+			semester: '',
+			num: 0,
+			weekDayTime: 0,
+			todayWeek: {},
+			dataArr: [],
+			weekArr: [
+				{
+					en: 'MON',
+					cn: '星期一'
+				},
+				{
+					en: 'TUE',
+					cn: '星期二'
+				},
+				{
+					en: 'WED',
+					cn: '星期三'
+				},
+				{
+					en: 'THU',
+					cn: '星期四'
+				},
+				{
+					en: 'FRI',
+					cn: '星期五'
+				},
+				{
+					en: 'SAT',
+					cn: '星期六'
+				},
+				{
+					en: 'SUN',
+					cn: '星期日'
+				}
+			]
+		};
+	},
+	methods: {
+		async init() {
+			let _this = this;
+			_this.todayWeek = common.weekday();
+			_this.semester = common.judgeDate();
+			_this.weekDayTime = 7 * common.oneDayTime();
+			_this.studentCheckData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
+		},
+		studentCheckData(Monday, Sunday) {
+		    // var studCheckList = $('.studCheckList');
+			let _this = this;
+			_this.LOADING('加载数据中…')
+			_this.HTTP_GET(
+			  'learun/adms/timetable/StuLessonInfo',
+			  {StartDate:Monday, EndDate:Sunday},
+			  '加载数据时出错'
+			).then( res => {
+				_this.HIDE_LOADING()
+				//console.log(res)
+				_this.dataArr.length = 0;
+				for(let j = 1; j < 8; j++){
+					let dataFlag = true;
+					var num = Math.floor(Math.random() * 100000000);
+					res.forEach((n, i) => {
+						if(n.week == j){
+							n.num = num;
+							_this.dataArr.push(n);
+							dataFlag = false;
+							return
+						}
+					})
+					if(dataFlag){
+						_this.dataArr.push({
+							week: j,
+							num: num,
+							weekList: []
+						});
+					}
+				}
+			})
+		},
+		liTap(ind) {
+			this.num = ind;
+		},
+		timeTap(num) {
+			let _this = this;
+			if (num == 1) {
+			    _this.todayWeek.MondayTime = _this.todayWeek.MondayTime - _this.weekDayTime;
+			    _this.todayWeek.SundayTime = _this.todayWeek.SundayTime - _this.weekDayTime;
+			} else {
+			    _this.todayWeek.MondayTime = _this.todayWeek.MondayTime + _this.weekDayTime;
+			    _this.todayWeek.SundayTime = _this.todayWeek.SundayTime + _this.weekDayTime;
+			}
+			_this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime);
+			_this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime);
+			_this.semester = common.judgeDate(_this.todayWeek.SundayTime);
+			_this.studentCheckData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
+		}
+	},
+	created() {
+		this.init()
+	}
+	
+};
+</script>
+
+<style lang="less" scoped>
+* {
+	box-sizing: border-box;
+}
+.timeTable_sec1 {
+	padding: 14px 12px;
+	text-align: center;
+	background: #0075c4;
+	color: #94d4ff;
+	font-size: 0;
+}
+.tSec1Box > * {
+	display: inline-block;
+	vertical-align: middle;
+}
+.tSec1Line {
+	height: 13px;
+	width: 1px;
+	background: #94d4ff;
+	margin: 0 10px;
+}
+.tSec1Box {
+	font-size: 15px;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+#semester2 {
+	margin-bottom: 10px;
+}
+
+#weekTime2 text {
+	margin: 0 10px;
+}
+.tSec1Box > text {
+	width: auto;
+	text-align: center;
+	line-height: 22px;
+}
+.tSec1Box image {
+	width: 15px;
+	margin-right: 2px;
+}
+
+.tSec1Box text:after {
+	display: none;
+}
+.timeTable_sec2 {
+	margin-bottom: 30px;
+}
+.tSec2Top2 {
+	padding: 0 12px;
+	background: #0075c4;
+	height: 55px;
+	text-align: center;
+	overflow: hidden;
+}
+.tSec2Top2 view {
+	width: 14.285714%;
+	float: left;
+	line-height: 18px;
+	padding: 9px 0 9px;
+	color: #fff;
+	font-size: 13px;
+	border-right: 1px solid #1084d2;
+	border-top: 1px solid #1084d2;
+}
+.tSec2Top2 view:first-child {
+	border-left: 1px solid #1084d2;
+}
+.tSec2Top2 view.active {
+	color: #0075c4;
+	background: #fff;
+	border-color: #fff;
+}
+.tSec2Top2 view text {
+	display: block;
+}
+
+.tSec2Top2 view text:first-child {
+	letter-spacing: 2px;
+	text-transform: uppercase;
+}
+.tSec2Box2 {
+	background: #fff;
+}
+
+.studCheckLi {
+	border-bottom: 1px solid #d5eaf7;
+	padding: 8px 12px;
+	font-size: 15px;
+}
+.studCheckT {
+	font-size: 15px;
+	color: #6e6e6e;
+}
+.studCheckT image {
+	width: 11px;
+	position: relative;
+	margin-right: 5px;
+}
+.studCheckTxt {
+	font-size: 13px;
+	color: #9d9e9e;
+	margin: 7px 0;
+}
+.studCheckTxt text {
+	// margin: 0 30px;
+}
+.studCheckTxt image {
+	width: 12px;
+	position: relative;
+	margin-right: 3px;
+	top: 1px;
+}
+.studCheckStatue {
+	font-size: 13px;
+}
+.studCheckStatue text {
+	display: inline-block;
+	width: 8px;
+	height: 8px;
+	position: relative;
+	margin-right: 5px;
+	vertical-align: middle;
+	top: -2px;
+}
+.studCheckStatue1 {
+	color: #0089fe;
+}
+.studCheckStatue1 text {
+	background: #0089fe;
+}
+.studCheckStatue2 {
+	color: #f2b60a;
+}
+.studCheckStatue2 text {
+	background: #f2b60a;
+}
+.studCheckStatue3 {
+	color: #e24545;
+}
+.studCheckStatue3 text {
+	background: #e24545;
+}
+.studCheckStatue4 {
+	color: #29cf41;
+}
+.studCheckStatue4 text {
+	background: #29cf41;
+}
+.noHtml {
+	height: 100%;
+	line-height: 60px;
+	text-align: center;
+	font-size: 14px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentSee/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentSee/list.vue
new file mode 100644
index 000000000..f798c045f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentSee/list.vue	
@@ -0,0 +1,192 @@
+<template>
+	<view class="page">
+		<view class="selectBox">
+			<l-select :range="selectArr1" :placeholder="placeholder" @change="bindDateChange" valueField="value" textField="text"  v-model="value" />
+		</view>
+		<view class="studSeeSec2">
+			<view class="tips" v-show="!flag">暂无数据！</view>
+			<view class="studSeeSec2Top" v-show="flag">
+				<view class="studSeeSec2TopBox">
+					<view class="studSeeSec2Txt">
+					    <view><text>{{ data.Rank }}</text>名</view><view>班级排名</view>
+					</view>
+					<view class="studSeeSec2Line"></view>
+					<view class="studSeeSec2Txt">
+						<view><text>{{data.TotalScore}}</text>分</view><view>综合成绩</view>
+					</view>
+				</view>
+			</view>
+			<view class="studSeeSec2List" v-show="flag">
+				<view v-for="n in data.ScoreList" :key="n.LessonName">
+					<image  mode="widthFix" src="~@/common/images/book.png"></image>
+					{{ n.LessonName }}
+					<text>{{ n.Score }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+// import get from 'lodash/get'
+export default {
+	data() {
+		return {
+			value: 0,
+			flag:false,
+			selectArr1: [],
+			placeholder: '请选择学期',
+			data: {}
+		};
+	},
+	methods: {
+		async init() {
+			let _this = this;
+			_this.LOADING('加载数据中…')
+			_this.HTTP_GET(
+			  'scoreSearch/academicAndSemesterList',
+			  {},
+			  '加载数据时出错'
+			).then( res => { 
+				this.HIDE_LOADING()
+				// console.log(res)
+				if (res == null || res.length <= 0) {
+				    return;
+				}
+				_this.selectArr1 = res;
+				_this.placeholder = res[0].text;
+				_this.studentSeeAjax(res[0].value);
+			})
+		},
+		bindDateChange: function(e) {
+			console.log(e);
+			this.LOADING('加载数据中…')
+			this.studentSeeAjax(e)
+		},
+		studentSeeAjax(id) {
+			let param = { value: id };
+			let _this = this;
+			this.HTTP_GET(
+			  'scoreSearch/scoreList',
+			  param,
+			  '加载数据时出错'
+			).then( res => { 
+				this.HIDE_LOADING()
+				// console.log(res)
+				if (res == null || JSON.stringify(res) == '{}') {
+				    _this.flag = false;
+				    return;
+				}
+				_this.flag = true;
+				_this.data = res;
+			})
+		}
+	},
+	created() {
+		this.init()
+	}
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/common/css/common.less';
+* {
+	box-sizing: border-box;
+}
+
+/deep/ .picker {
+	text-align: center;
+}
+/deep/ .cu-form-group {
+	width: 84%;
+	background: #fff;
+	height: 28px;
+	border-radius: 14px;
+	line-height: 28px;
+	text-align: center;
+	font-size: 15px;
+	color: #1a1a1a;
+	position: relative;
+	margin: 0 auto;
+	min-height: 28px;
+}
+.loading{
+	background-color: transparent;
+	font-size: 26px;
+}
+.selectBox {
+	background-color: @pubColor;
+	height: 100px;
+}
+.studSeeSec2Top {
+	padding: 0 12px;
+	margin-top: -52px;
+}
+.studSeeSec2TopBox {
+	background: #fff;
+	padding: 20px 0;
+	text-align: center;
+	font-size: 0;
+	border-radius: 4px;
+}
+.studSeeSec2TopBox > * {
+	display: inline-block;
+	vertical-align: middle;
+}
+.studSeeSec2Line {
+	height: 25px;
+	width: 1px;
+	background: #d6dfe2;
+	margin: 0 40px;
+}
+.studSeeSec2Txt {
+	color: #8a8a8a;
+}
+.studSeeSec2Txt view:first-child {
+	font-size: 12px;
+}
+.studSeeSec2Txt view:first-child text {
+	font-size: 20px;
+	color: #0089fe;
+	margin-right: 5px;
+}
+.studSeeSec2Txt view:last-child {
+	font-size: 15px;
+}
+.studSeeSec2List {
+	margin-top: 10px;
+	background: #fff;
+}
+.studSeeSec2List view {
+	padding: 0 12px 0 30px;
+	border-bottom: 1px solid #d6dfe2;
+	line-height: 39px;
+	font-size: 13px;
+	color: #7a7a7a;
+	position: relative;
+}
+.studSeeSec2List view:before {
+	content: '';
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 12px;
+	margin: auto;
+	width: 6px;
+	height: 6px;
+	background: #8ac9ff;
+	border-radius: 50%;
+}
+.studSeeSec2List text {
+	float: right;
+}
+.studSeeSec2List image {
+	width: 12px;
+	margin-right: 5px;
+	position: relative;
+	top: 2px;
+}
+.studSeeSec2 .tips {
+	text-align: center;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/leaveFrom.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/leaveFrom.vue
new file mode 100644
index 000000000..086abf436
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/leaveFrom.vue	
@@ -0,0 +1,263 @@
+<template>
+	<view class="page">
+		<l-input hidden title="学年度" placeholder="请填写学年度" :value="queryData.AcademicYearNo" disabled right />
+		<l-input hidden title="学期" placeholder="请填写学期" :value="queryData.Semester" disabled right />
+		<l-input title="学号" placeholder="请填写学号" :value="queryData.StuNo" disabled right />
+		<l-input title="姓名" placeholder="请填写姓名" :value="queryData.StuName" disabled right />
+		<l-input title="年级" placeholder="请填写年级" :value="queryData.Grade" disabled right />
+		<l-input hidden title="教师号" placeholder="请填写教师号" :value="queryData.EmpNo" disabled right />
+		<l-input hidden title="系所码" placeholder="请填写系所码" :value="queryData.DeptNo" disabled right />
+		<l-input title="系名" placeholder="请填写系名" :value="queryData.DeptName" disabled right />
+		<l-input hidden title="专业码" placeholder="请填写专业码" :value="queryData.MajorNo" disabled right />
+		<l-input title="专业名" placeholder="请填写专业名" :value="queryData.MajorName" disabled right />
+		<l-input hidden title="所在行政班号" placeholder="请填写所在行政班号" :value="queryData.ClassNo" disabled right />
+		<l-input title="班级名称" placeholder="请填写班级名称" :value="queryData.ClassName" disabled right />
+		<l-input hidden title="课程号" placeholder="请填写课程号" :value="queryData.LessonNo" disabled right />
+		<l-input title="课程名称" placeholder="请填写课程名称" :value="queryData.LessonName" disabled right />
+		<l-input hidden title="课程类别码" placeholder="请填写课程类别码" :value="queryData.LessonSortNo" disabled right />
+		<l-input title="课程类别" placeholder="请填写课程类别" :value="queryData.LessonSortName" disabled right />
+		
+		<l-input hidden title="教室码" placeholder="请填写教室码" :value="queryData.ClassRoomNo" disabled right />
+		<l-input title="教室名称" placeholder="请填写教室名称" :value="queryData.ClassroomName" disabled right />
+		<l-input title="原上课日期" placeholder="请填写原上课日期" :value="queryData.LessonDate" disabled right />
+		<l-input title="上课时间" placeholder="请填写上课时间" :value="queryData.LessonTime" disabled right />
+		<div class="lr-form-row">
+			<l-select v-model="queryData.LeaveType" :range="dataSource.LeaveType" title="请假类型" placeholder="请选择" />
+		</div>
+		<view class="bg-white">
+		  <l-textarea v-model="queryData.Remark" title="备注" placeholder="输入点什么..." />
+		</view>
+		<view class="btn" @click="tapBtn">
+			提交
+		</view>
+	</view>
+</template>
+
+<script>
+import moment from 'moment';
+import get from 'lodash/get';
+import set from 'lodash/set';
+export default {
+	data() {
+		return {
+			scheme: {
+				DeptNo: {
+					type: 'select',
+					dataSource: '1',
+					dataSourceId: 'BaseUser,f_realname,f_userid'
+				},
+				MajorNo: {
+					type: 'select',
+					dataSource: '1',
+					dataSourceId: 'BaseUser,f_realname,f_userid'
+				},
+				ClassNo: {
+					type: 'select',
+					dataSource: '1',
+					dataSourceId: 'BaseUser,f_realname,f_userid'
+				},
+				LessonNo: {
+					type: 'select',
+					dataSource: '1',
+					dataSourceId: 'BaseUser,f_realname,f_userid'
+				},
+				LessonSortNo: {
+					type: 'select',
+					dataSource: '1',
+					dataSourceId: 'BaseUser,f_realname,f_userid'
+				},
+				ClassRoomNo: {
+					type: 'select',
+					dataSource: '1',
+					dataSourceId: 'BaseUser,f_realname,f_userid'
+				}
+			},
+			dataSource: {
+				DeptNo: [],
+				MajorNo: [],
+				ClassNo: [],
+				LessonNo: [],
+				LessonSortNo: [],
+				ClassRoomNo: [],
+				LeaveType: Object.values(this.GET_GLOBAL('dataDictionary').LeaveType).map(t => ({ value: t.value, text: t.text }))
+			},
+			pageInfo: null,
+			data: {},
+			userinfo: {},
+			queryData: {
+				AcademicYearNo: '',
+				Semester: '',
+				StuNo: '',
+				StuName: '',
+				Grade: '',
+				EmpNo: '',
+				DeptNo: '',
+				DeptName: '',
+				MajorNo: '',
+				MajorName: '',
+				ClassNo: '',
+				ClassName: '',
+				LessonNo: '',
+				LessonName: '',
+				LessonSortNo: '',
+				LessonSortName: '',
+				ClassRoomNo: '',
+				ClassroomName: '',
+				LessonDate: '',
+				LessonTime: '',
+				LeaveType: '',
+				Remark: ''
+			}
+		};
+	},
+	methods: {
+		init() {
+			// console.log(this.dataSource.LeaveType)
+			Promise.all([
+				this.FETCH_DATASOURCE('CdDeptInfo').then(data => {
+					// console.log(data)
+					this.dataSource.DeptNo = data.data.map(t => ({
+						text: t.deptname,
+						value: t.deptno
+					}));
+				}),
+				this.FETCH_DATASOURCE('CdMajorInfo').then(data => {
+					// console.log(data)
+					this.dataSource.MajorNo = data.data.map(t => ({
+						text: t.majorname,
+						value: t.majorno
+					}));
+				}),
+				this.FETCH_DATASOURCE('bjsj').then(data => {
+					// console.log(data)
+					this.dataSource.ClassNo = data.data.map(t => ({
+						text: t.classname,
+						value: t.classno
+					}));
+				}),
+				this.FETCH_DATASOURCE('LessonInfo').then(data => {
+					// console.log(data)
+					this.dataSource.LessonNo = data.data.map(t => ({
+						text: t.lessonname,
+						value: t.lessonno
+					}));
+				}),
+				this.FETCH_DATASOURCE('CdLessonSort').then(data => {
+					// console.log(data)
+					this.dataSource.LessonSortNo = data.data.map(t => ({
+						text: t.lessonsortname,
+						value: t.lessonsortno
+					}));
+				}),
+				this.FETCH_DATASOURCE('ClassRoomInfo').then(data => {
+					// console.log(data)
+					this.dataSource.ClassRoomNo = data.data.map(t => ({
+						text: t.classroomname,
+						value: t.classroomno
+					}));
+				}),
+			
+				() => {}
+			]);
+			
+			this.userinfo = this.GET_GLOBAL('loginUser'); //获取登录信息
+			this.pageInfo = this.GET_PARAM(); //获取页面传递参数
+			
+			// console.log(this.pageInfo);
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('learun/adms/EducationalAdministration/StuAttendanceLeave/leaveform', {}, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				this.data = res;
+				// console.log(res) 
+				this.queryData.AcademicYearNo = this.pageInfo.AcademicYear;
+				this.queryData.Semester = this.pageInfo.Semester;
+				this.queryData.StuNo = res.StuNo;
+				this.queryData.StuName = res.StuName;
+				this.queryData.Grade = res.Grade;
+				this.queryData.EmpNo = this.pageInfo.EmpNo;
+				this.queryData.DeptNo = res.DeptNo;
+				this.queryData.DeptName = this.displayListItem(res, 'DeptNo');
+				this.queryData.MajorNo = res.MajorNo;
+				this.queryData.MajorName = this.displayListItem(res, 'MajorNo');
+				this.queryData.ClassNo = res.ClassNo;
+				this.queryData.ClassName = this.displayListItem(res, 'ClassNo');
+				this.queryData.Remark = '';
+				this.queryData.LeaveType = '1';
+				
+				this.queryData.LessonNo = this.pageInfo.LessonNo;
+				this.queryData.LessonName = this.displayListItem(this.pageInfo, 'LessonNo');
+				
+				this.queryData.LessonSortNo = this.pageInfo.LessonSortNo;
+				this.queryData.LessonSortName = this.displayListItem(this.pageInfo, 'LessonSortNo');
+				
+				this.queryData.ClassRoomNo = this.pageInfo.ClassRoomNo;
+				this.queryData.ClassroomName = this.displayListItem(this.pageInfo, 'ClassRoomNo');
+				this.queryData.LessonDate = this.pageInfo.LessonDate;
+				this.queryData.LessonTime = this.pageInfo.LessonTime;
+				// console.log(res);
+				// console.log(this.pageInfo);
+				console.log(this.queryData);
+			});
+		},
+		tapBtn() {
+			let _postData = {
+				keyValue: '',
+				strEntity: JSON.stringify(this.queryData)
+			}
+			this.LOADING('保存数据中…');
+			this.HTTP_POST('learun/adms/EducationalAdministration/StuAttendanceLeave/save', _postData, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				//console.log(res)
+				if(res){
+					this.TOAST('提交成功！');
+					this.EMIT('timeTable',this.queryData.LessonDate);
+					this.NAV_BACK();
+				}
+			});
+		},
+		// 显示列表中的标题项
+		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;
+			}
+		}
+	},
+	created() {
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue
new file mode 100644
index 000000000..e71538603
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue	
@@ -0,0 +1,385 @@
+<template>
+	<view class="page">
+		<view class="timeTable_sec1">
+			<view class="tSec1Box" id="semester">
+				<image src="~@/common/images/timeT1-1.png" mode="widthFix"></image>
+				<text>{{ semester }}</text>
+			</view>
+			<!--<span class="tSec1Line"></span>-->
+			<view class="tSec1Box" id="weekTime">
+				<text class="text-xxl cuIcon cuIcon-back" @click="timeTap(1)"></text>
+				<text>{{todayWeek.Monday}}</text>
+				-
+				<text>{{todayWeek.Sunday}}</text>
+				<text class="text-xxl cuIcon cuIcon-right"  @click="timeTap(2)"></text>
+			</view>
+		</view>
+		<view class="timeTable_sec2">
+			<view class="tSec2Top">
+				<view class="tSec2TopLi" v-for="(item, ind) in weekArr" :key="item.en" @click="liTap(ind)" :class="ind == num? 'active' : ''">
+					<text>{{ item.en }}</text>
+					<text>{{ item.cn }}</text>
+				</view>
+			</view>
+			<view class="tSec2Box">
+				<view class="tSec2Con" v-for="(items, i) in dataArr" :key="items.num" v-show="i == num">
+					<view class="tSec2List">
+						<view v-if="items.lessonData.length <= 0" class="tSec2ListLi"><view class="noHtml">该时间段没有课表</view></view>
+						<view v-if="items.lessonData.length > 0">
+							<view class="tSec2ListLi" v-for="(k, j) in items.lessonData" :key="j" @click="classTap(k)">
+								<view class="tSec2ListL">第 {{ k.sectionTime }} 节</view>
+								<view class="tSec2ListR">
+									<view class="tSec2ListBox">
+										<view class="tSec2ListT">{{ k.LessonName }}</view>
+										<view class="tSec2ListTxt">{{ k.ClassName }}</view>
+										<view class="tSec2ListTxt">
+											<text class="text-xxl cuIcon cuIcon-profile"></text>
+											{{ k.EmpName }}
+										</view>
+									</view>
+									<view class="tSec2Location">
+										<text class="text-xxl cuIcon cuIcon-location"></text>
+										{{ k.ClassroomName }}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import common from '@/common/js/common.js'
+export default {
+	data() {
+		return {
+			semester: '',
+			num: 0,
+			user: null,
+			weekDayTime: 0,
+			todayWeek: {},
+			dataArr: [],
+			weekArr: [
+				{
+					en: 'MON',
+					cn: '星期一'
+				},
+				{
+					en: 'TUE',
+					cn: '星期二'
+				},
+				{
+					en: 'WED',
+					cn: '星期三'
+				},
+				{
+					en: 'THU',
+					cn: '星期四'
+				},
+				{
+					en: 'FRI',
+					cn: '星期五'
+				},
+				{
+					en: 'SAT',
+					cn: '星期六'
+				},
+				{
+					en: 'SUN',
+					cn: '星期日'
+				}
+			]
+		};
+	},
+	onUnload() {
+		this.OFF('timeTable');
+	},
+	methods: {
+		async init(obj) {
+			//console.log(obj)
+			let _this = this;
+			_this.todayWeek = common.weekday(obj);
+			//console.log(_this.todayWeek)
+			_this.semester = common.judgeDate(obj);
+			_this.weekDayTime = 7 * common.oneDayTime();
+			_this.user = _this.GET_GLOBAL('loginUser');
+			_this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
+		},
+		liTap(ind) {
+			this.num = ind;
+		},
+		timeTap(num) {
+			let _this = this;
+			if (num == 1) {
+			    _this.todayWeek.MondayTime = _this.todayWeek.MondayTime - _this.weekDayTime;
+			    _this.todayWeek.SundayTime = _this.todayWeek.SundayTime - _this.weekDayTime;
+			} else {
+			    _this.todayWeek.MondayTime = _this.todayWeek.MondayTime + _this.weekDayTime;
+			    _this.todayWeek.SundayTime = _this.todayWeek.SundayTime + _this.weekDayTime;
+			}
+			_this.num = 0;
+			_this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime);
+			_this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime);
+			_this.semester = common.judgeDate(_this.todayWeek.SundayTime);
+			_this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
+		},
+		loadData(start, end) {
+		    let param = { StartDate: start, EndDate: end };
+		    // let param = { StartDate: '2018-11-05', EndDate: '2018-11-11' };
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			_this.HTTP_GET('learun/adms/timetable/list', param, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				// console.log(res);
+				_this.ProcessingData(res);
+			});
+			
+		},
+		ProcessingData(data) {
+			let dataM = [
+				{
+					weekTime: 1,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 2,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 3,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 4,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 5,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 6,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				},
+				{
+					weekTime: 7,
+					num: Math.floor(Math.random() * 100000000),
+					lessonData: []
+				}
+			];
+			data.forEach((n, i) => {
+				n.sectionTime = n.LessonTime.slice(1);
+				dataM.forEach((k, j) => {
+					if (k.weekTime == n.LessonTime.slice(0, 1)) {
+						k.lessonData.push(n);
+					}
+				});
+			});
+			dataM.forEach((n, i) => {
+				n.lessonData.sort(common.compare('sectionTime'));
+			});
+			this.dataArr = dataM;
+		},
+		classTap(data) {
+			let _this = this;
+			// console.log(_this.user)
+			if (_this.user.Description == "教师") {
+			    //console.log("教师");
+			} else if (_this.user.Description == "学生") {
+			    let LeaveType = data.LeaveType;
+			    //console.log(LeaveType);
+			    let IsCheck = data.IsCheck;
+			    //console.log(IsCheck);
+			    if (LeaveType == "1") {
+			        let msg = "请假申请中";
+			        if (IsCheck == "1") {
+			            msg = "请假通过";
+			        }
+			        if (IsCheck == "2") {
+			            msg = "请假未通过";
+			        }
+					_this.TOAST(msg);
+			    }
+			    else {
+					this.NAV_TO('./leaveFrom', data, true);
+			    }
+			}
+		},
+		onfun(obj){
+			this.init(obj);
+		}
+	},
+	created() {
+		//this.ON('timeTable', this.init);
+		this.ON('timeTable', this.onfun);
+		this.init()
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.page{
+	background: #fff;
+}
+.timeTable_sec1 {
+	padding: 14px 12px;
+	text-align: center;
+	background: #0075c4;
+	color: #94d4ff;
+	font-size: 0;
+}
+.tSec1Box > * {
+	display: inline-block;
+	vertical-align: middle;
+}
+.tSec1Line {
+	height: 13px;
+	width: 1px;
+	background: #94d4ff;
+	margin: 0 10px;
+}
+.tSec1Box {
+	font-size: 15px;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+#semester {
+	margin-bottom: 10px;
+}
+#weekTime {
+}
+#weekTime text {
+	margin: 0 10px;
+}
+.tSec1Box > text {
+	width: auto;
+	text-align: center;
+	line-height: 22px;
+}
+.tSec1Box image {
+	width: 15px;
+	margin-right: 2px;
+}
+.tSec1Box text:after {
+	display: none;
+}
+.timeTable_sec2 {
+	margin-bottom: 30px;
+}
+.tSec2Top {
+	padding: 0 12px;
+	background: #0075c4;
+	height: 55px;
+	text-align: center;
+	overflow: hidden;
+}
+.tSec2TopLi {
+	width: 14.285714%;
+	float: left;
+	line-height: 18px;
+	padding: 9px 0 9px;
+	color: #fff;
+	font-size: 13px;
+	border-right: 1px solid #1084d2;
+	border-top: 1px solid #1084d2;
+}
+.tSec2TopLi:first-child {
+	border-left: 1px solid #1084d2;
+}
+.tSec2TopLi.active {
+	color: #0075c4;
+	background: #fff;
+	border-color: #fff;
+}
+.tSec2TopLi text {
+	display: block;
+}
+
+.tSec2TopLi text:first-child {
+	letter-spacing: 2px;
+	text-transform: uppercase;
+}
+.tSec2Box {
+	padding: 0 12px;
+	margin-top: 10px;
+}
+.tSec2Con {
+	border-left: 1px solid #d5eaf7;
+	border-right: 1px solid #d5eaf7;
+	border-top: 1px solid #d5eaf7;
+	// display: none;
+}
+.tSec2Con:first-child {
+	display: block;
+}
+.tSec2List {
+	margin-top: 10px;
+}
+.tSec2List:first-child {
+	margin-top: 0;
+}
+.tSec2ListLi {
+	border-bottom: 1px solid #d5eaf7;
+	overflow: hidden;
+	height: 64px;
+}
+.tSec2ListL {
+	float: left;
+	background: #e8f6ff;
+	height: 100%;
+	width: 25%;
+	text-align: center;
+	line-height: 36px;
+	padding: 11px 0;
+	font-size: 14px;
+	color: #646464;
+}
+.tSec2ListR {
+	float: left;
+	width: 75%;
+	height: 100%;
+	line-height: 18px;
+	padding: 4px 0;
+	overflow: hidden;
+}
+.tSec2ListBox {
+	width: 70%;
+	float: left;
+	padding-left: 5px;
+}
+.tSec2ListT {
+	color: #3e3e3e;
+	font-size: 15px;
+	margin: 2px 0;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.tSec2ListTxt {
+	color: #888888;
+	font-size: 13px;
+}
+.tSec2Location {
+	width: 30%;
+	float: left;
+	line-height: 44px;
+	font-size: 13px;
+	color: #888888;
+}
+.noHtml {
+	height: 100%;
+	line-height: 60px;
+	text-align: center;
+	font-size: 14px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/wages/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/wages/list.vue
new file mode 100644
index 000000000..aace676b4
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/wages/list.vue	
@@ -0,0 +1,172 @@
+<template>
+	<view class="page">
+		<view class="wagesSec1">
+			<view class="wagesSec1Top">
+				<view class="text-xxl cuIcon cuIcon-back" @click="tapTime(0)"></view>
+				<text>{{ today.y }} 年 {{ today.m }} 月</text> 
+				<view class="text-xxl cuIcon cuIcon-right" @click="tapTime(1)"></view>
+			</view>
+			<view class="wagesSec1T">￥{{ fsalary }}</view>
+			<view class="wagesSec1Txt">{{ today.y }}年{{ today.m }}月实发工资</view>
+		</view>
+		<view class="wagesSec2">
+			<view v-for="(item, i) in wagesData" :key="i">
+				<view v-show="num == i">
+					<view class="wagesSec2T">应发金额 <text class="span"></text></view>
+					<view class="wagesSec2List">
+						<view class="wagesSec2ListLi">基本工资<text class="span">￥ {{ item.BaseSalary }} </text></view>
+						<view class="wagesSec2ListLi">职位补贴<text class="span">￥ {{ item.JobSubsidies }} </text></view>
+						<view class="wagesSec2ListLi">绩效工资<text class="span">￥ {{ item.PerformanceBonus }} </text></view>
+						<view class="wagesSec2ListLi">手机费<text class="span">￥ {{ item.MobilePhoneFee }} </text></view>
+						<view class="wagesSec2ListLi">交通费<text class="span">￥ {{ item.TransportationFee }} </text></view>
+						<view class="wagesSec2ListLi">全勤奖<text class="span">￥ {{ item.AttendanceBonus }} </text></view>
+						<view class="wagesSec2ListLi">应发金额<text class="span">￥ {{ item.SSalary }} </text></view>
+					</view>
+					<view class="wagesSec2T">扣款金额 <text class="span"></text></view>
+					<view class="wagesSec2List">
+						<view class="wagesSec2ListLi">养老金保险<text class="span">￥ {{ item.PensionInsurance }} </text></view>
+						<view class="wagesSec2ListLi">个人所得税<text class="span">￥ {{ item.PersonalIncomeTax }} </text></view>
+						<view class="wagesSec2ListLi">事假<text class="span">￥ {{ item.PersonalLeave }} </text></view>
+						<view class="wagesSec2ListLi">迟到<text class="span">￥ {{ item.Late }} </text></view>
+						<view class="wagesSec2ListLi">病假<text class="span">￥ {{ item.Sick }} </text></view>
+						<view class="wagesSec2ListLi">个人所得税<text class="span">￥ {{ item.PersonalIncomeTax }} </text></view>
+					</view>
+				</view>
+			</view>
+			<view style="text-align: center;padding: 10px 0;" v-show="num == -1"> 暂无数据!</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import common from '@/common/js/common.js';
+export default{
+	data() {
+		return {
+			today: null,
+			wagesData: null,
+			num: -1,
+			fsalary: 0
+		}
+	},
+	methods:{
+		init() {
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			// _this.HIDE_LOADING();
+			_this.HTTP_GET('Learun/EducationalAdministration/SalarySheet/list', '', '加载数据时出错').then(res => {
+				_this.HIDE_LOADING();
+				console.log(res);
+				if (res) {
+				    // console.log(res);
+				    _this.wagesData = res;
+					_this.jisuan()
+				}
+			});
+		},
+		tapTime(num) {
+			if (num == 0) {
+			    if (this.today.m == 1) { this.today.y = this.today.y - 1, this.today.m = 12 } 
+				else { this.today.y = this.today.y, this.today.m = this.today.m - 1 }
+			} else {
+			    if (this.today.m == 12) { this.today.y = this.today.y + 1, this.today.m = 1 } 
+				else { this.today.y = this.today.y, this.today.m = this.today.m + 1 }
+			}
+			this.jisuan()
+		},
+		jisuan() {
+			let _this = this;
+			this.num = -1;
+			this.fsalary = 0;
+			this.wagesData.forEach((n, i) => {
+				if(n.year == _this.today.y && n.month == parseInt(_this.today.m)){
+					_this.num = i;
+					_this.fsalary = n.Fsalary;
+				}
+			})
+			// console.log(this.num)
+		}
+	},
+	created() {
+		let today = common.fmtDate().split('-');
+		this.today = {
+			y: today[0],
+			m: today[1],
+			d: today[2]
+		};
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+.wagesSec1 {
+	padding: 14px 12px 30px;
+	text-align: center;
+	background: #0c86d8;
+}
+.wagesSec1Top {
+	font-size: 0;
+}
+.wagesSec1Top > * {
+	display: inline-block;
+	vertical-align: middle;
+	color: #bbdefb;
+}
+.wagesSec1Top text {
+	width: 185px;
+	font-size: 14px;
+}
+.wagesSec1T {
+	margin-top: 20px;
+	font-size: 28px;
+	text-align: center;
+	color: #fff;
+}
+.wagesSec1Txt {
+	font-size: 12px;
+	color: #bbdefb;
+	text-align: center;
+	margin-top: 5px;
+}
+.wagesSec2 {
+	background: #fff;
+}
+.wagesSec2List {
+	margin: 0px;
+	padding: 0px;
+	list-style: none;
+}
+.wagesSec2ListLi {
+	list-style: none;
+}
+.wagesSec2T {
+	font-size: 15px;
+	color: #a0a0a0;
+	padding: 0 12px;
+	line-height: 40px;
+	border-bottom: 1px solid #f0f3f5;
+}
+.wagesSec2T .span {
+	display: inline-block;
+	width: 5px;
+	height: 5px;
+	background: #ffba00;
+	vertical-align: middle;
+	border-radius: 50%;
+	margin-left: 5px;
+	position: relative;
+	top: -2px;
+}
+.wagesSec2ListLi {
+	line-height: 40px;
+	border-bottom: 1px solid #f0f3f5;
+	font-size: 13px;
+	color: #646464;
+	padding: 0 12px;
+}
+.wagesSec2ListLi .span {
+	float: right;
+	color: #8a8a8a;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue
new file mode 100644
index 000000000..ee82d7bed
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue	
@@ -0,0 +1,358 @@
+<template>
+	<view class="welcome">
+		<view class="welT">基本信息</view>
+		<view class="welBox">
+			<!-- <input type="hidden" name="ID" value="" id="ID" /> -->
+			<l-input title="学号" placeholder="请填写" :value="StuInfoFreshEntity.StuNo" disabled right />
+			<l-input title="准考证号" placeholder="请填写" :value="StuInfoFreshEntity.zkzh" disabled right />
+			<l-input title="考生号" placeholder="请填写" :value="StuInfoFreshEntity.ksh" disabled right />
+			<l-input title="姓名" placeholder="请填写" :value="StuInfoFreshEntity.StuName" disabled right />
+			<l-input title="性别" placeholder="请填写" :value="displayListItem(StuInfoFreshEntity, 'GenderNo')" disabled right />
+			<l-input title="系别" placeholder="请填写" :value="StuInfoFreshEntity.DeptNo" disabled right />
+			<l-input title="专业" placeholder="请填写" :value="StuInfoFreshEntity.MajorNo" disabled right />
+			<l-input title="班级" placeholder="请填写" :value="StuInfoFreshEntity.ClassNo" disabled right />
+			<l-input title="身份证号" placeholder="请填写" :value="StuInfoFreshEntity.IdentityCardNo" disabled right />
+			<l-input title="出生日期" placeholder="请填写" :value="StuInfoFreshEntity.Birthday" disabled right />
+			<l-input title="户口类别" placeholder="请填写" :value="StuInfoFreshEntity.ResidenceNo" disabled right />
+			<l-input title="政治面貌" placeholder="请填写" :value="displayListItem(StuInfoFreshEntity, 'PartyFaceNo')" disabled right />
+		</view>
+		<!-- {{ StuInfoFreshEntity.GenderNo }} -->
+		<!-- <view class="welLine"></view> -->
+		<view class="welT" style="padding-top: 10px;">采集照片信息</view>
+		<view class="welBox">
+			<input type="hidden" id="Photo" value="" />
+			<input id="files" type="file" accept="image/*" />
+			<view class="welImgAdd">
+				<!--<view id="welImgBtn">上传照片</view>-->
+				<img id="PhotoImg" :src="imgSrc" alt="" />
+			</view>
+			<!--<view class="welText">说明：近期两寸免冠正面彩色照小于100K</view>-->
+		</view>
+		<view class="welLine"></view>
+		<view class="welT" style="padding-top: 10px;">自然信息</view>
+		<view class="welLine"></view>
+		<view class="welBox"><l-input v-model="queryData.RegionNo" title="籍贯" placeholder="请填写" right /></view>
+		<view class="welT" style="padding-top: 10px;">通讯信息</view>
+		<view class="welLine"></view>
+		<view class="welBox">
+			<l-input v-model="queryData.FamilyAddress" title="家庭住址" placeholder="请填写" right />
+			<l-input v-model="queryData.telephone" title="联系电话" placeholder="请填写" right />
+		</view>
+		<view class="welT" style="padding-top: 10px;">
+			家庭成员(直系家属)
+			<text class="text-xxl cuIcon cuIcon-add" @click="add('StuInfoFreshFamilyEntities')"></text>
+		</view>
+		<view class="welBox" id="StuInfoFreshFamily" v-show="queryData.StuInfoFreshFamilyEntities.length != 0">
+			<view class="welCon" v-for="(item, i) in queryData.StuInfoFreshFamilyEntities" :key='i'>
+				<l-input v-model="item.Name" title="姓名" placeholder="请填写" right />
+				<!-- <l-input v-model="item.Relation" title="" placeholder="请填写" right /> -->
+				<l-select v-model="item.Relation" :range="dataSource.FamilyRelation" title="与本人关系" placeholder="请选择" />
+				<l-select v-model="item.Sex" :range="dataSource.GenderNo" title="性别" placeholder="请选择" />
+				<l-input v-model="item.Age" title="年龄" placeholder="请填写" right />
+				<!-- <l-input v-model="item.Politicy" title="政治面貌" placeholder="请填写" right /> -->
+				<l-select v-model="item.Politicy" :range="dataSource.PartyFaceNo" title="政治面貌" placeholder="请选择" />
+				<view class="welDel" @click="del('StuInfoFreshFamilyEntities', i)"><text class="text-xxl cuIcon cuIcon-move"></text></view>
+			</view>
+		</view>
+		<view class="welT" style="padding-top: 10px;">
+			紧急联系人
+			<text class="text-xxl cuIcon cuIcon-add" @click="add('StuInfoFreshEmergePeopleEntities')"></text>
+		</view>
+		<view class="welBox" id="StuInfoFreshEmergePeople" v-show="queryData.StuInfoFreshEmergePeopleEntities.length != 0">
+			<view class="welCon" v-for="(item, i) in queryData.StuInfoFreshEmergePeopleEntities" :key='i'>
+				<l-input v-model="item.Name" title="姓名" placeholder="请填写" right />
+				<l-input v-model="item.Relation" title="与本人关系" placeholder="请填写" right />
+				<l-input v-model="item.Telephone" title="手机号码" placeholder="请填写" right />
+				<l-input v-model="item.Mobile" title="座机号码" placeholder="请填写" right />
+				<l-input v-model="item.Address" title="联系地址" placeholder="请填写" right />
+				<view class="welDel" @click="del('StuInfoFreshEmergePeopleEntities', i)"><text class="text-xxl cuIcon cuIcon-move"></text></view>
+			</view>
+		</view>
+		<view class="btn" @click="tapBtn">保存</view>
+	</view>
+</template>
+
+<script>
+import moment from 'moment';
+import get from 'lodash/get';
+import set from 'lodash/set';
+export default {
+	data() {
+		return {
+			imgSrc: '',
+			scheme: {
+				PartyFaceNo: {
+					type: 'sourceData',
+					dataSource: '1',
+					dataSourceId: 'BCdPartyFace,partyface,partyfaceno'
+				},
+				GenderNo:{
+					type: 'dataItem',
+					dataType: 'dataDictionary'
+				}
+			},
+			userInfo: {},
+			dataSource:{
+				GenderNo: Object.values(this.GET_GLOBAL('dataDictionary').usersex).map(t => ({ value: t.value, text: t.text })),
+				FamilyRelation: Object.values(this.GET_GLOBAL('dataDictionary').FamilyRelation).map(t => ({ value: t.value, text: t.text })),
+				PartyFaceNo:[]
+			},
+			StuInfoFreshFamilyEntities:{
+				Name: '',
+				Age: '',
+				Sex: '1',
+				Politicy: '01',
+				Relation: '01'
+			},
+			StuInfoFreshEmergePeopleEntities:{
+				Name: '',
+				Relation: '',
+				Telephone: '',
+				Mobile: '',
+				Address: ''
+			},
+			queryData:{
+				ID: '',
+				RegionNo: '',
+				FamilyAddress: '',
+				telephone: '',
+				Photo: '',
+				StuInfoFreshFamilyEntities:[],
+				StuInfoFreshEmergePeopleEntities: []
+			},
+			StuInfoFreshEntity:{
+				
+			}
+		};
+	},
+	methods: {
+		init() {
+			// console.log(this.API)
+			let _this = this;
+			Promise.all([
+				this.FETCH_DATASOURCE('BCdPartyFace').then(data => {
+					// console.log(data)
+					this.dataSource.PartyFaceNo = data.data.map(t => ({
+						text: t.partyface,
+						value: t.partyfaceno
+					}));
+				}),
+			
+				() => {}
+			]);
+			_this.LOADING('加载数据…');
+			_this.HTTP_GET('StuInfoFresh/stuInfoFreshEntity', _this.userInfo.account, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				// console.log(res);
+				_this.StuInfoFreshEntity = _this.COPY(res.StuInfoFreshEntity);
+				_this.queryData.StuInfoFreshFamilyEntities = _this.COPY(res.StuInfoFreshFamilyList);
+				_this.queryData.StuInfoFreshEmergePeopleEntities = _this.COPY(res.StuInfoFreshEmergePeopleList);
+				_this.queryData.ID = res.StuInfoFreshEntity.ID;
+				_this.queryData.Photo = res.StuInfoFreshEntity.Photo;
+				_this.queryData.telephone = res.StuInfoFreshEntity.telephone;
+				_this.queryData.FamilyAddress = res.StuInfoFreshEntity.FamilyAddress;
+				_this.queryData.RegionNo = res.StuInfoFreshEntity.RegionNo;
+				_this.imgSrc = this.API.slice(0,-1) + res.Url;
+			});
+		},
+		tapBtn() {
+			console.log(this.queryData)
+			this.LOADING('正在提交数据…');
+			this.HTTP_GET('StuInfoFresh/saveStuInfoFresh', this.queryData, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				// console.log(res);
+				if (res) {
+					this.TOAST('保存成功');
+				}
+			});
+		},
+		add(str) {
+			let jsons = this.COPY(this[str]);
+			this.queryData[str].push(jsons)
+			// console.log(this.queryData[str])
+		},
+		del(str, num) {
+			this.queryData[str].splice(num, 1)
+		},
+
+		// 显示列表中的标题项
+		displayListItem(item, field) {
+			const fieldItem = this.scheme[field];
+			const value = item[field];
+			// console.log(Object.values(this.GET_GLOBAL('dataDictionary').usersex));
+			
+			switch (fieldItem.type) {
+				case 'currentInfo':
+				case 'organize':
+					return fieldItem.dataType === 'time' ? value : get(this.GET_GLOBAL(fieldItem.dataType), `${value}.name`, '');
+					
+				case 'dataItem':
+					const sex = this.dataSource[field].find(t => t.value === String(value));
+					return get(sex, 'text', '');
+				
+				case 'sourceData':
+					const BCdPartyFace = this.dataSource[field].find(t => t.value === String(value));
+					return get(BCdPartyFace, 'text', '');
+				
+				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;
+			}
+		}
+	},
+	created() {
+		this.userInfo = this.GET_GLOBAL('loginUser'); //获取登录信息
+		this.init();
+	}
+};
+</script>
+
+<style lang="less" scoped>
+/deep/ .cu-form-group {
+	min-height: 40px;
+}
+.welcome {
+	padding: 1px 0px 20px;
+	background: #fff;
+}
+
+.welT {
+	font-size: 16px;
+	margin-bottom: 10px;
+	line-height: 26px;
+	padding: 0 12px;
+}
+
+.welT text {
+	width: 26px;
+	height: 26px;
+	line-height: 24px;
+	border: 1px solid #efefef;
+	border-radius: 4px;
+	float: right;
+	text-align: center;
+	color: #999;
+}
+
+.welLine {
+	height: 1px;
+	background: #efefef;
+	// margin: 10px -12px;
+}
+
+.welInput {
+	overflow: hidden;
+	font-size: 14px;
+	margin-top: 10px;
+}
+
+.welInput span {
+	float: left;
+	width: 26%;
+	text-align: right;
+	line-height: 30px;
+}
+
+.welInput input {
+	display: block;
+	margin-left: 28%;
+	width: 72%;
+	border: 1px solid #efefef;
+	border-radius: 4px;
+	height: 30px;
+	line-height: 28px;
+	padding: 0 10px;
+	margin-bottom: 0;
+}
+
+.welCon {
+	padding: 10px;
+	border: 1px solid #efefef;
+	margin-top: 18px;
+	border-radius: 4px;
+	position: relative;
+}
+
+.welDel {
+	position: absolute;
+	top: -8px;
+	left: -8px;
+	background: #fff;
+}
+
+.welDel text {
+	text-align: center;
+	width: 26px;
+	height: 26px;
+	display: block;
+	line-height: 24px;
+	border: 1px solid #efefef;
+	border-radius: 50%;
+}
+
+.welImgAdd {
+	text-align: center;
+	line-height: 0;
+}
+
+#files {
+	opacity: 0;
+	-webkit-opacity: 0;
+	z-index: 9;
+	display: none;
+}
+
+#welImgBtn {
+	display: block;
+	width: 110px;
+	height: 30px;
+	text-align: center;
+	line-height: 26px;
+	border: 2px solid #efefef;
+	border-radius: 4px;
+	font-size: 14px;
+	color: #999;
+	margin: 10px auto;
+	cursor: pointer;
+}
+.welImgAdd {
+	min-height: 110px;
+}
+#PhotoImg {
+	width: 110px;
+	height: 110px;
+}
+
+.btnBox {
+	margin-top: 20px;
+	text-align: center;
+}
+#saveBtn {
+	margin: auto;
+	margin-top: 25px;
+	width: 92%;
+}
+#StuInfoFreshFamily,#StuInfoFreshEmergePeople{
+	padding: 0 15px;
+}
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/xuan-linkAddress/get_linkAddress_p.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/xuan-linkAddress/get_linkAddress_p.js
new file mode 100644
index 000000000..f25161c39
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/xuan-linkAddress/get_linkAddress_p.js	
@@ -0,0 +1,33 @@
+import api from '@/components/xuan-linkAddress/api.js';
+
+export default {
+	/*
+	*_this:全局this
+	* data:数据(参数)
+	* callback:回掉
+	*/
+	get_linkAddress: function(_this,tag,data,callback) {
+		//请求
+		api.get_linkAddress_api(data).then((res) => {
+			let revert=res.data.data;
+			console.log(revert)
+			if(res.data.code==1){
+				if(tag==="province"){	
+					console.log("province")
+					_this.linkAddress_area[0].info=revert;
+					callback(true);//回掉
+				}
+				if(tag==="city"){
+					console.log("city")
+					_this.linkAddress_area[1].info=revert;
+					callback(true);//回掉
+				}
+				if(tag==="district"){
+					console.log("district")
+					_this.linkAddress_area[2].info=revert;
+					callback(true);//回掉
+				}
+			}
+		});
+	}
+}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/xuan-linkAddress/request.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/xuan-linkAddress/request.js
new file mode 100644
index 000000000..c37321586
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/xuan-linkAddress/request.js	
@@ -0,0 +1,25 @@
+//网络请求
+export default class Request{
+	/*
+	*paramete 参数
+	* data 参数值
+	* method 请求方式
+	*/
+	http(paramete,data,method){
+		//根地址
+		let BASE_API="http://admin.farmereasy.com";
+		return new Promise((resolve,reject)=>{
+			uni.request({
+				url:`${BASE_API}${paramete}`,
+				data:data,
+				method:method,
+				success:(res)=>{
+					resolve(res);
+				},
+				fail:(res)=>{
+					resolve(0);
+				}
+			})
+		});
+	}
+}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/xuan-linkAddress/yes.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/xuan-linkAddress/yes.png
new file mode 100644
index 000000000..70b8ca94c
Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/xuan-linkAddress/yes.png differ