智慧教学

智慧教学设计移动端API
智慧教学AI分析

.gitignore

@@ -79,3 +79,8 @@ Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
 /Learun.Framework.Ultimate V7/Learun.Application.Mobile/platforms/android/assets/www
 /Learun.Framework.Ultimate V7/Learun.Application.Mobile/www.7z
 /Learun.Framework.Ultimate V7/Learun.Application.WebApi/bin.7z
+/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/QRCode
+/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images
+/Learun.Framework.Ultimate V7/Learun.Application.WebApi/logs
+/Learun.Framework.Ultimate V7/Learun.Application.Web/Log/LogInfo/20250106
+/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Log/LogInfo/20250113

CppProperties.json

@@ -0,0 +1,21 @@
+{
+  "configurations": [
+    {
+      "inheritEnvironments": [
+        "msvc_x64"
+      ],
+      "name": "x64-Debug",
+      "includePath": [
+        "${env.INCLUDE}",
+        "${workspaceRoot}\\**"
+      ],
+      "defines": [
+        "WIN32",
+        "_DEBUG",
+        "UNICODE",
+        "_UNICODE"
+      ],
+      "intelliSenseMode": "windows-msvc-x64"
+    }
+  ]
+}

Learun.Framework.Ultimate

@@ -0,0 +1,4 @@
+  File "F:\项目发布\数校APi\XmlConfig\test.py", line 5
+    file.write('123')
+    ^
+IndentationError: expected an indented block after 'with' statement on line 4

Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园3.0部署手册V1.3.docx

@@ -1,63 +1,28 @@
 
 数字化智慧校园3.0
-
-
-
-
-
-
-
-
-
-
-
-
-
 部署手册
-
-
-
-
-
-
-
-
-
-
-
-
 版本号：V1.3
-
-
-
-
-
-
 修订记录
                                  修订时间
                                    修订人
                                    版本号
                                     变更
-2019-03-19
-梁坤
+2019-03-19梁坤
 V1.0
 新建V1.0
 2019-05-10
 梁坤
 V1.1
 新增系统流程配置说明和飞星上传目录要求说明
-2019-07-04
-梁坤
+2019-07-04梁坤
 V1.2
 新增飞星部署说明，统一身份认证部署说明
-2020-09-09
-梁坤
+2020-09-09梁坤
 V1.3
 1.新增力软706框架升级部署说明
 2.新增海康考勤机连接部署说明
 3.修改授权验证功能说明
 4.修改系统要求软件环境部分
-
                                        
                                        
                                        
@@ -98,152 +63,50 @@ V1.3
   
 系统要求
 硬件
-8GB及以上内存，4核心及以上CPU主频不低于2.0GHz，硬盘空间不低于500GB，其中系统盘剩余空间不低于50GB
-操作系统
-Windows Server2008R2及以上
-软件环境
-.NET FrameWork 4.5及以上（力软705版本开始升级到4.6.1及以上）
-SQL Server2012及以上
-IIS基础模块
-Redis 3.2.100及以上
-
-系统部署
+8GB及以上内存，4核心及以上CPU主频不低于2.0GHz，硬盘空间不低于500GB，其中系统盘剩余空间不低于50GB操作系统
+Windows Server2008R2及以上软件环境
+.NET FrameWork 4.5及以上（力软705版本开始升级到4.6.1及以上）SQL Server2012及以上IIS基础模块Redis 3.2.100及以上系统部署
 数据库配置
 第一步
-新建数据库adms7ultimate2和CollegeMISFor30
-
-
-存储路径修改至较大剩余空间硬盘
-
-
-
+新建数据库adms7ultimate2和CollegeMISFor30存储路径修改至较大剩余空间硬盘
 第二步
-还原数据库，备份文件如下图
-
-分别还原至对应数据库
-
-还原路径一定要选对
-
-
-选项如下图：
-
-
+还原数据库，备份文件如下图分别还原至对应数据库还原路径一定要选对选项如下图：
 第三步
-修改数据库adms7ultimate2中LR_Base_DatabaseLink表内数据，内有连接字符串修改正确。
-
-
-LR_Base_User表内数据只保留system帐号，其余做删除处理：
-
-LR_Base_Module表中F_UrlAddress地址替换成后续部署mis系统的端口和ip：
-
-Sql语句：update LR_Base_Module set F_UrlAddress=replace(F_UrlAddress,'192.168.1.126:9000','192.168.60.128:8082')
+修改数据库adms7ultimate2中LR_Base_DatabaseLink表内数据，内有连接字符串修改正确。LR_Base_User表内数据只保留system帐号，其余做删除处理：
+LR_Base_Module表中F_UrlAddress地址替换成后续部署mis系统的端口和ip：Sql语句：update LR_Base_Module set F_UrlAddress=replace(F_UrlAddress,'192.168.1.126:9000','192.168.60.128:8082')
 Sql语句按实际情况修改
 第四步
-同步学校基础数据到CollegeMISFor30中（使用系统导入、数据库导入功能均可）
-常用表：
-
-排课数据ArrangeLessonTerm
-系CdDept
-专业CdMajor
-课程分类CdLessonSort，CdLessonSortDetail
-课程LessonInfo
-班级ClassInfo
-教学楼ClassroomBuilding
-教室ClassroomInfo
-班主任ClassInfoDiredctor
-教师EmpInfo
-学生StuInfoBasic
-
-注意：学生和教师表内，checkmark必须是true才能生成帐号
+同步学校基础数据到CollegeMISFor30中（使用系统导入、数据库导入功能均可）常用表：排课数据ArrangeLessonTerm
+系CdDept专业CdMajor课程分类CdLessonSort，CdLessonSortDetail课程LessonInfo班级ClassInfo教学楼ClassroomBuilding教室ClassroomInfo班主任ClassInfoDiredctor教师EmpInfo学生StuInfoBasic注意：学生和教师表内，checkmark必须是true才能生成帐号
 性别1男0女，旧系统一般是1男2女，注意修改数据
 教师表中F_CompanyId和F_DepartmentId分别对应adms7ultimate2库的LR_Base_Company表（学校校区表）的对应id，LR_Base_Department（部门）的对应id
 学生表中F_SchoolId对应adms7ultimate2库的LR_Base_Company表（学校校区表）的对应id，DeptNo对应CollegeMIS库的系CdDept 的DeptNo，否则生成帐号会生成出错！
 
 IIS配置
 网站组成
-全部系统需要部署4个网站如下图：
-
-分别对应：高职20190311web、WebPublish、WebAPIPublish、www四个压缩包。
+全部系统需要部署4个网站如下图：分别对应：高职20190311web、WebPublish、WebAPIPublish、www四个压缩包。
 网站程序池配置
-Mis系统需要选择2.0集成，且启用32位，图：
-
-
-
-
-其余三个系统需要4.0集成，同样启用32位。
-
+Mis系统需要选择2.0集成，且启用32位，图：其余三个系统需要4.0集成，同样启用32位。
 注意：有时还需要配置文件目录权限如下图：
-
-
 配置文件修改
-网站数据库配置：
-新增定时库配置
+网站数据库配置：新增定时库配置
 <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
 
-Mis系统修改三处Web.config中，如下图：
-
-以下网站修改xmlconfig目录下的database.config配置：
-
-
-和system.config配置：
-
-workflowapi修改为对应的服务器ip地址，跳转地址指向mis系统ip和端口。
-AnnexesFile 修改为部署服务器的Resource文件夹下，否则会影响飞星。
-
-手机h5网站即站，修改config下config.js文件：
-
-Webapi指向api站，web指向主网站
-系统流程使用配置
+Mis系统修改三处Web.config中，如下图：以下网站修改xmlconfig目录下的database.config配置：和system.config配置：workflowapi修改为对应的服务器ip地址，跳转地址指向mis系统ip和端口。AnnexesFile 修改为部署服务器的Resource文件夹下，否则会影响飞星。手机h5网站即站，修改config下config.js文件：
+Webapi指向api站，web指向主网站系统流程使用配置
   系统流程是为了配合框架中个人办公-》我的任务-》代办任务中（即工作流）实现一些提交审核数据的功能，系统开发时已经内置了默认的流程，如需修改配套的流程，请详细阅读并按照下面的步骤谨慎修改。
   
-第一步：了解使用系统流程的功能和对应的路径如如下：
-采购申请
-
-入库申请
-
-出库申请
-
-公文下发
-
-第二步：编辑对应的index.js最下方代码，如图：
-
-修改红圈处模板编号为系统中对应的流程模板编号，流程功能如下图：
-
-
-新建系统调用流程时，要注意选择系统流程，模板编号要和index.js相对应，否则会造成工作流功能工作不稳定甚至紊乱。
-
-第三步：配置各节点的表单，如下图所示：
-开始节点和中间审批节点添加表单，类型选择系统表单，地址填写对应的功能目录的FormView。
-
-最后审批节点需要额外配置【绑定方法】，如下图：
-
-
-绑定方法见下表：（大小写区分且不能有空格）
+第一步：了解使用系统流程的功能和对应的路径如如下：采购申请入库申请出库申请公文下发第二步：编辑对应的index.js最下方代码，如图：修改红圈处模板编号为系统中对应的流程模板编号，流程功能如下图：新建系统调用流程时，要注意选择系统流程，模板编号要和index.js相对应，否则会造成工作流功能工作不稳定甚至紊乱。
+第三步：配置各节点的表单，如下图所示：开始节点和中间审批节点添加表单，类型选择系统表单，地址填写对应的功能目录的FormView。最后审批节点需要额外配置【绑定方法】，如下图：绑定方法见下表：（大小写区分且不能有空格）
                                  系统功能
                                  绑定方法
                                     备注
-采购申请
-Ass_PurchaseApplyMethod
-
-入库申请
-Ass_AssetsInfoApplyMethod
-
-出库申请
-Ass_AssetsOutApplyMethod
-
-公文下发
-Sys_SendFileMethod
-
-
-
-
-
-应用程序配置
+采购申请Ass_PurchaseApplyMethod入库申请
+Ass_AssetsInfoApplyMethod出库申请
+Ass_AssetsOutApplyMethod公文下发
+Sys_SendFileMethod应用程序配置
 配置文件
-WorkFlow下Learun.Application.WorkFlowServer.exe.config文件修改：
-
-
-管理员方式运行Learun.Application.WorkFlowServer.exe开启服务。
+WorkFlow下Learun.Application.WorkFlowServer.exe.config文件修改：管理员方式运行Learun.Application.WorkFlowServer.exe开启服务。
 统一身份认证配置
 <!-- ================== 统一身份认证公钥密钥 ================== -->
 <add key="SSOPublicSecret" value="bjquanjiang" />
@@ -302,35 +165,19 @@ Webapi配置变更
 第一步，首先更新版本程序
 第二步，使用Quanjiang.DigitalScholl.DataSync.exe数据库同步工具同步客户数据库到最新（由于数据库操作风险巨大，具体使用时联系开发人员配合同步）
 第三步，参照最新程序修改XmlConfig下system.config、ioc.config，根目录下Web.config文件
-第四步，如果出现授权验证失败，需要重新进行授权。
-飞星部署
+第四步，如果出现授权验证失败，需要重新进行授权。飞星部署
 服务端
-飞星服务端属于exe可执行文件，运行前先配置配置文件GoChat.Server.exe.config：
-<add key="serverAddress" value="*:8866" />（一般情况不要动）
+飞星服务端属于exe可执行文件，运行前先配置配置文件GoChat.Server.exe.config：<add key="serverAddress" value="*:8866" />（一般情况不要动）
 然后以管理员身份运行GoChat.Server.exe后，如下图：
 
 点击服务控制，切换到该选项卡，点击启动即可
 
 
 客户端
-最新客户端安装包，请到公司群文件里下载，注意下载最新版本号的    飞星客户端.exe
-安装后，需要先配置服务器，点击登录界面右上角设置按钮，如下图：
-
-
-
-通信服务器内网（外网）地址：运行飞星服务端程序的服务器ip地址+端口号，例如：
-123.57.209.16:8866    127.0.0.1:8866
-通信服务器数据地址：数字化校园API网站地址+端口号，例如：123.57.209.16:31173  192.168.2.126:8083
-请务必注意配置正确，否则无法正常登录飞星。
-配置完成后，输入数字化校园教师帐号密码即可登录。
-
-软件授权
+最新客户端安装包，请到公司群文件里下载，注意下载最新版本号的    飞星客户端.exe安装后，需要先配置服务器，点击登录界面右上角设置按钮，如下图：
+通信服务器内网（外网）地址：运行飞星服务端程序的服务器ip地址+端口号，例如：123.57.209.16:8866    127.0.0.1:8866通信服务器数据地址：数字化校园API网站地址+端口号，例如：123.57.209.16:31173  192.168.2.126:8083请务必注意配置正确，否则无法正常登录飞星。配置完成后，输入数字化校园教师帐号密码即可登录。软件授权
 泉江授权程序
-程序名称Quanjiang.DigitalScholl.License.exe
-本程序为可执行文件，无需配置
-授权成功后，会在客户机主网站bin目录下，生成后缀为.bjqj的加密授权文件，授权分为永久授权和限时授权，不勾选是否限时即为永久授权。
-
-说明：
+程序名称Quanjiang.DigitalScholl.License.exe本程序为可执行文件，无需配置授权成功后，会在客户机主网站bin目录下，生成后缀为.bjqj的加密授权文件，授权分为永久授权和限时授权，不勾选是否限时即为永久授权。说明：
 1.首先部署好数字化校园3.0主程序，浏览器打开：http://部署地址/ShowRegister
 2.运行授权器，将上一步得到的机器码填写至注册器机器码文本框内。
 3.如果有使用期限，选择好到期时间，如果没有使用期限，请将限时复选框去掉。
@@ -338,17 +185,9 @@ Webapi配置变更
 5.重新运行部署的数字化校园。
 6.！！！！严重警告！！！！此软件禁止放在部署机上！！！！此软件严禁外传！！！！
 7. 在力软705版本后增加了网络授权验证，客户机除了要进行上述的本地授权外，还需要进行网络授权
-步骤1：打开授权网站http://123.57.209.16:8061/ 用户名：联系泉江获取 密码：联系泉江获取 并登录。
-步骤2：打开功能并新增授权
-
-步骤3：填写相关信息并保存（机器码即运行数校http://部署地址/ShowRegister获得的机器码）
-
-步骤4：重新访问数字化智慧校园系统验证授权是否正确。
-定时服务部署
+步骤1：打开授权网站http://123.57.209.16:8061/ 用户名：联系泉江获取 密码：联系泉江获取 并登录。步骤2：打开功能并新增授权步骤3：填写相关信息并保存（机器码即运行数校http://部署地址/ShowRegister获得的机器码）步骤4：重新访问数字化智慧校园系统验证授权是否正确。定时服务部署
 部署
-本程序为Windows服务，即运行在系统底层的程序，可随系统启动，安装后需要手动启动，设置为自动运行，程序名称Quanjiang.DigitalScholl.JobService.exe
-先修改配置文件
-Quanjiang.DigitalScholl.JobService.exe.config中的连接字符串到部署服务器
+本程序为Windows服务，即运行在系统底层的程序，可随系统启动，安装后需要手动启动，设置为自动运行，程序名称Quanjiang.DigitalScholl.JobService.exe先修改配置文件Quanjiang.DigitalScholl.JobService.exe.config中的连接字符串到部署服务器
 <add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
 <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
 <add name="HangfireConnString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
@@ -356,11 +195,7 @@ Quanjiang.DigitalScholl.JobService.exe.config中的连接字符串到部署服
 <add key="dbbackuppath" value="主网站部署地址\Resource\DataBaseBackup" />
 如需要部署海康考勤机还需要配置：
 <add key="AttendancePhotoPath" value="主网站部署地址\Resource\AttendancePhoto" />
-部署方法：
-第一步，以管理员身份运行cmd
-第二步，进入服务程序路劲 cd 盘符\目录\Quanjiang.DigitalScholl.JobService\bin\Debug回车
-第三步，盘符 回车
-第四步，%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\installutil.exe Quanjiang.DigitalScholl.JobService.exe 回车，提示安装成功。
+部署方法：第一步，以管理员身份运行cmd第二步，进入服务程序路劲 cd 盘符\目录\Quanjiang.DigitalScholl.JobService\bin\Debug回车第三步，盘符 回车第四步，%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\installutil.exe Quanjiang.DigitalScholl.JobService.exe 回车，提示安装成功。
 
 第五步，打开Windows服务，找到安装的服务
 
@@ -373,52 +208,40 @@ Quanjiang.DigitalScholl.JobService.exe.config中的连接字符串到部署服
 卸载后，刷新Windows服务 应看不到本服务程序说明卸载成功，否则需要重启。
 
 海康考勤机部署要求
-首先确保数字化校园主站运行正常。
-步骤1 配置考勤机参数。打开功能【考勤设备管理】
-
-步骤2 配置考勤机参数，系统仅对启用设备进行连接操作
-
-步骤3 部署【DigitalSchoolApi】网站，并保证正常运行。
-步骤4 复制【海康考勤机必须文件】下的所有文件、文件夹到Quanjiang.DigitalScholl.JobService.exe所在目录。
+首先确保数字化校园主站运行正常。步骤1 配置考勤机参数。打开功能【考勤设备管理】步骤2 配置考勤机参数，系统仅对启用设备进行连接操作步骤3 部署【DigitalSchoolApi】网站，并保证正常运行。步骤4 复制【海康考勤机必须文件】下的所有文件、文件夹到Quanjiang.DigitalScholl.JobService.exe所在目录。
 步骤5 复制DigitalSchoolApi内三个文件到Quanjiang.DigitalScholl.JobService.exe所在目录。
 步骤6 运行服务
 检查是否部署
-运行数字化校园主网站ip+端口/hangfire
-查看服务器
-
-显示上图即为服务正常，否则服务没运行正常。
-DigitalSchoolApi部署
+运行数字化校园主网站ip+端口/hangfire查看服务器显示上图即为服务正常，否则服务没运行正常。DigitalSchoolApi部署
 部署
 本程序为Web应用程序,部署方式同数字化智慧校园系统。
 对接考勤机的客户需要修改Web.config下【AttendancePhotoPath】配置节到数字化智慧校园网站根目录下Resource目录（同步修改【定时服务程序下】Quanjiang.DigitalScholl.JobService.exe.config文件的对应配置）
 <add key="AttendancePhotoPath" value="数字化智慧校园网站根目录\Resource\AttendancePhoto"/>
-程序实现了定时任务的新增，是配合【定时服务】运行的必要系统，程序包含如下图所示的功能：
-1.监控功能：部署地址/hangfire
-
-2.任务操作功能：部署地址/swagger
-
-School基础接口包含了几个教务所需的接口，可对外提供使用。
-
-
-YKT接口包含西昌学校门禁一卡通、图书馆系统数据同步定时同步任务，金隅学校一卡通消费记录定时同步任务，海康考勤机连接任务等，可根据不同学校需求具体操作。
-
-
+程序实现了定时任务的新增，是配合【定时服务】运行的必要系统，程序包含如下图所示的功能：1.监控功能：部署地址/hangfire2.任务操作功能：部署地址/swaggerSchool基础接口包含了几个教务所需的接口，可对外提供使用。YKT接口包含西昌学校门禁一卡通、图书馆系统数据同步定时同步任务，金隅学校一卡通消费记录定时同步任务，海康考勤机连接任务等，可根据不同学校需求具体操作。
 海康考勤机连接
-第一步，单击展开：
+第一步，单击展开：第二步，点击按钮：第三步，点击执行：第四步，查看结果：显示返回200 OK即为成功第五步，确认是否加入定时服务，转到 【DigitalSchoolApi】部署地址/hangfire 查看【周期性作业】确认作业【HKAttendance】存在部署完成。第六步，启动【定时服务】第七步，查看数字化智慧校园系统中的考勤设备管理列表，是否布防和最后通讯时间，确认布防状态（是），最后通讯时间接近当前时间为连接成功，否则说明链接设备出现问题考勤机连接日志
+连接日志存储与CollegeMIS数据库，ADR_DeviceLog表中，查看该表数据可以快速判定考勤机部署连接过程中出现的错误、问题。CMS部署及配置
+安装cms步骤
+https://sscms.com/docs/v6/getting-started/#/how-to-install-siteserver-cms
 
-第二步，点击按钮：
+下发公文 步骤
+打开 xmlconfig文件夹下 有一个 system.config文件 
+如果没有下图配置请添加
+如果有的话请根据实际情况修改
+<!--下发新闻配置-->
+<add key="SiteId" value="39"/>
+<add key="ChannelId" value="6"/>
+<add key="ApiKey" value="fafc361a-40c1-4060-8eee-ea796640c39c"/>
 
-第三步，点击执行：
 
-第四步，查看结果：显示返回200 OK即为成功
+如上图所示 给首页下学校简历添加素材
+SiteId为39
+ChannelId为44
 
-第五步，确认是否加入定时服务，转到 【DigitalSchoolApi】部署地址/hangfire 查看【周期性作业】
+ApiKey配置
+打开后台 系统管理---权限控制---Api秘钥管理
 
-确认作业【HKAttendance】存在部署完成。
-第六步，启动【定时服务】
-第七步，查看数字化智慧校园系统中的考勤设备管理列表，是否布防和最后通讯时间，确认布防状态（是），最后通讯时间接近当前时间为连接成功，否则说明链接设备出现问题
 
+打开此页面 点击 获取秘钥 秘钥并更改秘钥配置文件
 
-考勤机连接日志
-连接日志存储与CollegeMIS数据库，ADR_DeviceLog表中，查看该表数据可以快速判定考勤机部署连接过程中出现的错误、问题。
 

Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园基础信息接口V1.0.docx

@@ -1,426 +0,0 @@
-
-
-数字化智慧校园
-
-
-
-基础信息接口
-
-
-
-V1.0
-
-接口服务器：
-学校服务器，部署地址：http://112.45.152.8:8083/
-
-
-调用方式：
-标准http get请求
-返回数据类型：
-标准json
-返回数据结构
-主要关心code和data即可
-
-                                    属性
-                                   返回值
-                                    备注
-code
-200(int)
-200成功 其余失败
-info
-响应成功(string)
-状态描述
-data
-业务数据(object)
-业务数据
-
-部门接口
-地址：http:// /arrangelesson/department
-主要业务数据 其余字段可忽略
-                                    属性
-                                   返回值
-                                    备注
-                                 可否为空
-F_DepartmentId
-GUID (string)
-GUID部门ID
-否
-F_ParentId
-上级部门ID(string)
--1和0均代表根
-否
-F_EnCode
-部门编号(string)
-部门编号
-否
-F_FullName
-部门全称(string)
-
-否
-F_ShortName
-部门简称(string)
-
-
-F_Manager
-负责人(string)
-
-
-F_OuterPhone
-电话(string)
-
-
-
-教师信息接口
-地址：http://部署地址/arrangelesson/allteacher
-主要业务数据 其余字段可忽略
-                                    属性
-                                   返回值
-                                    备注
-                                 可否为空
-EmpId
-GUID (string)
-GUID教师ID
-否
-EmpNo
-教职工编号(string)
-
-否
-EmpName
-职工姓名(string)
-
-否
-GenderNo
-性别(bool)
-true男false女
-
-Birthday
-生日(datetime)
-
-
-F_DepartmentId
-部门ID(string)
-
-
-mobile
-电话(string)
-
-
-
-
-学生信息接口
-地址：http://部署地址/arrangelesson/allstudent
-主要业务数据 其余字段可忽略
-                                    属性
-                                   返回值
-                                    备注
-                                 可否为空
-StuId
-GUID (string)
-GUID学生ID
-否
-StuNo
-学生编号(string)
-
-否
-StuName
-姓名(string)
-
-否
-ksh
-考生号(string)
-
-
-GenderNo
-性别(bool)
-true男false女
-
-Birthday
-生日(datetime)
-
-
-mobile
-电话(string)
-
-
-IdentityCardNo
-身份证号(string)
-
-
-DeptNo
-系部编号(string)
-
-
-MajorNo
-专业编号(string)
-
-
-Grade
-级别（18代表2018级，19表示2019级）(string)
-
-
-ClassNo
-班级编号(string)
-
-
-
-系部接口
-地址：http://部署地址/arrangelesson/alldept
-主要业务数据 其余字段可忽略
-                                    属性
-                                   返回值
-                                    备注
-                                 可否为空
-DeptId
-GUID (string)
-GUID系部ID
-否
-DeptNo
-系部编号(string)
-
-否
-DeptName
-系部名称(string)
-
-否
-
-专业接口
-地址：http://部署地址/arrangelesson/allmajor
-主要业务数据 其余字段可忽略
-                                    属性
-                                   返回值
-                                    备注
-                                 可否为空
-ID
-GUID (string)
-GUID专业ID
-否
-MajorNo
-专业编号(string)
-
-否
-MajorName
-专业名称(string)
-
-否
-DeptNo
-系部编号(string)
-
-
-校区接口
-地址：http://部署地址/arrangelesson/allschool
-主要业务数据 其余字段可忽略
-                                    属性
-                                   返回值
-                                    备注
-                                 可否为空
-F_CompanyId
-GUID (string)
-GUID校区ID
-否
-F_FullName
-校区名称(string)
-
-否
-
-班级接口
-地址：http://部署地址/arrangelesson/allclass
-主要业务数据 其余字段可忽略
-                                    属性
-                                   返回值
-                                    备注
-                                 可否为空
-ClassId
-GUID (string)
-GUI班级ID
-否
-ClassNo
-班级编号(string)
-
-否
-ClassName
-班级名称(string)
-
-否
-DeptNo
-系部编号(string)
-
-
-MajorNo
-专业编号(string)
-
-
-Grade
-级别（18代表2018级，19表示2019级）(string)
-
-
-
-用户接口
-地址：http://部署地址/arrangelesson/alluser
-主要业务数据 其余字段可忽略
-                                    属性
-                                   返回值
-                                    备注
-                                 可否为空
-F_UserId
-GUID (string)
-GUI用户ID
-否
-ClassNo
-班级编号(string)
-
-
-F_CompanyId
-校区Id(string)
-
-
-F_Description
-用户类型(string)
-2教师，3学生
-
-F_RealName
-姓名(string)
-
-
-F_Account
-登录帐号(string)
-
-
-Year
-级别(string)
-2018代表2018年入学
-
-
-
-课程接口
-地址：http://部署地址/arrangelesson/alllesson
-主要业务数据 其余字段可忽略
-                                    属性
-                                   返回值
-                                    备注
-                                 可否为空
-LessonId
-GUID (string)
-GUI课程ID
-否
-LessonNo
-课程编号(string)
-
-否
-LessonName
-课程名称(string)
-
-否
-LessonSortNo
-课程类型(string)
-1必修，2选修
-
-F_SchoolId
-校区Id(string)
-
-
-
-
-
-
-必修开课计划接口
-地址：http://部署地址/arrangelesson/allclasslesson
-所需参数：AcademicYearNo=19-20&Semester=1
-参数名称
-值
-备注
-AcademicYearNo
-19-20
-代表学年19-20、18-19等
-Semester
-1、2
-学期1、2
-主要业务数据 其余字段可忽略
-                                    属性
-                                   返回值
-                                    备注
-                                 可否为空
-F_SchoolId
-校区Id(string)
-
-
-DeptNo
-系部编号(string)
-
-
-MajorNo
-专业编号(string)
-
-
-LessonNo
-课程编号(string)
-
-
-LessonName
-课程名称(string)
-
-
-EmpNo
-代课老师编号(string)
-
-
-EmpName
-代课老师姓名(string)
-
-
-TeachClassNo
-班级编号(string)
-
-
-ClassRoomNo
-教室编号(string)
-
-
-LessonTime
-上课节次(string)
-11代表星期一第一节，12星期一第二节
-
-
-学生选修选课接口
-地址：http://部署地址/arrangelesson/allelelectivelesson
-所需参数：AcademicYearNo=19-20&Semester=1
-参数名称
-值
-备注
-AcademicYearNo
-19-20
-代表学年19-20、18-19等
-Semester
-1、2
-学期1、2
-
-主要业务数据 其余字段可忽略
-                                    属性
-                                   返回值
-                                    备注
-                                 可否为空
-StuNo
-学号(string)
-
-
-LessonNo
-课程编号(string)
-
-
-EmpNo
-代课老师编号(string)
-
-
-ClassRoomNo
-教室编号(string)
-
-
-LessonSection
-上课节次(string)
-37,38代表星期3第七节、第八节上课
-
-LessonTime
-上课时间(string)
-16:20-17:05,17:15-18:00 两节课的时间
-
-
-

Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园基础信息接口V2.0.docx

@@ -0,0 +1,480 @@
+
+
+数字化智慧校园
+
+
+
+基础信息接口
+
+
+
+V2.0
+
+接口服务器：
+学校服务器，部署地址：http://127.0.0.1:9002/
+
+
+调用方式：
+标准http get请求，数据接口需要在header中传参 token，否则无数据返回。
+返回数据类型：
+标准json
+返回数据结构
+主要关心code和data即可
+
+                                    属性
+                                   返回值
+                                    备注
+code
+200(int)
+200成功 其余失败
+info
+响应成功(string)
+状态描述
+data
+业务数据(object)
+业务数据
+
+获取TOKEN
+地址：http://部署地址/arrangelesson/gettoken?sysid=1   sysid向管理员获取
+                                    属性
+                                   返回值
+                                    备注
+code
+200(int)
+200成功 其余失败
+info
+响应成功(string)
+状态描述
+data
+业务数据(object)
+业务数据
+
+
+部门接口
+地址：http://部署地址/arrangelesson/department
+主要业务数据 其余字段可忽略
+                                    属性
+                                   返回值
+                                    备注
+                                 可否为空
+F_DepartmentId
+GUID (string)
+GUID部门ID
+否
+F_ParentId
+上级部门ID(string)
+-1和0均代表根
+否
+F_EnCode
+部门编号(string)
+部门编号
+否
+F_FullName
+部门全称(string)
+
+否
+F_ShortName
+部门简称(string)
+
+
+F_Manager
+负责人(string)
+
+
+F_OuterPhone
+电话(string)
+
+
+
+教师信息接口
+地址：http://部署地址/arrangelesson/allteacher
+主要业务数据 其余字段可忽略
+                                    属性
+                                   返回值
+                                    备注
+                                 可否为空
+EmpId
+GUID (string)
+GUID教师ID
+否
+EmpNo
+教职工编号(string)
+
+否
+EmpName
+职工姓名(string)
+
+否
+GenderNo
+性别(bool)
+true男false女
+
+Birthday
+生日(datetime)
+
+
+F_DepartmentId
+部门ID(string)
+
+
+mobile
+电话(string)
+
+
+
+
+学生信息接口
+地址：http://部署地址/arrangelesson/allstudent
+主要业务数据 其余字段可忽略
+                                    属性
+                                   返回值
+                                    备注
+                                 可否为空
+StuId
+GUID (string)
+GUID学生ID
+否
+StuNo
+学生编号(string)
+
+否
+StuName
+姓名(string)
+
+否
+ksh
+考生号(string)
+
+
+GenderNo
+性别(bool)
+true男false女
+
+Birthday
+生日(datetime)
+
+
+mobile
+电话(string)
+
+
+IdentityCardNo
+身份证号(string)
+
+
+DeptNo
+系部编号(string)
+
+
+MajorNo
+专业编号(string)
+
+
+Grade
+级别（18代表2018级，19表示2019级）(string)
+
+
+ClassNo
+班级编号(string)
+
+
+
+系部接口
+地址：http://部署地址/arrangelesson/alldept
+主要业务数据 其余字段可忽略
+                                    属性
+                                   返回值
+                                    备注
+                                 可否为空
+DeptId
+GUID (string)
+GUID系部ID
+否
+DeptNo
+系部编号(string)
+
+否
+DeptName
+系部名称(string)
+
+否
+
+专业接口
+地址：http://部署地址/arrangelesson/allmajor
+主要业务数据 其余字段可忽略
+                                    属性
+                                   返回值
+                                    备注
+                                 可否为空
+ID
+GUID (string)
+GUID专业ID
+否
+MajorNo
+专业编号(string)
+
+否
+MajorName
+专业名称(string)
+
+否
+DeptNo
+系部编号(string)
+
+
+校区接口
+地址：http://部署地址/arrangelesson/allschool
+主要业务数据 其余字段可忽略
+                                    属性
+                                   返回值
+                                    备注
+                                 可否为空
+F_CompanyId
+GUID (string)
+GUID校区ID
+否
+F_FullName
+校区名称(string)
+
+否
+
+班级接口
+地址：http://部署地址/arrangelesson/allclass
+主要业务数据 其余字段可忽略
+                                    属性
+                                   返回值
+                                    备注
+                                 可否为空
+ClassId
+GUID (string)
+GUI班级ID
+否
+ClassNo
+班级编号(string)
+
+否
+ClassName
+班级名称(string)
+
+否
+DeptNo
+系部编号(string)
+
+
+MajorNo
+专业编号(string)
+
+
+Grade
+级别（18代表2018级，19表示2019级）(string)
+
+
+
+用户接口
+地址：http://部署地址/arrangelesson/alluser
+主要业务数据 其余字段可忽略
+                                    属性
+                                   返回值
+                                    备注
+                                 可否为空
+F_UserId
+GUID (string)
+GUI用户ID
+否
+ClassNo
+班级编号(string)
+
+
+F_CompanyId
+校区Id(string)
+
+
+F_Description
+用户类型(string)
+2教师，3学生
+
+F_RealName
+姓名(string)
+
+
+F_Account
+登录帐号(string)
+
+
+Year
+级别(string)
+2018代表2018年入学
+
+
+
+课程接口
+地址：http://部署地址/arrangelesson/alllesson
+主要业务数据 其余字段可忽略
+                                    属性
+                                   返回值
+                                    备注
+                                 可否为空
+LessonId
+GUID (string)
+GUI课程ID
+否
+LessonNo
+课程编号(string)
+
+否
+LessonName
+课程名称(string)
+
+否
+LessonSortNo
+课程类型(string)
+1必修，2选修
+
+F_SchoolId
+校区Id(string)
+
+
+
+
+
+
+必修开课计划接口
+地址：http://部署地址/arrangelesson/allclasslesson
+所需参数：AcademicYearNo=19-20&Semester=1
+参数名称
+值
+备注
+AcademicYearNo
+19-20
+代表学年19-20、18-19等
+Semester
+1、2
+学期1、2
+主要业务数据 其余字段可忽略
+                                    属性
+                                   返回值
+                                    备注
+                                 可否为空
+F_SchoolId
+校区Id(string)
+
+
+DeptNo
+系部编号(string)
+
+
+MajorNo
+专业编号(string)
+
+
+LessonNo
+课程编号(string)
+
+
+LessonName
+课程名称(string)
+
+
+EmpNo
+代课老师编号(string)
+
+
+EmpName
+代课老师姓名(string)
+
+
+TeachClassNo
+班级编号(string)
+
+
+ClassRoomNo
+教室编号(string)
+
+
+LessonTime
+上课节次(string)
+11代表星期一第一节，12星期一第二节
+
+
+学生选修选课接口
+地址：http://部署地址/arrangelesson/allelelectivelesson
+所需参数：AcademicYearNo=19-20&Semester=1
+参数名称
+值
+备注
+AcademicYearNo
+19-20
+代表学年19-20、18-19等
+Semester
+1、2
+学期1、2
+
+主要业务数据 其余字段可忽略
+                                    属性
+                                   返回值
+                                    备注
+                                 可否为空
+StuNo
+学号(string)
+
+
+LessonNo
+课程编号(string)
+
+
+EmpNo
+代课老师编号(string)
+
+
+ClassRoomNo
+教室编号(string)
+
+
+LessonSection
+上课节次(string)
+37,38代表星期3第七节、第八节上课
+
+LessonTime
+上课时间(string)
+16:20-17:05,17:15-18:00 两节课的时间
+
+
+根据身份证号更新照片接口
+标准http post请求
+地址：
+http://部署地址/EducationalAdministration/EmpRegister/updatePhotoByIdCard
+所需参数：（限制一次最多传值50条）
+
+参数名称
+值
+备注
+IdCard
+
+身份证号
+PhotoUrl
+
+照片地址
+IdentityFlag
+1、2
+身份标识（1老师，2学生）
+
+主要业务数据 其余字段可忽略
+                                    属性
+                                   返回值
+                                    备注
+                                 可否为空
+IdCard
+
+身份证号
+
+OperateFlag
+true , false
+操作标识（true更新成功，false更新失败）
+
+FailMsg
+
+更新失败原因
+
+
+
+

Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园统一身份认证补充接口说明V1.0.docx

@@ -0,0 +1,69 @@
+
+
+数字化智慧校园
+
+
+
+
+
+统一身份认证补充接口
+
+
+
+
+
+
+V1.0
+
+
+
+
+
+
+概述
+  根据特定需求开发补充接口
+登录接口
+	采用标准Http GET 请求发送用户名、密码到认证接口，接口实现用户名密码判定后返回标准json；
+
+请求地址：http://112.45.152.8:8000/Login/CheckLoginForSSOBC
+请求方式：发送标准Http GET请求到认证地址
+
+接口请求参数
+                                    参数
+                                    说明
+u
+用户名
+p
+密码
+
+认证接口返回参数
+                                    参数
+                                    说明
+code
+状态码 返回200成功、其他失败
+info
+状态消息 返回login success表示登录成功、其他失败
+data
+保留 暂时无用
+
+登录成功后，认证服务器将在用户浏览器cookies中写入数字化智慧校园系统数据，第三方系统可直接跳转到http://112.45.152.8:8000/Home/Index 进入数字化智慧校园系统。
+
+退出登录接口
+  第三方系统退出时，需要主动调用退出登录接口以同步数字化智慧校园系统退出状态。
+  采用标准Http POST 请求，返回标准json；
+
+请求地址：http://112.45.152.8:8000/Login/OutLoginForSSOBC
+请求方式：发送标准Http POST请求到认证地址
+
+接口请求参数：无
+
+认证接口返回参数
+                                    参数
+                                    说明
+code
+状态码 返回200成功、其他失败
+info
+状态消息 返回logout success表示退出成功、其他失败
+data
+保留 暂时无用
+

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js

@@ -1,15 +1,15 @@
-var config = {
-    webapi: 'http://localhost:8088/',
-    web: "http://localhost:8087/"//web地址，用于配置logo
-};
-//var config = {
+// var config = {
+//     webapi: 'http://localhost:8080/',
+//     web: "http://localhost:8082/"//web地址，用于配置logo
+// };
+// var config = {
 //    webapi: 'http://112.230.201.53:31173/',
 //    web:"http://112.230.201.53/:8081/"//web地址，用于配置logo
-//};
-//var config = {
-//    webapi: 'http://localhost:31173/',
-//    web: "http://localhost:20472/"//web地址，用于配置logo
-//}; 
+// };
+var config = {
+   webapi: 'http://10.30.0.10:9002/',
+   web: "http://10.30.0.10:8000/"//web地址，用于配置logo
+}; 
 
 
 //var config = {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/data/city.js

@@ -1,4 +1,4 @@
-var cityData = [{
+var cityData = [{
 	value: '110000',
 	text: '北京市',
 	children: [{
@@ -7242,7 +7242,11 @@
 		}]
 	}, {
 		value: "441900",
-		text: "东莞市"
+		text: "东莞市",
+		children: [{
+			value: "441901",
+			text: "市辖区"
+		}]
 	}, {
 		value: "442000",
 		text: "中山市"

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/AskPaper/AskPaper.js

@@ -92,7 +92,7 @@
 					return
 				}
 				// return
-				learun.httpget(path + "/learun/ask/savepaper",
+				learun.httppost(path + "/learun/ask/savepaper",
 				   {
 				       VID: param.VID,
 				       LessonNo: param.LessonNo,

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/ArrangeExamTerm/ArrangeExamTerm.html

@@ -0,0 +1,8 @@
+<div class="lr-page lr-ArrangeExamTermNew-page"> 
+    <div class="lr-page-tool"> 
+        <div class="lr-tool-left"> 
+            总共<span class="lr-badge lr-badge-primary">0</span>条 
+        </div> 
+    </div> 
+    <div class="lr-page-content" id="lr_list"></div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/ArrangeExamTerm/ArrangeExamTerm.js

@@ -0,0 +1,74 @@
+(function() {
+	var multipleData = null;
+	var page = {
+		grid: null,
+		init: function($page) {
+			page.grid = $page.find('#lr_list').lrpagination({
+				lclass: page.lclass,
+				rows: 10, // 每页行数 
+				getData: function(param, callback) { // 获取数据 param 分页参数,callback 异步回调 
+					param.multipleData = multipleData;
+					page.loadData(param, callback, $page);
+				},
+				renderData: function(_index, _item, _$item) { // 渲染数据模板 
+					return page.rowRender(_index, _item, _$item, $page);
+				},
+			});
+		},
+		lclass: 'lr-list',
+		loadData: function(param, callback, $page) { // 列表加载后台数据 
+			var _postParam = {
+				pagination: {
+					rows: param.rows,
+					page: param.page,
+					sidx: 'ExamDate,ExamTime,LessonNo,EmpNo,ClassRoomName,SitNumber',
+					sord: 'asc',
+				},
+				queryJson: '{}'
+			};
+			if (param.multipleData) {
+				_postParam.queryJson = JSON.stringify(multipleData);
+			}
+
+			var baseUser = JSON.parse(localStorage.userinfo);
+			_postParam.queryJson = JSON.stringify({ StuNo: baseUser.baseinfo.account });
+			learun.httpget(config.webapi + '/learun/ask/teststulist', _postParam, (data) => {
+				$page.find('.lr-badge').text('0');
+				if (data) {
+					$page.find('.lr-badge').text(data.records);
+					callback(data.rows, parseInt(data.records));
+				} else {
+					callback([], 2);
+				}
+			});
+		},
+		rowRender: function(_index, _item, _$item, $page) { // 渲染列表行数据 
+			_$item.addClass('lr-list-item lr-list-item-multi');
+			_$item.append($('<p class="lr-ellipsis"><span>考试日期:</span></p>').dataFormatter({
+				value: _item.ExamDate,
+                type: 'datetime',
+                dateformat: 'yyyy-MM-dd'
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>考试时间:</span></p>').dataFormatter({
+				value: _item.ExamTime
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>课程编号:</span></p>').dataFormatter({
+				value: _item.LessonNo
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>课程名称:</span></p>').dataFormatter({
+				value: _item.LessonName
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>监考老师:</span></p>').dataFormatter({
+				value: _item.EmpName
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>教室名称:</span></p>').dataFormatter({
+				value: _item.ClassRoomName
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>座位编号:</span></p>').dataFormatter({
+				value: _item.SitNumber
+			}));
+			return '';
+		},
+	};
+	return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNew.html

@@ -0,0 +1,8 @@
+<div class="lr-page lr-ArrangeExamTermNew-page"> 
+    <div class="lr-page-tool"> 
+        <div class="lr-tool-left"> 
+            总共<span class="lr-badge lr-badge-primary">0</span>条 
+        </div> 
+    </div> 
+    <div class="lr-page-content" id="lr_ArrangeExamTerm_list"></div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNew.js

@@ -0,0 +1,68 @@
+(function() {
+	var multipleData = null;
+	var page = {
+		grid: null,
+		init: function($page) {
+			page.grid = $page.find('#lr_ArrangeExamTerm_list').lrpagination({
+				lclass: page.lclass,
+				rows: 10, // 每页行数 
+				getData: function(param, callback) { // 获取数据 param 分页参数,callback 异步回调 
+					param.multipleData = multipleData;
+					page.loadData(param, callback, $page);
+				},
+				renderData: function(_index, _item, _$item) { // 渲染数据模板 
+					return page.rowRender(_index, _item, _$item, $page);
+				},
+			});
+		},
+		lclass: 'lr-list',
+		loadData: function(param, callback, $page) { // 列表加载后台数据 
+			var _postParam = {
+				pagination: {
+					rows: param.rows,
+					page: param.page,
+					sidx: 'ExamDate,ExamTime,LessonNo,ClassRoomName',
+					sord: 'asc',
+				},
+				queryJson: '{}'
+			};
+			if (param.multipleData) {
+				_postParam.queryJson = JSON.stringify(multipleData);
+			}
+
+			var baseUser = JSON.parse(localStorage.userinfo);
+			_postParam.queryJson = JSON.stringify({ EmpNo: baseUser.baseinfo.account });
+			learun.httpget(config.webapi + '/learun/ask/testlist', _postParam, (data) => {
+				$page.find('.lr-badge').text('0');
+				if (data) {
+					$page.find('.lr-badge').text(data.records);
+					callback(data.rows, parseInt(data.records));
+				} else {
+					callback([], 2);
+				}
+			});
+		},
+		rowRender: function(_index, _item, _$item, $page) { // 渲染列表行数据 
+			_$item.addClass('lr-list-item lr-list-item-multi');
+			_$item.append($('<p class="lr-ellipsis"><span>考试日期:</span></p>').dataFormatter({
+				value: _item.ExamDate,
+                type: 'datetime',
+                dateformat: 'yyyy-MM-dd'
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>考试时间:</span></p>').dataFormatter({
+				value: _item.ExamTime
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>课程编号:</span></p>').dataFormatter({
+				value: _item.LessonNo
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>课程名称:</span></p>').dataFormatter({
+				value: _item.LessonName
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>教室名称:</span></p>').dataFormatter({
+				value: _item.ClassRoomName
+			}));
+			return '';
+		},
+	};
+	return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html

@@ -1,4 +1,4 @@
-<div class="lr-form-container">
+<div class="lr-form-container">
     <!--<div class="lr-form-row  " data-table="StuInfoBasic">
 
         <label>出生日期</label>
@@ -29,6 +29,22 @@
         <label>联系电话</label>
         <input id="mobile" type="text" />
     </div>
+	
+	<div class="lr-form-row  " data-table="StuInfoBasic">
+	
+	    <label>开户银行</label>
+	    <div id="DepositBank"></div>
+	</div>
+	<div class="lr-form-row  " data-table="StuInfoBasic">
+	
+	    <label>银行卡账号</label>
+	    <input id="BankCard" type="text" />
+	</div>
+	<div class="lr-form-row  " data-table="StuInfoBasic">
+	
+	    <label>开户行位置</label>
+	    <input id="BankLocation" type="text" />
+	</div>
     <div class="lr-form-row  " data-table="StuInfoBasic">
 
         <label>邮箱地址</label>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.js

@@ -1,193 +1,208 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)  
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)  
  * Copyright (c) 2013-2018 北京泉江科技有限公司  
  * 创建人：超级管理员 
  * 日  期：2020-01-19 10:46 
  * 描  述：学生信息 
  */
-(function () {
-    var keyValue = '';
-    var $header = null;
-    var titleText = '';
-    var page = {
-        isScroll: true,
-        init: function ($page, param) {
+(function() {
+	var keyValue = '';
+	var $header = null;
+	var titleText = '';
+	var page = {
+		isScroll: true,
+		init: function($page, param) {
 
-            var account = learun.storage.get('logininfo').account;
-            $.ajax({
-                type: 'POST',
-                url: config.webapi + '/Statistics/getStuInfo',
-                data: { 'account': account },
-                async: false,
-                success: function (msg) {
-                    if (msg.data) {
-                        keyValue = msg.data.StuId;
-                    } else {
-                        return false;
-                    }
-                }
-            });
-            //keyValue = param.keyValue;
-            // 添加头部按钮列表 
-            var _html = '\
+			var account = learun.storage.get('logininfo').account;
+			$.ajax({
+				type: 'POST',
+				url: config.webapi + '/Statistics/getStuInfo',
+				data: {
+					'account': account
+				},
+				async: false,
+				success: function(msg) {
+					if (msg.data) {
+						keyValue = msg.data.StuId;
+					} else {
+						return false;
+					}
+				}
+			});
+			//keyValue = param.keyValue;
+			// 添加头部按钮列表 
+			var _html = '\
                 <div class="lr-form-header-cancel" >取消</div>\
                 <div class="lr-form-header-btnlist" >\
                     <div class="lr-form-header-edit" ><i class="iconfont icon-edit" ></i></div>\
                 </div>\
                 <div class="lr-form-header-submit" >提交</div>';
-            $header = $page.parents('.f-page').find('.f-page-header');
-            $header.append(_html);
-            // 取消 
-            $header.find('.lr-form-header-cancel').on('tap', function () {
-                learun.layer.confirm('确定要退出当前编辑？', function (_index) {
-                    if (_index === '1') {
-                        if (keyValue) {// 如果是编辑状态 
-                            learun.formblur();
-                            $header.find('.lr-form-header-cancel').hide();
-                            $header.find('.lr-form-header-submit').hide();
-                            $header.find('.lr-form-header-btnlist').show();
-                            $header.find('.f-page-title').text(titleText);
-                            $page.find('.lr-form-container').setFormRead();
-                        }
-                        else {// 如果是新增状态 关闭当前页面 
-                            learun.nav.closeCurrent();
-                        }
-                    }
-                }, '智慧校园提示', ['取消', '确定']);
-            });
-            // 编辑 
-            $header.find('.lr-form-header-edit').on('tap', function () {
-                $header.find('.lr-form-header-btnlist').hide();
-                $header.find('.lr-form-header-cancel').show();
-                $header.find('.lr-form-header-submit').show();
-                titleText = $header.find('.f-page-title').text();
-                $header.find('.f-page-title').text('编辑');
-                $page.find('.lr-form-container').setFormWrite();
-            });
-            // 更多 
-            $header.find('.lr-form-header-more').on('tap', function () {
-                learun.actionsheet({
-                    id: 'more',
-                    data: [
-                        {
-                            text: '删除',
-                            mark: true,
-                            event: function () {// 删除当前条信息 
-                                learun.layer.confirm('确定要删除该笔数据吗？', function (_index) {
-                                    if (_index === '1') {
-                                        learun.layer.loading(true, '正在删除该笔数据');
-                                        learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/StuInfoBasic/delete', keyValue, (data) => {
-                                            learun.layer.loading(false);
-                                            if (data) {// 删除数据成功 
-                                                learun.nav.closeCurrent();
-                                                var prepage = learun.nav.getpage('EducationalAdministration/StuInfoBasic');
-                                                prepage.grid.reload();
-                                            }
-                                        });
-                                    }
-                                }, '智慧校园提示', ['取消', '确定']);
-                            }
-                        }
-                    ],
-                    cancel: function () {
-                    }
-                });
-            });
-            // 提交 
-            $header.find('.lr-form-header-submit').on('tap', function () {
-                // 获取表单数据 
-                if (!$page.find('.lr-form-container').lrformValid()) {
-                    return false;
-                }
-                var _postData = {}
-                _postData.keyValue = keyValue;
-                _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
-                learun.layer.loading(true, '正在提交数据');
-                learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/StuInfoBasic/save', _postData, (data) => {
-                    learun.layer.loading(false);
-                    if (data) {// 表单数据保存成功 
-                        if (keyValue) {
-                            learun.layer.toast('保存数据成功!');
-                            learun.formblur();
-                            $header.find('.lr-form-header-cancel').hide();
-                            $header.find('.lr-form-header-submit').hide();
-                            $header.find('.lr-form-header-btnlist').show();
-                            $header.find('.f-page-title').text(titleText);
-                            $page.find('.lr-form-container').setFormRead();
-                        }
-                        else {// 如果是 
-                            learun.nav.closeCurrent();
-                        }
-                        learun.nav.closeCurrent();
-                    }
-                });
-            });
+			$header = $page.parents('.f-page').find('.f-page-header');
+			$header.append(_html);
+			// 取消 
+			$header.find('.lr-form-header-cancel').on('tap', function() {
+				learun.layer.confirm('确定要退出当前编辑？', function(_index) {
+					if (_index === '1') {
+						if (keyValue) { // 如果是编辑状态 
+							learun.formblur();
+							$header.find('.lr-form-header-cancel').hide();
+							$header.find('.lr-form-header-submit').hide();
+							$header.find('.lr-form-header-btnlist').show();
+							$header.find('.f-page-title').text(titleText);
+							$page.find('.lr-form-container').setFormRead();
+						} else { // 如果是新增状态 关闭当前页面 
+							learun.nav.closeCurrent();
+						}
+					}
+				}, '智慧校园提示', ['取消', '确定']);
+			});
+			// 编辑 
+			$header.find('.lr-form-header-edit').on('tap', function() {
+				$header.find('.lr-form-header-btnlist').hide();
+				$header.find('.lr-form-header-cancel').show();
+				$header.find('.lr-form-header-submit').show();
+				titleText = $header.find('.f-page-title').text();
+				$header.find('.f-page-title').text('编辑');
+				$page.find('.lr-form-container').setFormWrite();
+			});
+			// 更多 
+			$header.find('.lr-form-header-more').on('tap', function() {
+				learun.actionsheet({
+					id: 'more',
+					data: [{
+						text: '删除',
+						mark: true,
+						event: function() { // 删除当前条信息 
+							learun.layer.confirm('确定要删除该笔数据吗？', function(
+								_index) {
+								if (_index === '1') {
+									learun.layer.loading(true,
+										'正在删除该笔数据');
+									learun.httppost(config.webapi +
+										'learun/adms/EducationalAdministration/StuInfoBasic/delete',
+										keyValue, (data) => {
+											learun.layer.loading(
+												false);
+											if (data) { // 删除数据成功 
+												learun.nav
+													.closeCurrent();
+												var prepage = learun
+													.nav.getpage(
+														'EducationalAdministration/StuInfoBasic'
+													);
+												prepage.grid
+													.reload();
+											}
+										});
+								}
+							}, '智慧校园提示', ['取消', '确定']);
+						}
+					}],
+					cancel: function() {}
+				});
+			});
+			// 提交 
+			$header.find('.lr-form-header-submit').on('tap', function() {
+				// 获取表单数据 
+				if (!$page.find('.lr-form-container').lrformValid()) {
+					return false;
+				}
+				var _postData = {}
+				_postData.keyValue = keyValue;
+				_postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
+				learun.layer.loading(true, '正在提交数据');
+				learun.httppost(config.webapi +
+					'learun/adms/EducationalAdministration/StuInfoBasic/save', _postData, (
+						data) => {
+						learun.layer.loading(false);
+						if (data) { // 表单数据保存成功 
+							if (keyValue) {
+								learun.layer.toast('保存数据成功!');
+								learun.formblur();
+								$header.find('.lr-form-header-cancel').hide();
+								$header.find('.lr-form-header-submit').hide();
+								$header.find('.lr-form-header-btnlist').show();
+								$header.find('.f-page-title').text(titleText);
+								$page.find('.lr-form-container').setFormRead();
+							} else { // 如果是 
+								learun.nav.closeCurrent();
+							}
+							learun.nav.closeCurrent();
+						}
+					});
+			});
 
-            page.bind($page, param);
-            if (keyValue) {
+			page.bind($page, param);
+			if (keyValue) {
 
-                // 添加编辑按钮 
-                $page.find('.lr-form-container').setFormRead();
-                $header.find('.lr-form-header-btnlist').show();
-                // 获取表单数据 
-                learun.layer.loading(true, '获取表单数据');
-                learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuInfoBasic/form', keyValue, (data) => {
-                    if (data) {
-                        for (var id in data) {
-                            if (data[id].length) {
-                                $page.find('#' + id).lrgridSet(data[id]);
-                            }
-                            else {
-                                $page.find('[data-table="' + id + '"]').lrformSet(data[id]);
-                            }
-                        }
-                    }
-                    learun.layer.loading(false);
-                });
-            }
-            else {
-                $header.find('.lr-form-header-cancel').show();
-                $header.find('.lr-form-header-submit').show();
-            }
-        },
-        bind: function ($page, param) {
-            //$page.find('#Birthday').lrdate({
-            //    type: 'date'
-            //});
-            //$page.find('#PartyFaceNo').lrpickerex({
-            //    code: 'BCdPartyFace',
-            //    type: 'sourceData',
-            //    ivalue: 'partyfaceno',
-            //    itext: 'partyface'
-            //});
-            //$page.find('#NationalityNo').lrpickerex({
-            //    code: 'National',
-            //    type: 'dataItem'
-            //});
-            $page.find('#ResidenceNo').lrpickerex({
-                code: 'ResidenceNo',
-                type: 'dataItem'
-            });
-            //$page.find('#Photo').imagepicker();
-            //$page.find('#FamilyOriginNo').lrpickerex({
-            //    type: 'sourceData',
-            //    code: 'BCdFamilyOrigin',
-            //    ivalue: 'familyoriginno',
-            //    itext: 'familyorigin'
-            //});
-            //$page.find('#OverseasChineseNo').lrpickerex({
-            //    type: 'sourceData',
-            //    code: 'BCdOverseasChinese',
-            //    ivalue: 'overseaschineseno',
-            //    itext: 'overseaschinesename'
-            //});
-            //$page.find('#GraduateNo').lrpickerex({
-            //    code: 'CollegeType',
-            //    type: 'dataItem'
-            //});
-        }, destroy: function (pageinfo) {
-            $header = null;
-            keyValue = '';
-        }
-    };
-    return page;
-})(); 
+				// 添加编辑按钮 
+				$page.find('.lr-form-container').setFormRead();
+				$header.find('.lr-form-header-btnlist').show();
+				// 获取表单数据 
+				learun.layer.loading(true, '获取表单数据');
+				learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuInfoBasic/form',
+					keyValue, (data) => {
+						if (data) {
+							for (var id in data) {
+								if (data[id].length) {
+									$page.find('#' + id).lrgridSet(data[id]);
+								} else {
+									$page.find('[data-table="' + id + '"]').lrformSet(data[id]);
+								}
+							}
+						}
+						learun.layer.loading(false);
+					});
+			} else {
+				$header.find('.lr-form-header-cancel').show();
+				$header.find('.lr-form-header-submit').show();
+			}
+		},
+		bind: function($page, param) {
+			//$page.find('#Birthday').lrdate({
+			//    type: 'date'
+			//});
+			//$page.find('#PartyFaceNo').lrpickerex({
+			//    code: 'BCdPartyFace',
+			//    type: 'sourceData',
+			//    ivalue: 'partyfaceno',
+			//    itext: 'partyface'
+			//});
+			$page.find('#NationalityNo').lrpickerex({
+			   code: 'National',
+			   type: 'dataItem'
+			});
+			// $page.find('#ResidenceNo').lrpickerex({
+			// 	code: 'ResidenceNo',
+			// 	type: 'dataItem',
+
+			// });
+			$page.find('#DepositBank').lrpickerex({
+				code: 'DepositBank',
+				type: 'dataItem'
+			});
+
+			//$page.find('#Photo').imagepicker();
+			//$page.find('#FamilyOriginNo').lrpickerex({
+			//    type: 'sourceData',
+			//    code: 'BCdFamilyOrigin',
+			//    ivalue: 'familyoriginno',
+			//    itext: 'familyorigin'
+			//});
+			//$page.find('#OverseasChineseNo').lrpickerex({
+			//    type: 'sourceData',
+			//    code: 'BCdOverseasChinese',
+			//    ivalue: 'overseaschineseno',
+			//    itext: 'overseaschinesename'
+			//});
+			//$page.find('#GraduateNo').lrpickerex({
+			//    code: 'CollegeType',
+			//    type: 'dataItem'
+			//});
+		},
+		destroy: function(pageinfo) {
+			$header = null;
+			keyValue = '';
+		}
+	};
+	return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html

@@ -17,11 +17,13 @@
                 <div><span>专业</span><strong></strong></div>
                 <div><span>班级</span><strong></strong></div>
                 <div><span>教室</span><strong></strong></div>
+				<div><span>学号</span><strong></strong></div>
+				<div><span>寝室号</span><strong></strong></div>
             </div>
-			<div class="sQrText">
+			<!-- <div class="sQrText">
 				<div>班主任姓名 <span></span></div>
 				<div>班主任电话 <span></span></div>
-			</div>
+			</div> -->
 			<div class="sQrText">
 				<div>辅导员姓名 <span></span></div>
 				<div>辅导员电话 <span></span></div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js

@@ -12,6 +12,10 @@
             learun.layer.loading(true, '获取数据中');
             learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
                 if (data) {
+					//辅导员
+                    $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : "");
+                    $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassTutorMobile);
+					
                     //判断是否显示报到二维码：未确认报到，且已完善信息，且缴费三有一；
                     var entity = data["StuInfoFreshEntity"];
                     if (entity.RegisterStatus == "1") {
@@ -29,11 +33,14 @@
                         return false;
                     }
                     if (entity.PayFeeStatus != "1" && entity.StudentLoanStatus != "1" && entity.OnsitePayFeeStatus != "1") {
-                        learun.layer.loading(false);
-                        learun.layer.confirm('新生未缴费，无法报到！', function (_index) {
-                            learun.nav.closeCurrent();
-                        }, '智慧校园提示', ['确定']);
-                        return false;
+						if(!entity.StudentLoanBLStatus)
+						{
+							learun.layer.loading(false);
+							learun.layer.confirm('新生未缴费且未设置贷款状态，无法报到！', function (_index) {
+							    learun.nav.closeCurrent();
+							}, '智慧校园提示', ['确定']);
+							return false;
+						}
                     }
 
                     //学生
@@ -42,12 +49,12 @@
                     $('.sQrList strong').eq(2).html(data.StuInfoFreshEntity.MajorNo);
                     $('.sQrList strong').eq(3).html(data.StuInfoFreshEntity.ClassNo);
                     $('.sQrList strong').eq(4).html(data.StuInfoFreshEntity.DefaultClassRoomName);
+					$('.sQrList strong').eq(5).html(data.StuInfoFreshEntity.StuNo);
+					$('.sQrList strong').eq(6).html(data.StuInfoFreshEntity.DormitoryName);
                     //班主任
-                    $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : "");
-                    $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile);
-                    //辅导员
-                    $('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : "");
-                    $('.sQrText span').eq(3).html(data.StuInfoFreshEntity.ClassTutorMobile);
+                    // $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : "");
+                    // $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile);
+
                     //二维码
                     learun.code.encode({ id: 'lr_mycode_qrcode', text: data.StuInfoFreshEntity.StuNo });
 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html

@@ -1,11 +1,16 @@
-<div class="welcome">
+<div class="welcome">
     
-    <div class="welBox">
-        <div class="welInput">
+    <div class="welBox2">
+        <!-- <div class="welInput">
             <span>贷款回执码</span>
             <input id="ID" type="hidden"/>
             <input id="StudentLoan" type="text" placeholder="请填写贷款回执码" value=""/>
-        </div>
+        </div> -->
+		<div class="welInput">
+			<span>办理贷款状态</span>
+			<input id="ID" type="hidden"/>
+			<div id="StudentLoanBLStatus"></div>
+		</div>
     </div>
     <div class="welLine"></div>
     

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js

@@ -1,4 +1,4 @@
-(function () {
+(function () {
     var page = {
         isScroll: false,
         init: function ($page) {
@@ -9,7 +9,8 @@
                     for (var id in data) {
                         if (id == "StuInfoFreshEntity") {
                             $page.find("#ID").val(data[id].ID);
-                            $page.find("#StudentLoan").val(data[id].StudentLoan);
+							$page.find("#StudentLoanBLStatus").lrpickerSet(data[id].StudentLoanBLStatus);
+                            //$page.find("#StudentLoan").val(data[id].StudentLoan);
                             if (data[id].StudentLoanStatus == "1") {
                                 learun.layer.loading(false);
                                 learun.layer.confirm('新生助学贷款已审核！', function (_index) {
@@ -28,17 +29,23 @@
             $page.find('#saveBtn').on('tap', function () {
                 var postdata = {
                     ID: $('#ID').val(),
-                    StudentLoan: $('#StudentLoan').val(),
-                    StudentLoanStatus: "0"
+                    // StudentLoan: $('#StudentLoan').val(),
+					StudentLoan: '',
+                    StudentLoanStatus: "0",
+					StudentLoanBLStatus:$("#StudentLoanBLStatus").lrpickerGet()
                 };
-                if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) {
-                    postdata.StudentLoanStatus = "1";
-                }
+                // if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) {
+                //     postdata.StudentLoanStatus = "1";
+                // }
+				if ($('#StudentLoanBLStatus').lrpickerGet().trim() != null && $('#StudentLoanBLStatus').lrpickerGet().trim() != "" && $('#StudentLoanBLStatus').lrpickerGet().trim() != undefined) {
+				    postdata.StudentLoanBLStatus = "2";
+				}
                 learun.httpget(config.webapi + "StuInfoFresh/saveLoan", postdata, (data) => {
                     if (data) {
                         learun.layer.toast('保存成功');
                         setTimeout(function () {
                             learun.nav.closeCurrent();
+							learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: '生成报到二维码', isBack: true, isHead: true, param: {}, type: 'right' });
                         }, 2000);
                     }
                 });
@@ -47,7 +54,11 @@
 
         },
         bind: function ($page) {
-
+			$page.find('#StudentLoanBLStatus').lrpickerex({
+			    code: 'StudentLoanBLStatus', 
+			    type:'dataItem'
+			}); 
+			
         }
     };
 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/EpidemicSituationCopy.js

@@ -1,4 +1,4 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
  * Copyright (c) 2013-2018 北京泉江科技有限公司 
  * 创建人：超级管理员
  * 日  期：2020-02-03 14:37
@@ -48,7 +48,7 @@
                 code: 'EUserType'
             });
             $page.find('#lr_PersonnelManagementEpidemicSituation_btn').on('tap', function () {
-                learun.nav.go({ path: 'PersonnelManagement/EpidemicSituationCopy/form', title: '新增', type: 'right' });
+                learun.nav.go({ path: 'PersonnelManagement/EpidemicSituationCopy/form', title: '每日疫情打卡', type: 'right' });
             });
         },
         lclass: 'lr-list',
@@ -57,7 +57,7 @@
                 pagination: {
                     rows: param.rows,
                     page: param.page,
-                    sidx: 'ID',
+                    sidx: 'CreateTime',
                     sord: 'DESC'
                 },
                 queryJson: '{}'

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.html

@@ -1,4 +1,4 @@
-<div class="lr-form-container">
+<div class="lr-form-container">
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>填报人员</label>
@@ -7,22 +7,22 @@
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>填报时间</label>
-        <div id="CreateTime"></div>
+        <div id="CreateTime" readonly="readonly"></div>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>类别</label>
-        <div id="Type"></div>
+        <div id="Type" readonly="readonly"></div>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>所在部门</label>
-        <div id="Department"></div>
+        <div id="Department" readonly="readonly"></div>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>所在班级</label>
-        <input id="StudentSource" type="text" />
+        <input id="StudentSource" type="text" readonly="readonly"/>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
@@ -32,18 +32,18 @@
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>性别</label>
-        <div id="Gender"></div>
+        <div id="Gender" readonly="readonly"></div>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>家庭住址</label>
-        <input id="HomeAddress" type="text" />
+        <input id="HomeAddress" type="text" readonly="readonly"/>
         <div id="allmap" style="display: none;"></div>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>联系方式</label>
-        <input id="Mobile" type="text" />
+        <input id="Mobile" type="text" readonly="readonly"/>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
@@ -51,7 +51,7 @@
         <input id="Objective" type="text" />
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
-        <label>*是否外出</label>
+        <label>*外出旅居</label>
         <div id="IsOut"></div>
     </div>
     <div class="lr-form-row" id="PassPlaces"></div>
@@ -61,7 +61,7 @@
     </div>
     <div class="lr-form-row" id="ContactsDetails"></div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
-        <label>*疫区人异常</label>
+        <label>*新冠病例接触</label>
         <div id="HasPeople"></div>
     </div>
     <div class="lr-form-row" id="PeopleDetails"></div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.js

@@ -1,4 +1,4 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
  * Copyright (c) 2013-2018 北京泉江科技有限公司 
  * 创建人：超级管理员
  * 日  期：2020-02-03 14:37
@@ -11,6 +11,7 @@
     var page = {
         isScroll: true,
         init: function ($page, param) {
+			learun.layer.loading(true, '正在加载...');
             keyValue = param.keyValue;
             // 添加头部按钮列表
             var _html = '\
@@ -363,6 +364,7 @@
                 $page.find('#Department').parent().show();
                 $page.find('#StudentSource').parent().hide();
             }
+			learun.layer.loading(false);
         }, destroy: function (pageinfo) {
             $header = null;
             keyValue = '';

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/AbNormalSerious/AbNormalSerious.css

@@ -0,0 +1,149 @@
+#sQrCode {
+	height: 100%;
+	background-color: #EEF2F3;
+	padding-bottom: 30px;
+}
+
+.sQrLogo {
+	background-image: url(images/xcBg.jpg);
+	background-size: 100% 100%;
+	text-align: center;
+	line-height: 0;
+	padding: 20px 0 70px;
+}
+
+.sQrLogoImg1 img {
+	width: 20%;
+}
+
+.sQrLogoImg1 {
+	margin-bottom: 10px;
+}
+
+.sQrLogoImg2 img {
+	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; */
+}
+
+.sQrT2 {
+	font-weight: bold;
+	text-align: center;
+	font-size: 24px;
+	margin-bottom: 20px;
+	color: #CC0000;
+}
+
+.sQrList {
+	background-color: #F8F8F8;
+	margin: 0 10px;
+	padding: 10px 30px;
+	border-radius: 4px
+}
+
+.sQrList div {
+	padding: 7px 10px;
+	font-size: 14px;
+	color: #000;
+	border-top: 1px solid #D7D7D7;
+}
+
+.sQrList div:first-child {
+	border: 0;
+}
+
+.sQrList div span {
+	color: #AEAEAE;
+	margin-right: 10px;
+}
+
+.sQrType3 {
+	background-color: #CC0000;
+	padding: 20px 0;
+	text-align: center;
+	color: #fff;
+	margin: 30px -38px -30px;
+	border-radius: 0 0 10px 10px;
+}
+
+.sQrType3>* {
+	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 img {
+	width: 100%;
+}
+
+.sQrTxt1 {
+	margin: 30px 50px 20px;
+	font-size: 14px;
+	color: #AEAEAE;
+}
+
+.sQrBtn2 {
+	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;
+}
+
+.sQrBtn2 img {
+	width: 23px;
+	margin-right: 10px;
+	position: relative;
+	top: 2px;
+}
+
+.sQrType3 .sQrTypePhoto {
+	border: 4px solid #CC0000;
+	border-radius: 4px;
+	width: 85px;
+	margin: -30px 10px -30px 0;
+	background: #fff;
+}
+
+.sQrTypePhoto div {
+	height: 0;
+	overflow: hidden;
+	padding-bottom: 139.516129%;
+	line-height: 0;
+}
+
+.sQrTypePhoto img {
+	width: 100%;
+}

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/AbNormalSerious/AbNormalSerious.html

@@ -0,0 +1,34 @@
+<div class="lr-form-container" id="sQrCode">
+    <div class="sQrCode">
+        <div class="sQrLogo">
+            <div class="sQrLogoImg1"><img src="images/logoXc.png" alt=""></div>
+            <div class="sQrLogoImg2"><img src="images/logoXcTxt.png" alt=""></div>
+        </div>
+        <div class="sQrBox">
+            <div class="sQrT2">禁止通行</div>
+            <div class="sQrList">
+                <div><span>姓名</span><strong>张某某</strong></div>
+                <div><span>专业</span><strong>>学前教育</strong></div>
+                <div><span>班级</span><strong>>18学教301</strong></div>
+                <div><span>学号</span><strong>>154236987215</strong></div>
+                <div><span>宿舍</span><strong>203</strong></div>
+            </div>
+            <div class="sQrType3">
+                <div class="sQrTypePhoto">
+                    <div><img src="" alt=""></div>
+                </div>
+                <div class="sQrTypeCon">
+                    <div class="sQrTypeT">健康信息 ： </div>
+                    <div class="sQrTypeTxt">异常</div>
+                </div>
+                <div class="sQrTypeImg">
+                    <img src="images/xcYz.png" alt="">
+                </div>
+            </div>
+        </div>
+        <div class="sQrTxt1">温馨提示 :  示:因疫情防控需要，校园实行封闭管理，仅限校内经许可的师生员工通行，敬请理解和配合。 </div>
+        <div class="sQrBtn2">
+            <img src="images/xcZc3.png" alt=""> 确认入校
+        </div>
+    </div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/AbNormalSerious/AbNormalSerious.js

@@ -0,0 +1,46 @@
+(function () {
+    var $header = null;
+    var stuNo = '';
+    var page = {
+        isScroll: true,
+        init: function ($page, param) {
+            stuNo = param.stuNo;
+            // 添加头部按钮列表 
+            $header = $page.parents('.f-page').find('.f-page-header');
+            learun.httpget(config.webapi + 'learun/EducationalAdministration/StuInfoBasic/stuinfoDetail',stuNo, function (data) {
+                console.log(data);
+                $('.sQrList div strong').eq(0).html(data.stuInfo.StuName);
+                $('.sQrList div strong').eq(1).html(data.majorInfo.MajorName);
+                $('.sQrList div strong').eq(2).html(data.classInfo.ClassName);
+                $('.sQrList div strong').eq(3).html(data.stuInfo.StuNo);
+                $('.sQrList div strong').eq(4).html(data.roomInfo);
+                //$('.sQrList div strong').eq(4).html(data.stuInfo.Photo); //学生照片
+                if (data.stuInfo.Photo != '') {
+                    $('.sQrTypePhoto img').attr('src', config.web + data.stuInfo.Photo);
+                } else {
+                    if (data.stuInfo.GenderNo) {
+
+                        $('.sQrTypePhoto img').attr('src', '/images/on-boy.jpg');
+                    } else {
+
+                        $('.sQrTypePhoto img').attr('src', '/images/on-girl.jpg');
+                    }
+                }
+                learun.code.encode({ id: 'lr_mycode_qrcode', text: data.stuInfo.StuNo });
+            }) 
+
+            page.bind($page, param);
+
+        },
+        bind: function ($page, param) {
+
+        }, destroy: function (pageinfo) {
+            $header = null;
+        }
+    };
+
+
+    return page;
+
+
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/AbNormalWeak/AbNormalWeak.css

@@ -0,0 +1,149 @@
+#sQrCode {
+	height: 100%;
+	background-color: #EEF2F3;
+	padding-bottom: 30px;
+}
+
+.sQrLogo {
+	background-image: url(images/xcBg.jpg);
+	background-size: 100% 100%;
+	text-align: center;
+	line-height: 0;
+	padding: 20px 0 70px;
+}
+
+.sQrLogoImg1 img {
+	width: 20%;
+}
+
+.sQrLogoImg1 {
+	margin-bottom: 10px;
+}
+
+.sQrLogoImg2 img {
+	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; */
+}
+
+.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 div {
+	padding: 7px 10px;
+	font-size: 14px;
+	color: #000;
+	border-top: 1px solid #D7D7D7;
+}
+
+.sQrList div:first-child {
+	border: 0;
+}
+
+.sQrList div span {
+	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 img {
+	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 img {
+	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 div {
+	height: 0;
+	overflow: hidden;
+	padding-bottom: 139.516129%;
+	line-height: 0;
+}
+
+.sQrTypePhoto img {
+	width: 100%;
+}

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/AbNormalWeak/AbNormalWeak.html

@@ -0,0 +1,34 @@
+<div class="lr-form-container" id="sQrCode">
+    <div class="sQrCode">
+        <div class="sQrLogo">
+            <div class="sQrLogoImg1"><img src="images/logoXc.png" alt=""></div>
+            <div class="sQrLogoImg2"><img src="images/logoXcTxt.png" alt=""></div>
+        </div>
+        <div class="sQrBox">
+            <div class="sQrT2">禁止通行</div>
+            <div class="sQrList">
+                <div><span>姓名</span><strong>张某某</strong></div>
+                <div><span>专业</span><strong>学前教育</strong></div>
+                <div><span>班级</span><strong>18学教301</strong></div>
+                <div><span>学号</span><strong>154236987215</strong></div>
+                <div><span>宿舍</span><strong>203</strong></div>
+            </div>
+            <div class="sQrType2">
+                <div class="sQrTypePhoto">
+                    <div><img src="" alt=""></div>
+                </div>
+                <div class="sQrTypeCon">
+                    <div class="sQrTypeT">健康信息 ： </div>
+                    <div class="sQrTypeTxt">异常</div>
+                </div>
+                <div class="sQrTypeImg">
+                    <img src="images/xcYc.png" alt="">
+                </div>
+            </div>
+        </div>
+        <div class="sQrTxt1">温馨提示 :  示:因疫情防控需要，校园实行封闭管理，仅限校内经许可的师生员工通行，敬请理解和配合。 </div>
+        <div class="sQrBtn3">
+            <img src="images/xcZc3.png" alt=""> 确认入校
+        </div>
+    </div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/AbNormalWeak/AbNormalWeak.js

@@ -0,0 +1,45 @@
+(function () {
+    var $header = null;
+    var stuNo = '';
+    var page = {
+        isScroll: true,
+        init: function ($page, param) {
+            stuNo = param.stuNo;
+            // 添加头部按钮列表 
+            $header = $page.parents('.f-page').find('.f-page-header');
+            learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuInfoBasic/stuinfoDetail',stuNo, function (data) {
+                console.log(data);
+                $('.sQrList div strong').eq(0).html(data.stuInfo.StuName);
+                $('.sQrList div strong').eq(1).html(data.majorInfo.MajorName);
+                $('.sQrList div strong').eq(2).html(data.classInfo.ClassName);
+                $('.sQrList div strong').eq(3).html(data.stuInfo.StuNo);
+                $('.sQrList div strong').eq(4).html(data.roomInfo);
+                //$('.sQrList div strong').eq(4).html(data.stuInfo.Photo); //学生照片
+                if (data.stuInfo.Photo != '') {
+                    $('.sQrTypePhoto img').attr('src', config.web + data.stuInfo.Photo);
+                } else {
+                    if (data.stuInfo.GenderNo) {
+                        $('.sQrTypePhoto img').attr('src', '/images/on-boy.jpg');
+                    } else {
+
+                        $('.sQrTypePhoto img').attr('src', '/images/on-girl.jpg');
+                    }
+                }
+                learun.code.encode({ id: 'lr_mycode_qrcode', text: data.stuInfo.StuNo });
+            }) 
+
+            page.bind($page, param);
+
+        },
+        bind: function ($page, param) {
+
+        }, destroy: function (pageinfo) {
+            $header = null;
+        }
+    };
+
+    return page;
+
+  
+
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/Normal/Normal.css

@@ -0,0 +1,149 @@
+#sQrCode {
+	height: 100%;
+	background-color: #EEF2F3;
+	padding-bottom: 30px;
+}
+
+.sQrLogo {
+	background-image: url(images/xcBg.jpg);
+	background-size: 100% 100%;
+	text-align: center;
+	line-height: 0;
+	padding: 20px 0 70px;
+}
+
+.sQrLogoImg1 img {
+	width: 20%;
+}
+
+.sQrLogoImg1 {
+	margin-bottom: 10px;
+}
+
+.sQrLogoImg2 img {
+	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; */
+}
+
+.sQrT2 {
+	font-weight: bold;
+	text-align: center;
+	font-size: 24px;
+	margin-bottom: 20px;
+	color: #21A737;
+}
+
+.sQrList {
+	background-color: #F8F8F8;
+	margin: 0 10px;
+	padding: 10px 30px;
+	border-radius: 4px
+}
+
+.sQrList div {
+	padding: 7px 10px;
+	font-size: 14px;
+	color: #000;
+	border-top: 1px solid #D7D7D7;
+}
+
+.sQrList div:first-child {
+	border: 0;
+}
+
+.sQrList div span {
+	color: #AEAEAE;
+	margin-right: 10px;
+}
+
+.sQrType1 {
+	background-color: #21A737;
+	padding: 20px 0;
+	text-align: center;
+	color: #fff;
+	margin: 30px -38px -30px;
+	border-radius: 0 0 10px 10px;
+}
+
+.sQrType1>* {
+	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 img {
+	width: 100%;
+}
+
+.sQrTxt1 {
+	margin: 30px 50px 20px;
+	font-size: 14px;
+	color: #AEAEAE;
+}
+
+.sQrBtn1 {
+	margin: 20px 20px 0;
+	background-color: #fff;
+	-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: #339933;
+	font-size: 16px;
+	text-align: center;
+}
+
+.sQrBtn1 img {
+	width: 23px;
+	margin-right: 10px;
+	position: relative;
+	top: 2px;
+}
+
+.sQrType1 .sQrTypePhoto {
+	border: 4px solid #21A737;
+	border-radius: 4px;
+	width: 85px;
+	margin: -30px 10px -30px 0;
+	background: #fff;
+}
+
+.sQrTypePhoto div {
+	height: 0;
+	overflow: hidden;
+	padding-bottom: 139.516129%;
+	line-height: 0;
+}
+
+.sQrTypePhoto img {
+	width: 100%;
+}

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/Normal/Normal.html

@@ -0,0 +1,34 @@
+<div class="lr-form-container" id="sQrCode">
+    <div class="sQrCode">
+        <div class="sQrLogo">
+            <div class="sQrLogoImg1"><img src="images/logoXc.png" alt=""></div>
+            <div class="sQrLogoImg2"><img src="images/logoXcTxt.png" alt=""></div>
+        </div>
+        <div class="sQrBox">
+            <div class="sQrT2">允许通行</div>
+            <div class="sQrList">
+                <div><span>姓名</span><strong>张某某</strong></div>
+                <div><span>专业</span><strong>学前教育</strong></div>
+                <div><span>班级</span><strong>18学教301</strong></div>
+                <div><span>学号</span><strong>154236987215</strong></div>
+                <div><span>宿舍</span><strong>203</strong></div>
+            </div>
+            <div class="sQrType1">
+                <div class="sQrTypePhoto">
+                    <div><img src="" alt=""></div>
+                </div>
+                <div class="sQrTypeCon">
+                    <div class="sQrTypeT">健康信息 ： </div>
+                    <div class="sQrTypeTxt">正常</div>
+                </div>
+                <div class="sQrTypeImg">
+                    <img src="images/xcZc.png" alt="">
+                </div>
+            </div>
+        </div>
+        <div class="sQrTxt1">温馨提示 :  示:因疫情防控需要，校园实行封闭管理，仅限校内经许可的师生员工通行，敬请理解和配合。 </div>
+        <div class="sQrBtn1">
+            <img src="images/xcZc2.png" alt=""> 确认入校
+        </div>
+    </div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/Normal/Normal.js

@@ -0,0 +1,70 @@
+(function () {
+    var $header = null;
+    var stuNo = '';
+    var page = {
+        isScroll: true,
+        init: function ($page, param) {
+            stuNo = param.stuNo;
+            // 添加头部按钮列表 
+            $header = $page.parents('.f-page').find('.f-page-header');
+
+            learun.httpget(config.webapi + 'learun/EducationalAdministration/StuInfoBasic/stuinfoDetail',stuNo, function (data) {
+                console.log(data);
+                $('.sQrList div strong').eq(0).html(data.stuInfo.StuName);
+                $('.sQrList div strong').eq(1).html(data.majorInfo.MajorName);
+                $('.sQrList div strong').eq(2).html(data.classInfo.ClassName);
+                $('.sQrList div strong').eq(3).html(data.stuInfo.StuNo);
+                $('.sQrList div strong').eq(4).html(data.roomInfo);
+				//$('.sQrList div strong').eq(4).html(data.stuInfo.Photo); //学生照片
+                if (data.stuInfo.Photo != '') {
+                    $('.sQrTypePhoto img').attr('src', config.web + data.stuInfo.Photo);
+                } else {
+                    if (data.stuInfo.GenderNo) {
+
+                        $('.sQrTypePhoto img').attr('src', '/images/on-boy.jpg');
+                    } else {
+
+                    $('.sQrTypePhoto img').attr('src', '/images/on-girl.jpg');
+                    }
+                }
+                learun.code.encode({ id: 'lr_mycode_qrcode', text: data.stuInfo.StuNo });
+            })
+
+            $page.find('.sQrBtn1').on('tap', function () {
+                var loginInfo = learun.storage.get('userinfo');
+                var buildEntity = {};
+                buildEntity.UId = loginInfo.baseinfo.userId;
+
+                buildEntity.SId = stuNo;//'2018010129';
+
+                var param = {};
+                param.keyValue = '';
+                param.strEntity = JSON.stringify(buildEntity);
+
+                learun.layer.loading(true, '正在提交数据');
+                learun.httppost(config.webapi + 'learun/EducationalAdministration/R_EnterSchool/save', param, (data) => {
+                    learun.layer.loading(false);
+                    if (data) {// 表单数据保存成功
+                        learun.layer.toast("添加成功");
+                        learun.nav.closeCurrent();
+                        var prepage = learun.nav.getpage('EducationalAdministration/R_EnterSchool');
+                        prepage.init();
+                    }
+                });
+            });
+
+            page.bind($page, param);
+
+        },
+        bind: function ($page, param) {
+
+        }, destroy: function (pageinfo) {
+            $header = null;
+        }
+    };
+
+    return page;
+
+
+
+})(); 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/StudentQRCode.css

@@ -0,0 +1,106 @@
+#sQrCode {
+    height: 100%;
+    background-color: #EEF2F3;
+    padding-bottom: 30px;
+}
+
+.sTabBox {
+    line-height: 24px;
+    text-align: center;
+    margin-bottom: 18px;
+    color: #333;
+}
+
+    .sTabBox div {
+        display: inline-block;
+        width: 80px;
+        background-color: rgba(255, 255, 255, .7);
+        margin: 0 5px;
+        font-size: 14px;
+        border-radius: 2px;
+    }
+
+.sQrLogo {
+    background-image: url(images/xcBg.jpg);
+    background-size: 100% 100%;
+    text-align: center;
+    line-height: 0;
+    padding: 20px 0 70px;
+}
+
+.sQrLogoImg1 img {
+    width: 20%;
+}
+
+.sQrLogoImg1 {
+    margin-bottom: 10px;
+}
+
+.sQrLogoImg2 img {
+    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);
+}
+
+.sQrT {
+    font-weight: bold;
+    text-align: center;
+    font-size: 22px;
+    margin-bottom: 20px;
+    color: #000;
+}
+
+.sQrList {
+    background-color: #F8F8F8;
+    margin: 0 10px;
+    padding: 10px 30px;
+    border-radius: 4px
+}
+
+    .sQrList div {
+        padding: 7px 10px;
+        font-size: 14px;
+        color: #000;
+        border-top: 1px solid #D7D7D7;
+    }
+
+        .sQrList div:first-child {
+            border: 0;
+        }
+
+        .sQrList div span {
+            color: #AEAEAE;
+            margin-right: 10px;
+        }
+
+.sQrImg {
+    width: 145px;
+    height: 145px;
+    line-height: 0;
+    margin: 20px auto;
+}
+
+    .sQrImg img {
+        width: 100%;
+    }
+
+.sQrTxt {
+    margin-bottom: 10px;
+    text-align: center;
+    font-size: 16px;
+    font-weight: bold;
+    color: #AEAEAE;
+}
+
+.sQrText {
+    font-size: 14px;
+    color: #AEAEAE;
+}

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/StudentQRCode.html

@@ -0,0 +1,22 @@
+<div class="lr-form-container" id="sQrCode">
+    <div class="sQrCode">
+        <div class="sQrLogo">
+            <div class="sQrLogoImg1"><img src="images/logoXc.png" alt=""></div>
+            <div class="sQrLogoImg2"><img src="images/logoXcTxt.png" alt=""></div>
+        </div>
+        <div class="sQrBox">
+            <div class="sQrT">健康通行登记</div>
+            <div class="sQrList">
+                <div><span>姓名</span><strong>张某某</strong></div>
+                <div><span>专业</span><strong>学前教育</strong></div>
+                <div><span>班级</span><strong>18学教301</strong></div>
+                <div><span>学号</span><strong>154236987215</strong></div>
+                <div><span>宿舍</span><strong>203</strong></div>
+            </div>
+            <div id="lr_mycode_qrcode" class="sQrImg">
+            </div>
+            <div class="sQrTxt">请使用数字校园扫码并出示通行凭证</div>
+            <div class="sQrText">温馨提示:因疫情防控需要，校园实行封闭管理，目前暂仅限经许可的校内师生员工通行。师生出入学校各个公共场所，请使用数字校园扫码，出示通行凭证接受核验。谢谢配合!</div>
+        </div>
+    </div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/StudentQRCode.js

@@ -0,0 +1,54 @@
+(function () {
+    var keyValue = '';
+    var $header = null;
+    var page = {
+        isScroll: true,
+        init: function ($page, param) {
+            keyValue = param.keyValue;
+            // 添加头部按钮列表 
+            $header = $page.parents('.f-page').find('.f-page-header');
+            // 取消 
+
+            $page.find('#aa').on('tap', function () {
+                learun.nav.go({ path: 'EducationalAdministration/StudentQRCode/Normal', title: '正常', type: 'right' });
+            });
+            $page.find('#bb').on('tap', function () {
+                learun.nav.go({ path: 'EducationalAdministration/StudentQRCode/AbNormalWeak', title: '异常微弱', type: 'right' });
+            });
+            $page.find('#cc').on('tap', function () {
+                learun.nav.go({ path: 'EducationalAdministration/StudentQRCode/AbNormalSerious', title: '异常严重', type: 'right' });
+            });
+
+            var logininfo = learun.storage.get('userinfo');
+            
+            //learun.httpget(config.webapi + 'learun/EducationalAdministration/StuInfoBasic/stuinfoDetail',logininfo.baseinfo.account, function (data) {
+            learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuInfoBasic/stuinfoDetail','2018010108', function (data) {
+               console.log(data);
+               $('.sQrList div strong').eq(0).html(data.stuInfo.StuName);
+               $('.sQrList div strong').eq(1).html(data.majorInfo.MajorName);
+               $('.sQrList div strong').eq(2).html(data.classInfo.ClassName);
+               $('.sQrList div strong').eq(3).html(data.stuInfo.StuNo);
+               $('.sQrList div strong').eq(4).html(data.roomInfo);
+               //$('.sQrList div strong').eq(4).html(data.stuInfo.Photo); //学生照片
+				
+               learun.code.encode({ id: 'lr_mycode_qrcode', text: data.stuInfo.StuNo });
+            })
+            //learun.code.encode({ id: 'lr_mycode_qrcode', text: '2019010211' });
+
+        },
+        bind: function ($page, param) {
+
+        }, destroy: function (pageinfo) {
+            $header = null;
+            keyValue = '';
+        }
+    };
+
+
+
+    //上传照片
+
+    return page;
+
+
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.css

@@ -0,0 +1,63 @@
+.lr-login-page {
+    position: relative;
+    height: 100%;
+    width: 100%;
+    background-color: #fff;
+}
+
+    .lr-login-page .login-content {
+        position: absolute;
+        width: 100%;
+        height: 280px;
+        top: 50%;
+        margin-top: -210px;
+        text-align: center;
+    }
+
+        .lr-login-page .login-content > img {
+            width: 60px;
+            height: 60px;
+            border-radius: 50%;
+            margin-bottom: 60px;
+        }
+
+    .lr-login-page .line {
+        position: relative;
+        margin: auto;
+        width: 92%;
+        height: 35px;
+        line-height: 35px;
+        border-bottom: 1px solid #eeeeee;
+        padding-left: 35px;
+    }
+
+        .lr-login-page .line i {
+            position: absolute;
+            left: 10px;
+            font-size: 18px;
+            color: #666;
+        }
+
+        .lr-login-page .line input {
+            position: relative;
+            line-height: 20px;
+            width: 100%;
+            background: transparent;
+            border: none;
+            font-size: 14px;
+        }
+
+    .lr-login-page button {
+        margin: auto;
+        margin-top: 25px;
+        width: 92%;
+    }
+
+    .lr-login-page .version {
+        position: absolute;
+        width: 100%;
+        bottom: 5px;
+        text-align: center;
+        font-size: 12px;
+        color: #ccc;
+    }

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.html

@@ -0,0 +1,17 @@
+<div class="lr-login-page">
+    <div class="login-content">
+        <img src="" />
+        <div class="line">
+            <i class="iconfont icon-friend_light"></i>
+            <input id="idcard" type="text" placeholder="学生身份证号">
+        </div>
+        <div class="line">
+            <i class="iconfont icon-lock"></i>
+            <input id="pwd" type="password" placeholder="新生身份证号码后8位">
+        </div>
+        <button id="loginBtn" type="button" class="lr-btn-primary lr-btn-block">
+            登录
+        </button>
+    </div>
+    <div class="version"></div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.js

@@ -0,0 +1,104 @@
+(function () {
+    var isBindAccountLogin = '';//切换账号登录
+    var bindUserName = '';//绑定账号
+    var bindUserPassword = '';//绑定账号密码
+
+    var page = {
+        headColor: '#ffffff',
+        init: function ($page, param) {
+            //切换账号登录时：登录页赋值，触发登录事件；
+            isBindAccountLogin = param.isBindAccountLogin;
+            bindUserName = param.bindUserName;
+            bindUserPassword = param.bindUserPassword;
+            if (isBindAccountLogin == 1) {
+                $page.find('#account').val(bindUserName);
+                $page.find('#password').val(bindUserPassword);
+                var timer = setTimeout(function () {
+                    $page.find('#loginBtn').trigger("tap");
+                    clearTimeout(timer);
+                }, 3000);
+            }
+
+            var path = config.webapi;
+            // learun.http.get(path + "Learun/adms/EducationalAdministration/EmpRegister/registerbutton",
+            //     {}, (res) => {
+            //         if (res.info == "True") {
+            //             var button = $page.find('#RegisterBtn');
+            //             button.show();
+            //         }
+            //     });
+            //获取ACIp
+            learun.http.get(path + "weixinapi/GetACIp",
+                {}, (res) => {
+                    learun.storage.set("Ip", res.data.Ip);
+                    learun.storage.set("ACIp", res.data.ACIp);
+                    learun.storage.set("ACIp2", res.data.ACIp2);
+                });
+            $page.find('img').attr('src', config.web + "Login/GetImg?code=applogo");
+            $page.find('#loginBtn').on('tap', function () {
+                var account = $('#idcard').val();
+                var password = $('#pwd').val();
+                var up = false;
+                if (account === "") {
+                    learun.layer.warning('身份证号不能为空！', function () { }, '提示', '关闭');
+                }else if(account.length<=8){
+                    learun.layer.warning('身份证号输入有误！', function () { }, '提示', '关闭');
+				} else if (password === "") {
+                    learun.layer.warning('密码不能为空！', function () { }, '提示', '关闭');
+                } else {
+                    
+                    var data = {
+                        username: account,
+                        password: password,
+                        up: up
+                    };
+                    var postdata = {
+                        token: '',
+                        loginMark: learun.deviceId(),// 正式请换用设备号
+                        data: JSON.stringify(data)
+                    };
+
+                    learun.layer.loading(true, "正在登录，请稍后");
+                    learun.http.post(path + "learun/adms/user/loginbyIdCard", postdata, (res) => {
+                        learun.layer.loading(false);
+                        if (res === null) {
+                            learun.layer.warning('无法连接服务器,请检测网络！', function () { }, '提示', '关闭');
+                            return;
+                        }
+
+                        if (res.code === 200) {
+                            var logininfo = {
+                                account: account,
+                                token: res.data.baseinfo.token,
+                                date: learun.date.format(new Date(), 'yyyy-MM-dd hh:mm:ss')
+                            };
+                            learun.storage.set('logininfo', logininfo);
+                            learun.storage.set('userinfo', res.data);
+                            $('#account').val('');
+                            $('#password').val('');
+                            if (res.data.pwd === true) {
+                                learun.storage.set('pwdandnotice', true);
+                            } else {
+                                learun.storage.set('pwdandnotice', false);
+                            }
+                            learun.tab.go('workspace');
+                            if (learun.storage.get("Ip") != null && learun.storage.get("ACIp") != "") {
+                                //Ip上网
+                                sendToAc(learun.storage.get("ACIp"), 'logon', learun.storage.get("Ip"), account, '');
+                            }
+                            if (learun.storage.get("Ip") != null && learun.storage.get("ACIp2") != "") {
+                                //Ip上网
+                                sendToAc(learun.storage.get("ACIp2"), 'logon', learun.storage.get("Ip"), account, '');
+                            }
+                        } else {
+                            learun.layer.warning(res.info, function () { }, '提示', '关闭');
+                        }
+                    });
+                }
+
+            });
+
+        }
+    };
+    return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.html

@@ -1,4 +1,4 @@
-<div class="lr-login-page">
+<div class="lr-login-page">
     <div class="login-content">
         <img src="" />
         <div class="line">
@@ -15,6 +15,9 @@
         <button id="bindweixinBtn" type="button" class="lr-btn-primary lr-btn-block">
             微信登录
         </button>
+        <button id="bindidcardBtn" type="button" class="lr-btn-primary lr-btn-block">
+            新生首次登录入口
+        </button>
         <button id="RegisterBtn" type="button" style="display:none;" class="lr-btn-primary lr-btn-block">
             注册
         </button>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.js

@@ -1,4 +1,4 @@
-(function () {
+(function () {
     var isBindAccountLogin = '';//切换账号登录
     var bindUserName = '';//绑定账号
     var bindUserPassword = '';//绑定账号密码
@@ -106,7 +106,10 @@
                 function () {
                     location.href = "/weixinlogin.html";
                 });
-
+$page.find('#bindidcardBtn').on('tap',
+                function () {
+                    learun.nav.go({ path: 'login/IdCardLogin', title: '身份证登录', type: 'right' });
+                });
         }
     };
     return page;

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypassword/modifypassword.html

@@ -1,4 +1,4 @@
-<<div style="margin-top:10px;" class="lr-form-container" id="modifypasswordform">
+<div style="margin-top:10px;" class="lr-form-container" id="modifypasswordform">
     <div class="lr-form-row">
         <label>原密码</label>
         <input id="oldpassword" type="password" isvalid="yes" checkexpession="NotNull" errormsg="原密码">

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.css

@@ -0,0 +1 @@
+

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.html

@@ -0,0 +1,34 @@
+<div style="margin-top:10px;" class="lr-form-container" id="modifypasswordform">
+    <div class="lr-form-row">
+        <label>原密码</label>
+        <input id="oldpassword" type="password" isvalid="yes" checkexpession="NotNull" errormsg="原密码">
+    </div>
+    <div class="lr-form-row">
+        <label>新密码</label>
+        <input id="newpassword" type="password" isvalid="yes" checkexpession="NotNull" errormsg="新密码">
+    </div>
+    <div class="lr-form-row">
+        <label>确认新密码</label>
+        <input id="newpassword1" type="password" isvalid="yes" checkexpession="NotNull" errormsg="确认新密码">
+    </div>
+</div>
+
+<div class="lr-list" style="margin-top: 15px;">
+    <div id="strongpwd" style="display: none;">
+        您的密码不满足强度要求，请您先修改密码后再执行系统其他操作！
+    </div>
+    <div>
+        新密码必须8-20位同时包含1.[大小写字母]、2[数字]、3[特殊符号!@@#$%^&*]
+    </div>
+    <div>
+        学生学号请登录后点击【我的】->点击头像->查看【帐号】
+    </div>
+    <div class="lr-list-item" style="color: red; text-align: center;" id="savepassword">
+        保存
+    </div>
+</div>
+<div class="lr-list" style="margin-top:15px;display: none;" id="strongpwdout" >
+    <div class="lr-list-item" style="color:red;text-align:center;" id="outloginbtn">
+        退出
+    </div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.js

@@ -0,0 +1,68 @@
+(function () {
+    var userinfo = null;
+    var page = {
+        isScroll: true,
+        init: function ($page) {
+            userinfo = learun.storage.get('userinfo');
+            //主被动修改密码判断
+            if (learun.storage.get('pwd')===true) {
+                $page.find('#strongpwd').css("display", "block");
+                $page.find('#strongpwdout').css("display", "block");
+            }
+            $page.find('#savepassword').on('tap', function () {
+                if (!$('#modifypasswordform').lrformValid()) {
+                    return false;
+                }
+                var formdata = $('#modifypasswordform').lrformGet();
+                var reg = /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/;
+                if (!reg.test(formdata.newpassword)) {
+                    learun.layer.toast('密码不满足强度要求');
+                    return false;
+                }
+                if (formdata.newpassword1 === formdata.newpassword) {
+
+                    var req = {
+                        newpassword: $.md5(formdata.newpassword),
+                        oldpassword: formdata.oldpassword
+                    };
+                    learun.layer.loading(true);
+                    // 访问后台修改密码
+                    learun.httppost(config.webapi + "learun/adms/user/modifypwiden", req, (data,info) => {
+                        learun.layer.loading(false);
+                        if (data) {// 表单数据保存成功，发起流程
+                            learun.layer.toast(info);
+                            //learun.storage.set('logininfo', null);
+                            learun.storage.set('pwdandnotice', false);
+                            learun.storage.set('isUpdStu', true);
+                            learun.nav.go({ path: 'workspace', isBack: false, isHead: false });
+                        }
+                        return false;
+                    });
+                }
+                else {
+                    learun.layer.toast('二次输入密码不同');
+                }
+            });
+            $page.find('#outloginbtn').on('tap', function () {
+                learun.layer.confirm('确定要退出账号?', function (_index) {
+                    if (_index === '1') {
+                        learun.isOutLogin = true;
+                        if (learun.storage.get("Ip") != null && learun.storage.get("ACIp") != "") {
+                            //Ip上网
+                            sendToAc(learun.storage.get("ACIp"), 'logout', learun.storage.get("Ip"), userinfo.baseinfo.account, '');
+                        }
+                        if (learun.storage.get("Ip") != null && learun.storage.get("ACIp2") != "") {
+                            //Ip上网
+                            sendToAc(learun.storage.get("ACIp2"), 'logout', learun.storage.get("Ip"), userinfo.baseinfo.account, '');
+                        }
+                        learun.storage.set('logininfo', null);
+                        learun.nav.go({ path: 'login', isBack: false, isHead: false });
+                        
+                    }
+
+                }, '', ['取消', '退出']);
+            });
+        }
+    };
+    return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html

@@ -21,10 +21,10 @@
 			<span>班级：</span><span id="ClassNo"></span>
 		</div>
 		<div class="noticeTxt">
-			<span>辅导员：</span><span id="ClassTutorName"></span>
+			<span>辅导员：</span><span id="ClassDiredctorName"></span>
 		</div>
 		<div class="noticeTxt">
-			<span>电话：</span><span id="ClassTutorMobile"></span>
+			<span>电话：</span><span id="ClassDiredctorMobile"></span>
 		</div>
 		<div class="noticeTxt">
 			<span>宿舍：</span><span id="Dormitory"></span>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js

@@ -16,8 +16,8 @@
                         $('#DeptNo').html(entity.DeptNo);
                         $('#MajorNo').html(entity.MajorNo);
                         $('#ClassNo').html(entity.ClassNo);
-                        $('#ClassTutorName').html(entity.ClassTutorName);
-                        $('#ClassTutorMobile').html(entity.ClassTutorMobile);
+                        $('#ClassDiredctorName').html(entity.ClassDiredctorName);
+                        $('#ClassDiredctorMobile').html(entity.ClassDiredctorMobile);
                         $('#PayFeeStatus').html(entity.PayFeeStatus == "1" ? "已缴费" : "未缴费");
                         $('#CollectFileStatus').html(entity.CollectFileStatus == "1" ? "已提交" : "未提交");
                         $('#GetKeyStatus').html(entity.GetKeyStatus == "1" ? "已领取" : "未领取");

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html

@@ -3,7 +3,7 @@
     <!-- 未完成 类名 sSec1Type2 图片   enter2-1 enter2-2 enter2-3 enter2-4 enter2-5-->
     <!-- 可以点击类名  sSec1Tap -->
     <div class="ensHeader">
-        <div class="ensTime">2020</div>
+        <div class="ensTime">2021</div>
         <div class="ensHeadT">新生入校流程</div>
     </div>
     <div class="ensSec1">
@@ -12,7 +12,7 @@
             <div class="sSec1Con sSec1Type2" id="IsCompleteInfo">
                 <img src="images/enter2-1.png" alt="">
                 <div class="sSec1Txt">
-                    完善学生信息
+                    完善信息
                 </div>
                 <div class="sSec1State">未完成</div>
             </div>
@@ -24,7 +24,7 @@
                 <img src="images/enter2-2.png" alt="">
                 <div class="sSec1Txt">
                     线上缴费
-                    <span>( 已缴费、未缴费 )</span>
+                    <span>(地址：http://onlinepay.xcmzyz.com/)</span>
                 </div>
                 <div class="sSec1State">未完成</div>
             </div>
@@ -32,18 +32,18 @@
                 <img src="images/enter2-3.png" alt="">
                 <div class="sSec1Txt">
                     助学贷款
-                    <span>( 填写贷款回执码 )</span>
+                    <span>( 选择办理贷款状态 )</span>
                 </div>
                 <div class="sSec1State">未完成</div>
             </div>
-            <div class="sSec1Con sSec1Type2" id="OnsitePayFeeStatus">
+            <!-- <div class="sSec1Con sSec1Type2" id="OnsitePayFeeStatus">
                 <img src="images/enter2-4.png" alt="">
                 <div class="sSec1Txt">
                     现场缴费
                     <span>( 已缴费、缓交、部分缴费、未缴费 )</span>
                 </div>
                 <div class="sSec1State">未完成</div>
-            </div>
+            </div> -->
         </div>
         <div class="eSec1Box">
             <img src="images/enter1-6.png" alt="" class="sSecDown">

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js

@@ -24,16 +24,16 @@
                     } else {
                         notCompleteStyle("#PayFeeStatus", "images/enter2-2.png");
                     }
-                    if (data["StuInfoFreshEntity"].StudentLoanStatus == "1") {
+                    if (data["StuInfoFreshEntity"].StudentLoanBLStatus) {
                         completeStyle("#StudentLoan", "images/enter1-3.png");
                     } else {
                         notCompleteStyle("#StudentLoan", "images/enter2-3.png");
                     }
-                    if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") {
-                        completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
-                    } else {
-                        notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
-                    }
+                    // if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") {
+                    //     completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
+                    // } else {
+                    //     notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
+                    // }
                     if (data["StuInfoFreshEntity"].RegisterStatus == "1") {
                         completeStyle("#RegisterStatus", "images/enter1-5.png");
                     } else {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css

@@ -1,132 +1,281 @@
+
+
+ .red{
+            color: red;
+        }
+
 .welcome {
-    padding: 1px 12px 20px;
-    background: #fff;
+	height: 100%;
+	overflow: auto;
+}
+.welCard{
+	background-color: #EFF2F3;
+	height: calc(100% - 50px);
+	overflow: auto;
+	padding-bottom: 30px;
+}
+.welTab {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	/* position: relative; */
+	background: #fff;
+	padding: 1px 12px 0px;
+	font-size: 14px;
+	line-height: 40px;
+}
+
+.welTab div {
+	padding: 0 5px;
+	position: relative;
+}
+
+.welTab div:after {
+	content: '';
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 3px;
+	height: 2px;
+}
+
+.welTab div.active {
+	color: #0C86D8;
+}
+
+.welTab div.active:after {
+	background-color: #0C86D8;
+}
+
+.welBox {
+	display: none;
+	/* background: #fff; */
+	/* padding: 0px 12px 20px; */
+}
+.welbox2{
+	padding: 0px 20px 0px;
+	background-color: #fff;
+        position: relative;
+
+}
+.welBox.active {
+	display: block;
 }
 
 .welT {
-    font-size: 16px;
-    margin-bottom: 10px;
+	padding: 10px 0;
+	font-weight: bold;
+	font-size: 16px;
+	line-height: 26px;
+}
+.welT span{
+    font-weight: 400;
+    font-size: 12px;
     line-height: 26px;
 }
+.welT2 {
+	height: 46px;
+	line-height: 46px;
+	font-size: 16px;
+	margin: 0 -12px;
+	padding: 0 12px;
+        font-weight: 800;
+	
+}
 
-    .welT i {
-        width: 26px;
-        height: 26px;
-        line-height: 24px;
-        border: 1px solid #efefef;
-        border-radius: 4px;
-        float: right;
-        text-align: center;
-        color: #999;
-    }
+.welT i {
+	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;
+	height: 7px;
+	background-color: #EFF2F3;
+	/* margin: 10px -12px; */
 }
 
 .welText {
-    overflow: hidden;
-    font-size: 14px;
-    margin-top: 5px;
+	overflow: hidden;
+	font-size: 14px;
+	margin-top: 8px;
+	line-height: 0;
+        border-bottom: 1px solid #EFF2F3;
+        padding-bottom: 5px;
 }
 
-    .welText span {
-        float: right;
-        width: 60%;
-        text-align: right;
-    }
+.welText div {
+	width: 58px;
+	display: inline-block;
+	line-height: 20px;
+	text-align: justify;
+	text-align-last: justify;
+}
+
+.welText div:after {
+	overflow: hidden;
+	width: 100%;
+	content: '';
+}
+
+.welText span {
+	float: right;
+	width: 60%;
+	text-align: right;
+	line-height: 20px;
+}
+
+.welInputBox {
+	margin: 0 -12px;
+}
 
 .welInput {
-    overflow: hidden;
-    font-size: 14px;
-    margin-top: 10px;
+	overflow: hidden;
+	font-size: 14px;
+	/* margin-top: 10px; */
+	height: 46px;
+	padding: 8px 12px;
+	border-top: 1px solid #EFF2F3;
 }
 
-    .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;
-    }
+.welInput:first-child {
+	border: 0;
+}
+
+.welInput span {
+	float: left;
+	width: 70px;
+	text-align: right;
+	line-height: 30px;
+	text-align: justify;
+	text-align-last: justify;
+}
+
+.welInput span:after {
+	overflow: hidden;
+	width: 100%;
+	content: '';
+}
 
+.welInput .welInputs {
+	display: block;
+	margin-left: 80px;
+	width: calc(100% - 80px);
+	border: 0px solid #efefef;
+	border-radius: 4px;
+	height: 30px;
+	line-height: 28px;
+	padding: 0 10px;
+	margin-bottom: 0;
+	text-align: right;
+}
+.welInput .lr-picker {
+    line-height: 30px;
+}
+.welUrgent{
+   position: relative;
+}
 .welCon {
-    padding: 10px;
-    border: 1px solid #efefef;
-    margin-top: 18px;
-    border-radius: 4px;
-    position: relative;
+	margin-top: 18px;
+	 
+	margin: 0 -12px;
 }
 
 .welDel {
-    position: absolute;
-    top: -8px;
-    left: -8px;
-    background: #fff;
-}
-
-    .welDel i {
-        text-align: center;
-        width: 26px;
-        height: 26px;
-        display: block;
-        line-height: 24px;
-        border: 1px solid #efefef;
-        border-radius: 50%;
-    }
+        text-align: right;
+	padding: 5px 12px 10px;
+	
+}
 
-.welImgAdd {
-    text-align: center;
-    line-height: 0;
+
+.welDel i,.welAdd i {
+	text-align: center;
+	width: 26px;
+	height: 26px;
+	line-height: 24px;
+	border: 2px solid #0C86D8;
+	border-radius: 3px;
+	background: #ffff;
+	color: #0C86D8;
+        margin-right:10px;
+}
+
+.welAdd{
+	
+	 position: absolute;
+         bottom: 12px;
+	font-size: 14px;
+	color: #0C86D8;
 }
 
 #files {
-    opacity: 0;
-    -webkit-opacity: 0;
-    z-index: 9;
-    display: none;
+	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;
+	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;
+
+.welImgAdd {
+	
+        height:300px;
+	margin: 60px auto;
+	border: 1px solid #0C86D8;
+	border-radius: 6px;
+	overflow: hidden;
+	line-height: 0;
 }
-#PhotoImg {
-    width: 110px;
-    height:110px;
+
+.welImgAdd img {
+	width: 100%;
+        height: 100%;
 }
 
-.btnBox{
-    margin-top:20px;
-    text-align:center;
+/* #PhotoImg {
+	width: 110px;
+	height: 110px;
+} */
+.welImgInfo {
+	width: 260px;
+	margin: 0 auto;
+	color: #888888;
 }
+
+.welImgInfoT {
+	font-size: 16px;
+	font-weight: bold;
+}
+
+.welImgInfoTxt {
+	font-size: 14px;
+	margin-top: 10px;
+}
+.btnBox {
+	margin-top: 20px;
+	text-align: center;
+}
+
 #saveBtn {
-    margin: auto;
-    margin-top: 25px;
-    width: 92%;
-}
+	margin: auto;
+	margin-top: 25px;
+	width: 92%;
+	border-radius: 6px;
+}

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html

@@ -1,142 +1,210 @@
 <div class="welcome">
-    <div class="welT">基本信息</div>
-    <div class="welBox">
-        <input type="hidden" name="ID" value="" id="ID" />
-        <div class="welText">
-            学号
-            <span id="StuNo"></span>
-        </div>
-        <div class="welText">
-            准考证号
-            <span id="zkzh"></span>
-        </div>
-        <div class="welText">
-            考生号
-            <span id="ksh"></span>
-        </div>
-        <div class="welText">
-            姓名 <span id="StuName"></span>
-        </div>
-        <div class="welText">
-            性别
-            <span id="GenderNo"></span>
-        </div>
-        <div class="welText">
-            系别
-            <span id="DeptNo"></span>
-        </div>
-        <div class="welText">
-            专业
-            <span id="MajorNo"></span>
-        </div>
-        <div class="welText">
-            班级
-            <span id="ClassNo"></span>
-        </div>
-        <div class="welText">
-            身份证号
-            <span id="IdentityCardNo"></span>
-        </div>
-        <div class="welText">
-            出生日期
-            <span id="Birthday"></span>
-        </div>
-        <div class="welText">
-            户口类别
-            <span id="ResidenceNo"></span>
-        </div>
-        <div class="welText">
-            政治面貌
-            <span id="PartyFaceNo"></span>
-        </div>
-    </div>
-    <div class="welLine"></div>
-    <div class="welT">采集照片信息</div>
-    <div class="welBox">
-        <input type="hidden" id="Photo" value="" />
-        <input id="files" type="file" accept="image/*">
-        <div class="welImgAdd">
-            <!--<div id="welImgBtn">上传照片</div>-->
-            <img id="PhotoImg" src="" alt="">
-        </div>
-        <!--<div class="welText">说明：近期两寸免冠正面彩色照小于100K</div>-->
-    </div>
-    <div class="welLine"></div>
-    <div class="welT">自然信息</div>
-    <div class="welBox">
-        <div class="welInput">
-            <span>籍贯</span>
-            <input id="RegionNo" type="text" placeholder="请填写籍贯" />
-        </div>
-    </div>
-    <div class="welLine"></div>
-    <div class="welT">通讯信息</div>
-    <div class="welBox">
-        <div class="welInput">
-            <span>家庭住址</span>
-            <input id="FamilyAddress" type="text" placeholder="按XX省XX市XX县XX街道填写" />
-        </div>
-        <div class="welInput">
-            <span>联系电话</span>
-            <input id="telephone" type="text" placeholder="请填写联系电话(重要)" />
-        </div>
-    </div>
-    <div class="welLine"></div>
-    <div class="welT">家庭成员(直系家属) <i title="家庭成员(直系家属)" class="iconfont icon-add"></i></div>
-    <div class="welBox" id="StuInfoFreshFamily">
-        <div class="welCon">
-            <div class="welInput">
-                <span>姓名</span>
-                <input type="text" name="Name" placeholder="请填写姓名" />
-            </div>
-            <div class="welInput">
-                <span>与本人关系</span>
-                <input type="text" name="Relation" placeholder="请填写与本人关系" />
-            </div>
-            <div class="welInput">
-                <span>性别</span>
-                <input type="text" name="Sex" placeholder="请填写性别" />
-            </div>
-            <div class="welInput">
-                <span>年龄</span>
-                <input type="text" name="Age" placeholder="请填写年龄" />
-            </div>
-            <div class="welInput">
-                <span>政治面貌</span>
-                <input type="text" name="Politicy" placeholder="请填写政治面貌" />
-            </div>
-            <div class="welDel"> <i class="iconfont icon-move"></i> </div>
-        </div>
-    </div>
-    <div class="welLine"></div>
-    <div class="welT">紧急联系人 <i title="紧急联系人" class="iconfont icon-add"></i></div>
-    <div class="welBox" id="StuInfoFreshEmergePeople">
-        <div class="welCon">
-            <div class="welInput">
-                <span>姓名</span>
-                <input type="text" name="Name" placeholder="请填写姓名" />
-            </div>
-            <div class="welInput">
-                <span>与本人关系</span>
-                <input type="text" name="Relation" placeholder="请填写与本人关系" />
-            </div>
-            <div class="welInput">
-                <span>手机号码</span>
-                <input type="text" name="Telephone" placeholder="请填写手机号码" />
-            </div>
-            <div class="welInput">
-                <span>座机号码</span>
-                <input type="text" name="Mobile" placeholder="请填写座机号码" />
-            </div>
-            <div class="welInput">
-                <span>联系地址</span>
-                <input type="text" name="Address" placeholder="请填写联系地址" />
-            </div>
-            <div class="welDel"> <i class="iconfont icon-move"></i> </div>
-        </div>
-    </div>
+	<div class="welTab">
+		<div class="active">基本信息</div>
+		<div>采集照片</div>
+		<div>籍贯/通讯</div>
+		<div>账户信息</div>
+		<div>家庭成员</div>
+	</div>
+	<div class="welLine" style="margin-top: 0;"></div>
+	<div class="welCard">
+		<div class="welBox active">
+			<div class="welbox2" style="padding-bottom: 20px;">
+				<div class="welT">基本信息<span style="color: red;">（下次请使用学号和密码登录）</span></div>
+
+				<input type="hidden" name="ID" value="" id="ID" />
+				<div class="welText">
+					<div>学号</div>
+					<span id="StuNo"></span>
+				</div>
+				<div class="welText">
+					<div>准考证号</div>
+					<span id="zkzh"></span>
+				</div>
+				<div class="welText">
+					<div>考生号</div>
+					<span id="ksh"></span>
+				</div>
+				<div class="welText">
+					<div>姓名</div>
+					<span id="StuName"></span>
+				</div>
+				<div class="welText">
+					<div>性别</div>
+					<span id="GenderNo"></span>
+				</div>
+				<div class="welText">
+					<div>系别</div>
+					<span id="DeptNo"></span>
+				</div>
+				<div class="welText">
+					<div>专业</div>
+					<span id="MajorNo"></span>
+				</div>
+				<div class="welText">
+					<div>班级</div>
+					<span id="ClassNo"></span>
+				</div>
+				<div class="welText">
+					<div>身份证号</div>
+					<span id="IdentityCardNo"></span>
+				</div>
+				<div class="welText">
+					<div>出生日期</div>
+					<span id="Birthday"></span>
+				</div>
+				<div class="welText">
+					<div>户口类别</div>
+					<span id="ResidenceNo"></span>
+				</div>
+				<div class="welText">
+					<div>政治面貌</div>
+					<span id="PartyFaceNo"></span>
+				</div>
+			</div>
+		</div>
+
+		<div class="welBox ">
+			<div class="welbox2" style="padding-bottom: 20px;">
+				<div class="welT">采集照片</div>
+				<input type="hidden" id="Photo" value="" />
+				<input id="files" type="file" accept="image/*">
+				<div class="welImgAdd">
+					<!--<div id="welImgBtn">上传照片</div>-->
+					<img id="PhotoImg" src="../../images/wel1.png" alt="">
+				</div>
+				<div class="welImgInfo">
+					<div class="welImgInfoT">照片要求：</div>
+					<div class="welImgInfoTxt">1 . 单色背景，正面，免冠近期证件照</div>
+					<div class="welImgInfoTxt">2 . 文件格式JPG</div>
+					<div class="welImgInfoTxt">3 . 文件大小165320KB以下</div>
+				</div>
+			</div>
+			<!-- <div class="btnBox">
+				<button id="saveBtn" type="button" class="lr-btn-primary lr-btn-block saveBtn">保存</button>
+			</div> -->
+		</div>
+
+		<div class="welBox ">
+			<div class="welbox2">
+				<div class="welT2">自然信息</div>
+				<div class="welInputBox">
+					<div class="welInput">
+						<span>籍贯</span>
+						<input class="welInputs" id="RegionNo" type="text" placeholder="请填写籍贯" />
+					</div>
+				</div>
+				<div class="welT2">通讯信息</div>
+				<div class="welInputBox">
+					<div class="welInput">
+						<span>家庭住址</span>
+						<input class="welInputs" id="FamilyAddress" type="text" placeholder="按XX省XX市XX县XX街道填写" />
+					</div>
+					<div class="welInput">
+						<span>联系电话</span>
+						<input class="welInputs" id="telephone" type="text" onkeyup="value=value.replace(/[^\d\.]/g,'')"
+							onblur="value=value.replace(/[^\d\.]/g,'')" placeholder="请填写联系电话(重要)" />
+					</div>
+				</div>
+				<div class="welT2">紧急联系人</div>
+				<div class="welUrgent" id="StuInfoFreshEmergePeople">
+					<div class="welCon">
+						<div class="welInput">
+							<span>姓名</span>
+							<input class="welInputs" type="text" name="Name" placeholder="请填写姓名" />
+						</div>
+						<div class="welInput">
+							<span>与本人关系</span>
+							<div name="Relation" value=""></div>
+						</div>
+						<div class="welInput">
+							<span>手机号码</span>
+							<input class="welInputs" type="text" name="Telephone"
+								onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')"
+								placeholder="请填写手机号码" />
+						</div>
+						<div class="welInput">
+							<span>座机号码</span>
+							<input class="welInputs" type="text" name="Mobile" placeholder="请填写座机号码" />
+						</div>
+						<div class="welInput">
+							<span>联系地址</span>
+							<input class="welInputs" type="text" name="Address" placeholder="请填写联系地址" />
+						</div>
+						<div class="welInput">
+							<span>联系地址</span>
+							<!-- <i class="iconfont icon-move"></i> -->
+						</div>
+						<!-- <div class="welDel">
+
+							<i class="iconfont icon-move"></i>
+						</div> -->
+
+						<!-- <div class="welAdd"><i title="紧急联系人" class="iconfont icon-add"></i> 添加紧急联系人</div> -->
+					</div>
+
+				</div>
+				<!-- <div class="welAdd"><i title="紧急联系人" class="iconfont icon-add"></i>添加紧急联系人</div> -->
+			</div>
+			<!-- <div class="btnBox">
+				<button id="saveBtn" type="button" class="lr-btn-primary lr-btn-block saveBtn">保存</button>
+			</div> -->
+		</div>
+
+		<div class="welBox ">
+			<div class="welbox2">
+				<div class="welInputBox">
+					<div class="welInput">
+						<span>开户银行</span>
+						<div name="DepositBank" id="DepositBank" placeholder="请选择开户银行" value=""></div>
+					</div>
+					<div class="welInput">
+						<span>银行卡号</span>
+						<input class="welInputs" id="BankCard" type="text" placeholder="银行卡号" />
+					</div>
+					<div class="welInput">
+						<span>开 户 行</span>
+						<input class="welInputs" id="BankLocation" type="text" placeholder="开户行" />
+					</div>
+				</div>
+			</div>
+			<!-- <div class="btnBox">
+				<button id="saveBtn1" type="button" class="lr-btn-primary lr-btn-block saveBtn">保存</button>
+			</div> -->
+		</div>
+
+		<div class="welBox">
+			<div class="welbox2">
+				<div class="welT2">家庭成员(直系家属)</div>
+				<div class="welUrgent" id="StuInfoFreshFamily">
+					<div class="welCon">
+						<div class="welInput">
+							<span>姓名</span>
+							<input class="welInputs" type="text" name="Name" placeholder="请填写姓名" />
+						</div>
+						<div class="welInput">
+							<span>与本人关系</span>
+							<div name="Relation" value=""></div>
+						</div>
+						<div class="welInput">
+							<span>年龄</span>
+							<input class="welInputs" type="text" name="Age" placeholder="请填写年龄" />
+						</div>
+						<div class="welInput">
+							<span>政治面貌</span>
+							<div name="Politicy" value=""></div>
+						</div>
+						<div class="welDel"> <i class="iconfont icon-move"></i> </div>
+					</div>
+				</div>
+				<div class="welAdd"><i title="家庭成员" class="iconfont icon-add"></i> 添加家庭成员</div>
+			</div>
+			<div class="btnBox">
+				<button id="saveBtn" type="button" class="lr-btn-primary lr-btn-block saveBtn">保存</button>
+			</div>
+		</div>
+
+	</div>
+
 
-    <div class="btnBox">
-        <button id="saveBtn" type="button" class="lr-btn-primary lr-btn-block">保存</button>
-    </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js

@@ -1,31 +1,32 @@
 (function () {
     var colDataItemArr = ['GenderNo'];
     var colDataItemCode = ['usersex'];
-    
+	var colDataItemBank = ['DepositBank'];
     var page = {
         isScroll: false,
         init: function ($page) {
             // 获取登录者信息
             var userinfo = learun.storage.get('userinfo');
-
+			//tab切换
+			$page.find('.welTab div').on('tap', function () {
+				var ind = $(this).index();
+				$(this).addClass('active').siblings().removeClass('active');
+				$('.welBox').css('display', 'none').eq(ind).fadeIn()
+			})
             //增加联系人
-            $page.find('.welT i').on('tap', function () {
+            $page.find('.welAdd').on('tap', function () {
                 var FamilyHtml = '<div class="welCon"><form class="welConForm">' +
                     '<div class="welInput">' +
                     '<span>姓名</span>' +
-                    '<input type="text" name="Name" placeholder="请填写姓名" />' +
+                    '<input class="welInputs" type="text" name="Name" placeholder="请填写姓名" />' +
                     '</div>' +
                     '<div class="welInput">' +
                     '<span>与本人关系</span>' +
                     '<div name="Relation" value=""></div>' +
                     '</div>' +
                     '<div class="welInput">' +
-                    '<span>性别</span>' +
-                    '<div name="Sex" value=""></div>' +
-                    '</div>' +
-                    '<div class="welInput">' +
                     '<span>年龄</span>' +
-                    '<input type="text" name="Age" placeholder="请填写年龄" />' +
+                    '<input  class="welInputs" type="text" name="Age" placeholder="请填写年龄" />' +
                     '</div>' +
                     '<div class="welInput">' +
                     '<span>政治面貌</span>' +
@@ -40,37 +41,55 @@
                 var EmergePeopleHtml = '<div class="welCon"><form class="welConForm">' +
                     '<div class="welInput">' +
                     '<span>姓名</span>' +
-                    '<input type="text" name="Name" placeholder="请填写姓名" />' +
+                    '<input class="welInputs" type="text" name="Name" placeholder="请填写姓名" />' +
                     '</div>' +
                     '<div class="welInput">' +
                     '<span>与本人关系</span>' +
-                    '<input type="text" name="Relation"  placeholder="请填写与本人关系" />' +
+                    '<div name="Relation" value=""></div>' +
                     '</div>' +
                     '<div class="welInput">' +
                     '<span>手机号码</span>' +
-                    '<input type="text" name="Telephone"  placeholder="请填写手机号码" />' +
+                    '<input class="welInputs" type="text" name="Telephone"  placeholder="请填写手机号码" />' +
                     '</div>' +
                     '<div class="welInput">' +
                     '<span>座机号码</span>' +
-                    '<input type="text" name="Mobile" placeholder="请填写座机号码" />' +
+                    '<input class="welInputs" type="text" name="Mobile" placeholder="请填写座机号码" />' +
                     '</div>' +
                     '<div class="welInput">' +
                     '<span>联系地址</span>' +
-                    '<input type="text" name="Address" placeholder="请填写联系地址" />' +
+                    '<input class="welInputs" type="text" name="Address" placeholder="请填写联系地址" />' +
                     '</div>' +
                     '<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
                     '</form></div>';
 
 
-                var obj = $(this).parent().next();
+                var obj = $(this).parents('.welBox').find('.welUrgent');
                 if ($(this).attr('title') == '紧急联系人') {
                     obj.append(EmergePeopleHtml);
+					
                 } else {
                     obj.append(FamilyHtml);
+					//政治面貌
+					var Politicy = $(obj).find('[name="Politicy"]:last');
+					Politicy.lrpickerex({
+					    code: 'BCdPartyFace',
+					    type: 'sourceData',
+					    ivalue: 'partyfaceno',
+					    itext: 'partyface'
+					});
+					//赋值
+					Politicy.lrpickerSet(Politicy.attr('value'));
                 }
-
-
-                page.bind($page);
+				//与本人关系
+				var Relation = $(obj).find('[name="Relation"]:last');
+				Relation.lrpickerex({
+				    code: 'FamilyRelation',
+				    type: 'dataItem'
+				});
+				//赋值
+				Relation.lrpickerSet(Relation.attr('value'));
+				
+                // page.bind($page);
             })
             //删除联系人
             $page.find('.welBox').on('tap', '.welDel i', function () {
@@ -81,7 +100,7 @@
             })
             //上传照片
             var inputNode = $page.find('#files');
-            $page.find('#welImgBtn').on('tap', function () {
+            $page.find('#PhotoImg').on('tap', function () {
                 var evt = new MouseEvent("click", {
                     bubbles: false,
                     cancelable: true,
@@ -92,142 +111,205 @@
             inputNode.on('change', function () {
                 previewFile();
             });
+			
+             //数据绑定 
+			learun.layer.loading(true, '获取数据中');
+			learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (
+				data) => {
+					//console.log('datadata',data);
+				if (data) {
+					if(!data['StuInfoFreshEntity'])
+					{
+						learun.layer.loading(false);
+						learun.layer.toast('未查询到新生数据，请确认是否为新生。');
+						return;
+					}
+					//基本信息
+					for (var id in data['StuInfoFreshEntity']) {
+						var dom = $('#' + id)[0];
+						if (dom) {
+							if (dom.tagName.toLowerCase() == "span") {
+								$('#' + id).html(data['StuInfoFreshEntity']['' + id + '']);
+								//数据字典
+								if ($.inArray(id, colDataItemArr) >= 0) {
+									learun.clientdata.get('dataItem', {
+										code: colDataItemCode[$.inArray(id,
+											colDataItemArr)],
+										key: data['StuInfoFreshEntity']['' + id + ''],
+										callback: function(data, op) {
+											$('#' + id).html(data.text);
+										}
+									});
+								}
+								if (id == "PartyFaceNo") {
+									learun.clientdata.get('sourceData', {
+										code: 'BCdPartyFace',
+										key: data['StuInfoFreshEntity']['' + id + ''],
+										keyId: 'partyfaceno',
+										callback: function(data, op) {
+											$("#PartyFaceNo").html(data.partyface);
+										}
+									});
+								}
+								if (id == "#DepositBank") {
+									learun.clientdata.get('sourceData', {
+										code: 'DepositBank',
+										key: data['StuInfoFreshEntity']['' + id + ''],
+										keyId: 'DepositBank',
+										callback: function(data, op) {
+											$("#DepositBank").html(data.text);
+										}
+									});
+								}
+							} else if (dom.tagName.toLowerCase() == "input") {
+								$('#' + id).val(data['StuInfoFreshEntity']['' + id + '']);
+							}
+						}
+					}
+					$("#Birthday").html($("#Birthday").text().substr(0, $("#Birthday").text()
+						.indexOf(' ')));
+					$("#DepositBank").lrpickerSet(data.StuInfoFreshEntity.DepositBank);
+					//头像
+					$('#PhotoImg').attr('src', config.web + data['Url']);
+					
+					//家庭成员
+					if(data['StuInfoFreshFamilyList'].length>0){
+					$('#StuInfoFreshFamily').html("");
+					
+					$.each(data['StuInfoFreshFamilyList'], function(i, item) {
+						var html = '<div class="welCon"><form class="welConForm">' +
+							'<div class="welInput">' +
+							'<span>姓名</span>' +
+							'<input class="welInputs" type="text" name="Name" placeholder="请填写姓名" value="' +
+							item.Name + '"/>' +
+							'</div >' +
+							'<div class="welInput">' +
+							'<span>与本人关系</span>' +
+							'<div name="Relation" value="' + item.Relation + '"></div>' +
+							'</div>' +
+							'<div class="welInput">' +
+							'<span>年龄</span>' +
+							'<input class="welInputs" type="text" name="Age" placeholder="请填写年龄" value="' +
+							item.Age + '"/>' +
+							'</div>' +
+							'<div class="welInput">' +
+							'<span>政治面貌</span>' +
+							'<div name="Politicy" value="' + item.Politicy + '"/>' +
+							'</div>' +
+							'<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
+							'</form></div> ';
+						$('#StuInfoFreshFamily').append(html);
 
-            //数据绑定 
-            learun.layer.loading(true, '获取数据中');
-            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
-                if (data) {
-                    //基本信息
-                    for (var id in data['StuInfoFreshEntity']) {
-                        var dom = $('#' + id)[0];
-                        if (dom) {
-                            if (dom.tagName.toLowerCase() == "span") {
-                                $('#' + id).html(data['StuInfoFreshEntity']['' + id + '']);
-                                //数据字典
-                                if ($.inArray(id, colDataItemArr) >= 0) {
-                                    learun.clientdata.get('dataItem', {
-                                        code: colDataItemCode[$.inArray(id, colDataItemArr)],
-                                        key: data['StuInfoFreshEntity']['' + id + ''],
-                                        callback: function (data, op) {
-                                            $('#' + id).html(data.text);
-                                        }
-                                    });
-                                }
-                                if (id == "PartyFaceNo") {
-                                    learun.clientdata.get('sourceData', {
-                                        code: 'BCdPartyFace',
-                                        key: data['StuInfoFreshEntity']['' + id + ''],
-                                        keyId: 'partyfaceno',
-                                        callback: function (data, op) {
-                                            $("#PartyFaceNo").html(data.partyface);
-                                        }
-                                    });
-                                }
-                            } else if (dom.tagName.toLowerCase() == "input") {
-                                $('#' + id).val(data['StuInfoFreshEntity']['' + id + '']);
-                            }
-                        }
-                    }
-                    $("#Birthday").html($("#Birthday").text().substr(0, $("#Birthday").text().indexOf(' ')));
-                    //头像
-                    $('#PhotoImg').attr('src', config.web + data['Url']);
-                    //家庭成员
-                    $('#StuInfoFreshFamily').html("");
-                    $.each(data['StuInfoFreshFamilyList'], function (i, item) {
-                        var html = '<div class="welCon"><form class="welConForm">' +
-                            '<div class="welInput">' +
-                            '<span>姓名</span>' +
-                            '<input type="text" name="Name" placeholder="请填写姓名" value="' + item.Name + '"/>' +
-                            '</div >' +
-                            '<div class="welInput">' +
-                            '<span>与本人关系</span>' +
-                            //'<input type="text" name="Relation" placeholder="请填写与本人关系" value="' + item.Relation + '"/>' +
-                            '<div name="Relation" value="' + item.Relation + '"></div>' +
-                            '</div>' +
-                            '<div class="welInput">' +
-                            '<span>性别</span>' +
-                            //'<input type="text" name="Sex" placeholder="请填写性别" value="' + item.Sex + '"/>' +
-                            '<div name="Sex" value="' + item.Sex + '"></div>' +
-                            '</div>' +
-                            '<div class="welInput">' +
-                            '<span>年龄</span>' +
-                            '<input type="text" name="Age" placeholder="请填写年龄" value="' + item.Age + '"/>' +
-                            '</div>' +
-                            '<div class="welInput">' +
-                            '<span>政治面貌</span>' +
-                            //'<input type="text" name="Politicy" placeholder="请填写政治面貌" value="' + item.Politicy + '"/>' +
-                            '<div name="Politicy" value="' + item.Politicy + '"/>' +
-                            '</div>' +
-                            //'<div class="welInput">' +
-                            //'<span>身份证号</span>' +
-                            //'<input type="text" name="IdCard" placeholder="请填写身份证号" value="' + item.IdCard + '"/>' +
-                            //'</div>' +
-                            '<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
-                            '</form></div> ';
-                        $('#StuInfoFreshFamily').append(html);
+					});}
 
-                    });
+					//紧急联系人
+					if(data['StuInfoFreshEmergePeopleList'].length>0){
+					$('#StuInfoFreshEmergePeople').html("");
+					$.each(data['StuInfoFreshEmergePeopleList'], function(i, item) {
+						var html = '<div class="welCon"><form class="welConForm">' +
+							'<div class="welInput">' +
+							'<span>姓名</span>' +
+							'<input class="welInputs" type="text" name="Name" placeholder="请填写姓名" value="' +
+							item.Name + '"/>' +
+							'</div >' +
+							'<div class="welInput">' +
+							'<span>与本人关系</span>' +
+							'<div name="Relation" value="' +item.Relation + '"></div>' +
+							'</div>' +
+							'<div class="welInput">' +
+							'<span>手机号码</span>' +
+							'<input class="welInputs Telephone" type="text" name="Telephone"   placeholder="请填写手机号码" value="' +
+							item.Telephone + '"/>' +
+							'</div>' +
+							'<div class="welInput">' +
+							'<span>座机号码</span>' +
+							'<input class="welInputs Telephone2" type="text" name="Mobile"   placeholder="请填写座机号码" value="' +
+							item.Mobile + '"/>' +
+							'</div>' +
+							'<div class="welInput">' +
+							'<span>联系地址</span>' +
+							'<input class="welInputs" type="text" name="Address" placeholder="请填写联系地址" value="' +item.Address + '"/>' +
+							'</div>' +
+							//'<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
+							'</form></div > ';
+                                                    
+						$('#StuInfoFreshEmergePeople').append(html);
 
-                    //紧急联系人
-                    $('#StuInfoFreshEmergePeople').html("");
-                    $.each(data['StuInfoFreshEmergePeopleList'], function (i, item) {
-                        var html = '<div class="welCon"><form class="welConForm">' +
-                            '<div class="welInput">' +
-                            '<span>姓名</span>' +
-                            '<input type="text" name="Name" placeholder="请填写姓名" value="' + item.Name + '"/>' +
-                            '</div >' +
-                            '<div class="welInput">' +
-                            '<span>与本人关系</span>' +
-                            '<input type="text" name="Relation" placeholder="请填写与本人关系" value="' + item.Relation + '"/>' +
-                            '</div>' +
-                            '<div class="welInput">' +
-                            '<span>手机号码</span>' +
-                            '<input type="text" name="Telephone" placeholder="请填写手机号码" value="' + item.Telephone + '"/>' +
-                            '</div>' +
-                            '<div class="welInput">' +
-                            '<span>座机号码</span>' +
-                            '<input type="text" name="Mobile" placeholder="请填写座机号码" value="' + item.Mobile + '"/>' +
-                            '</div>' +
-                            '<div class="welInput">' +
-                            '<span>联系地址</span>' +
-                            '<input type="text" name="Address" placeholder="请填写联系地址" value="' + item.Address + '"/>' +
-                            '</div>' +
-                            '<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
-                            '</form></div > ';
-                        $('#StuInfoFreshEmergePeople').append(html);
+					       });
+                                          }
+$('.Telephone').on('blur',function(item){
+var reg = new RegExp("^[0-9]*$")
+	if(!reg.test($(".Telephone").val())){
 
-                    });
+           $(".Telephone").val("")
+           $('.Telephone').attr('placeholder',"手机号只能为数字");
+         learun.layer.loading(true, '手机号只能为数字');
+           setTimeout(function(){
+			           	learun.layer.loading(false);
+			},1000)
+	
+      
+		
+	}
 
-                    page.bind($page);
-                    learun.layer.loading(false);
+		
+})
 
-                }
+         $('.Telephone2').on('blur',function(item){
+        var reg = new RegExp(/^\d{3}-\d{7,8}|\d{4}-\d{7,8}$/)
+	if(!reg.test($(".Telephone2").val())){
 
-            });
+           $(".Telephone2").val("")
+           $('.Telephone2').attr('placeholder',"座机号只能为数字");
+           learun.layer.loading(true, '座机号只能为数字');
+           setTimeout(function(){
+		learun.layer.loading(false);
+            },1000)
+		
+	}
+		
+})
 
+					page.bind($page);
+					learun.layer.loading(false);
+
+				}
+
+			});
+
+			
+			
+	
             //保存
-            $page.find('#saveBtn').on('tap', function () {
-                var postdata = {
-                    ID: $('#ID').val(),
-                    RegionNo: $('#RegionNo').val(),
-                    FamilyAddress: $('#FamilyAddress').val(),
-                    telephone: $('#telephone').val(),
-                    Photo: $('#Photo').val(),
-                    StuInfoFreshFamilyEntities: family(),
-                    StuInfoFreshEmergePeopleEntities: emergePeople()
-                };
+            $page.find('.saveBtn').on('tap', function () {
+
+				var postdata = {
+					ID: $('#ID').val(),
+					RegionNo: $('#RegionNo').val(),
+					FamilyAddress: $('#FamilyAddress').val(),
+					telephone: $('#telephone').val(),
+					Photo: $('#Photo').val(),
+					DepositBank: $('#DepositBank').lrpickerGet(),
+					BankCard: $('#BankCard').val(),
+					BankLocation: $('#BankLocation').val(),
+					StuInfoFreshFamilyEntities: family(),
+					StuInfoFreshEmergePeopleEntities: emergePeople()
+				};
+				//console.log(postdata)
+				 //return
                 learun.layer.loading(true, '正在提交数据');
                 learun.httpget(config.webapi + "StuInfoFresh/saveStuInfoFresh", postdata, (data) => {
                     learun.layer.loading(false);
                     if (data) {
                         learun.layer.toast('保存成功');
-                        location.reload();
+						learun.nav.closeCurrent();
+						learun.nav.go({ path: 'notice2', title: '新生入校流程', type: 'right' });
                     }
                 });
 
             });
 
-
+			page.bind($page);
         },
         bind: function ($page) {
             //性别
@@ -251,7 +333,7 @@
                 $(item).lrpickerSet($(item).attr('value'));
             });
             //与本人关系
-            $.each($page.find('#StuInfoFreshFamily').find('[name="Relation"]'), function (i, item) {
+            $.each($page.find('[name="Relation"]'), function (i, item) {
                 $page.find(item).lrpickerex({
                     code: 'FamilyRelation',
                     type: 'dataItem'
@@ -259,6 +341,19 @@
                 //赋值
                 $(item).lrpickerSet($(item).attr('value'));
             });
+            //开户银行
+			 $page.find('#DepositBank').lrpickerex({
+			 	code: 'DepositBank',
+			 	type: 'dataItem'
+			 });
+            /* $.each($page.find('[name="DepositBank"]'), function (i, item) {
+                $page.find(item).lrpickerex({
+                    code: 'DepositBank',
+                    type: 'dataItem'
+                });
+                //赋值
+                $(item).lrpickerSet($(item).attr('value'));
+            }); */
         }
     };
     //数据处理
@@ -277,6 +372,7 @@
         var list = new Array();
         $.each($('#StuInfoFreshEmergePeople').children('.welCon'), function (i, item) {
             var o = $(item).children(".welConForm").serializeObject();
+			o.Relation = $(item).find('[name="Relation"]').lrpickerGet();
             list.push(o);
         });
         return list;

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/modulelist/modulelist.js

@@ -1,4 +1,4 @@
-(function () {
+(function () {
 
     var page = {
         isScroll: true,

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html

@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script type="text/javascript">
     (function ($, learun) {
         learun.nav.data["workspace"].jsObj = (function () {
 
@@ -113,7 +113,7 @@
                         $desktop.append(_html);
                         chartMap[_item.F_Id] = echarts.init(document.getElementById(_item.F_Id));
 
-                        // 获取后台数据
+                        // // 获取后台数据
                         learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'chart', id: _item.F_Id }, function (data) {
                             if (data) {
                                 var type = $('#' + data.Id).attr('data-desktop');
@@ -221,6 +221,14 @@
                     if (learun.storage.get('pwd') === true) {
                         learun.nav.go({ path: 'my/modifypassword', isBack: false, isHead: true, title:'修改密码' });
                     }
+                    if (learun.storage.get('pwdandnotice') === true) {
+                        learun.nav.go({ path: 'my/modifypasswordandnotice', isBack: false, isHead: true, title: '修改密码' });
+                    }
+					if (learun.storage.get('isUpdStu') === true) {
+						learun.storage.set('isUpdStu',null);
+						learun.nav.go({ path: 'welcome', title: '完善信息', type: 'right' });
+					    //learun.nav.go({ path: 'my/modifypassword', isBack: false, isHead: true, title:'修改密码' });
+					}
                     var _html = '';
                     //          _html += '<div class="scanner">';
                     //          _html += '<i class="iconfont icon-scan"></i>';

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace/workspace.html

@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script type="text/javascript">
     (function ($, learun) {
         learun.nav.data["workspace"].jsObj = (function () {
 
@@ -45,27 +45,27 @@
                     <div class="lr-content" data-desktop="'+ _item.F_Id + '" ></div>\
                 </div>';
                         $desktop.append(_html);
-                        learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'list', id: _item.F_Id }, function (data) {
-                            if (data) {
-                                var $list = $('[data-desktop="' + data.Id + '"]');
-                                $.each(data.value, function (_j, _jitem) {
-                                    var _itemHtml = '\
-                                <div class="lr-list-item lr-dtlist-item">\
-                                    <div class="lr-ellipsis">'+ _jitem.f_title + '</div>\
-                                    <div class="date">'+ learun.date.format(_jitem.f_time, 'yyyy-MM-dd') + '</div>\
-                                </div>';
-                                    var _$itemHtml = $(_itemHtml);
-                                    _$itemHtml[0].item = _jitem;
-                                    $list.append(_$itemHtml);
-                                });
-                                $list.find('.lr-dtlist-item').on('tap', function () {
-                                    var item = $(this)[0].item;
-                                    learun.nav.go({ path: 'workspace/listdetaile', title: '详情', param: item, type: 'right' });
-                                });
+                        // learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'list', id: _item.F_Id }, function (data) {
+                        //     if (data) {
+                        //         var $list = $('[data-desktop="' + data.Id + '"]');
+                        //         $.each(data.value, function (_j, _jitem) {
+                        //             var _itemHtml = '\
+                        //         <div class="lr-list-item lr-dtlist-item">\
+                        //             <div class="lr-ellipsis">'+ _jitem.f_title + '</div>\
+                        //             <div class="date">'+ learun.date.format(_jitem.f_time, 'yyyy-MM-dd') + '</div>\
+                        //         </div>';
+                        //             var _$itemHtml = $(_itemHtml);
+                        //             _$itemHtml[0].item = _jitem;
+                        //             $list.append(_$itemHtml);
+                        //         });
+                        //         $list.find('.lr-dtlist-item').on('tap', function () {
+                        //             var item = $(this)[0].item;
+                        //             learun.nav.go({ path: 'workspace/listdetaile', title: '详情', param: item, type: 'right' });
+                        //         });
 
-                                $list = null;
-                            }
-                        });
+                        //         $list = null;
+                        //     }
+                        // });
                     });
                 }
             }

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/weixinlogin.js

@@ -1,4 +1,4 @@
-function GetQueryString(name) {
+function GetQueryString(name) {
     var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
     var r = window.location.search.substr(1).match(reg);//search,查询？后面的参数，并匹配正则
     if (r != null) return unescape(r[2]); return null;

Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentBLL.cs

@@ -39,7 +39,6 @@ namespace Learun.Application.Organization
                 if (list == null)
                 {
                     list = (List<DepartmentEntity>)departmentService.GetList(companyId);
-                    cache.Write<List<DepartmentEntity>>(cacheKey + companyId, list, CacheId.department);
                 }
                 return list;
             }
@@ -68,7 +67,7 @@ namespace Learun.Application.Organization
                 List<DepartmentEntity> list = GetList(companyId);
                 if (!string.IsNullOrEmpty(keyWord))
                 {
-                    list = list.FindAll(t => t.F_FullName.Contains(keyWord) || t.F_EnCode.Contains(keyWord) || t.F_ShortName.Contains(keyWord));
+                    list = list.FindAll(t => (!string.IsNullOrEmpty(t.F_FullName) && t.F_FullName.Contains(keyWord)) || (!string.IsNullOrEmpty(t.F_EnCode) && t.F_EnCode.Contains(keyWord)) || (!string.IsNullOrEmpty(t.F_ShortName) && t.F_ShortName.Contains(keyWord)));
                 }
                 return list;
             }

Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentService.cs

@@ -63,7 +63,7 @@ namespace Learun.Application.Organization
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(fieldSql);
-                strSql.Append(" FROM LR_Base_Department t WHERE t.F_EnabledMark = 1 AND t.F_DeleteMark = 0 ");
+                strSql.Append(" FROM LR_Base_Department t WHERE t.F_EnabledMark = 1 AND t.F_DeleteMark = 0 order by F_Order");
                 return this.BaseRepository().FindList<DepartmentEntity>(strSql.ToString());
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleBLL.cs

@@ -233,5 +233,47 @@ namespace Learun.Application.Organization
 
         }
         #endregion
+
+        #region 扩展数据
+        /// <summary>
+        /// 获取树形数据
+        /// </summary>
+        /// <param name="parentId">父级id</param>
+        /// <returns></returns>
+        public List<TreeModel> GetTree(string parentId)
+        {
+            try
+            {
+                List<RoleEntity> list = GetList();
+                List<TreeModel> treeList = new List<TreeModel>();
+                foreach (var item in list)
+                {
+                    TreeModel node = new TreeModel
+                    {
+                        id = item.F_RoleId,
+                        text = item.F_FullName,
+                        value = item.F_RoleId,
+                        showcheck = false,
+                        checkstate = 0,
+                        isexpand = true,
+                        parentId = item.F_RoleId
+                    };
+                    treeList.Add(node);
+                }
+                return treeList;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleIBLL.cs

@@ -59,5 +59,16 @@ namespace Learun.Application.Organization
         void SaveEntity(string keyValue, RoleEntity roleEntity);
         string GetIdByRoleName(string v);
         #endregion
+
+        #region 扩展数据
+        /// <summary>
+        /// userRelationIBLL.GetUserIdList(objectId);
+        /// </summary>
+        /// <param name="parentId">父级id</param>
+        /// <returns></returns>
+        List<TreeModel> GetTree(string parentId);
+
+
+        #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs

@@ -382,6 +382,27 @@ namespace Learun.Application.Organization
                 }
             }
         }
+
+        public UserEntity GetEntityByMobile(string mobile)
+        {
+            try
+            {
+                UserEntity userEntity;
+                userEntity = userService.GetEntityByMobile(mobile);
+                return userEntity;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取实体,通过用户账号
         /// </summary>
@@ -408,6 +429,31 @@ namespace Learun.Application.Organization
             }
         }
         /// <summary>
+        /// 获取实体,通过身份证号
+        /// </summary>
+        /// <param name="idcard">身份证号</param>
+        /// <returns></returns>
+        public UserEntity GetEntityByIdCard(string idcard)
+        {
+            try
+            {
+                UserEntity userEntity;
+                userEntity = userService.GetEntityByIdCard(idcard);
+                return userEntity;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
         /// 获取实体,通过用户名
         /// </summary>
         /// <param name="account">用户账号</param>
@@ -451,7 +497,28 @@ namespace Learun.Application.Organization
                 }
             }
         }
-
+        /// <summary>
+        /// 记录已登录标记
+        /// </summary>
+        /// <param name="id"></param>
+        public void UpdateHaveLogMark(string id)
+        {
+            try
+            {
+                userService.UpdateHaveLogMark(id);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取用户数据
         /// </summary>
@@ -853,6 +920,65 @@ namespace Learun.Application.Organization
                 }
             }
         }
+        /// <summary>
+        /// 修改用户登录密码身份证后8位
+        /// </summary>
+        /// <param name="newPassword">新密码（MD5 小写）</param>
+        /// <param name="oldPassword">旧密码（身份证后8位）</param>
+        public bool RevisePasswordiden(string newPassword, string oldPassword)
+        {
+            try
+            {
+                UserInfo userInfo = LoginUserInfo.Get();
+                cache.Remove(cacheKeyId + userInfo.userId, CacheId.user);
+                cache.Remove(cacheKeyAccount + userInfo.account, CacheId.user);
+
+                var entity = userService.GetEntity(userInfo.userId);
+                if (oldPassword == entity.F_IdentityCardNo.Substring(entity.F_IdentityCardNo.Length - 8, 8))
+                {
+                    userService.RevisePassword(userInfo.userId, newPassword);
+                }
+                else
+                {
+                    return false;
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public void FirstRevisePassword(string password)
+        {
+            try
+            {
+                UserInfo userInfo = LoginUserInfo.Get();
+                cache.Remove(cacheKeyId + userInfo.userId, CacheId.user);
+                cache.Remove(cacheKeyAccount + userInfo.account, CacheId.user);
+                userService.RevisePassword(userInfo.userId, password);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 重置密码
         /// </summary>
@@ -871,7 +997,7 @@ namespace Learun.Application.Organization
                 {
                     cache.Remove(cacheKeyId + item, CacheId.user);
                 }
-                string password = Md5Helper.Encrypt(ConfigurationManager.AppSettings["defaultpwd"], 32).ToLower();
+                string password = Md5Helper.Encrypt(ConfigurationManager.AppSettings["pwdprex"] + ConfigurationManager.AppSettings["pwdsuff"], 32).ToLower();
                 userService.RevisePasswordBatch(keyValue, password);
             }
             catch (Exception ex)
@@ -1004,6 +1130,29 @@ namespace Learun.Application.Organization
                 }
             }
         }
+        /// <summary>
+        /// 修改手机号
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="mobile"></param>
+        public void UpdateMobile(string keyValue, string mobile)
+        {
+            try
+            {
+                userService.UpdateMobile(keyValue, mobile);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
         #region  验证数据
@@ -1064,7 +1213,7 @@ namespace Learun.Application.Organization
                 {
                     userEntity = new UserEntity()
                     {
-                        LoginMsg = "账户不存在!",
+                        LoginMsg = "账户或密码错误!",
                         LoginOk = false
                     };
                     return userEntity;
@@ -1086,7 +1235,7 @@ namespace Learun.Application.Organization
                         }
                         else
                         {
-                            userEntity.LoginMsg = "密码和账户名不匹配!";
+                            userEntity.LoginMsg = "账户或密码错误!";
                         }
                     }
                 }
@@ -1108,6 +1257,76 @@ namespace Learun.Application.Organization
                 }
             }
         }
+
+        /// <summary>
+        /// 验证登录
+        /// </summary>
+        /// <param name="account">身份证号</param>
+        /// <param name="password">密码</param>
+        /// <returns></returns>
+        public UserEntity CheckLoginByIdCard(string account, string password)
+        {
+            try
+            {
+                UserEntity userEntity = GetEntityByIdCard(account);
+                if (userEntity == null)
+                {
+                    userEntity = new UserEntity()
+                    {
+                        LoginMsg = "账户不存在!",
+                        LoginOk = false
+                    };
+                    return userEntity;
+                }
+                else if (userEntity.F_Description != "学生")
+                {
+                    userEntity = new UserEntity()
+                    {
+                        LoginMsg = "您非学生，不可用此种方式登录!",
+                        LoginOk = false
+                    };
+                    return userEntity;
+                }
+                else
+                {
+
+                }
+
+                userEntity.LoginOk = false;
+                if (userEntity.F_EnabledMark == 1)
+                {
+                    if (userEntity.F_IdentityCardNo.Length <= 8)
+                    {
+                        userEntity.LoginMsg = "身份证输入有误!";
+                    }
+                    else if (password == userEntity.F_IdentityCardNo.Substring(userEntity.F_IdentityCardNo.Length - 8, 8))
+                    {
+                        userEntity.LoginOk = true;
+                    }
+                    else
+                    {
+                        userEntity.LoginMsg = "密码和账户名不匹配!";
+                    }
+                }
+                else
+                {
+                    userEntity.LoginMsg = "账户被系统锁定,请联系管理员!";
+                }
+                return userEntity;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取用户头像
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserEntity.cs

@@ -233,6 +233,18 @@ namespace Learun.Application.Organization
         [Column("PERSIGNATURE")]
         public string PerSignature { get; set; }
 
+        [Column("F_ORDER")]
+        public int? F_Order { get; set; }
+        /// <summary>
+        /// 修改密码日期
+        /// </summary>	
+        [Column("F_MODIFYPWDDATE")]
+        public DateTime? F_ModifyPwdDate { get; set; }
+        /// <summary>
+        /// 是否已登录标记
+        /// </summary>	
+        [Column("F_HAVELOGMARK")]
+        public bool? F_HaveLogMark { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserIBLL.cs

@@ -69,6 +69,8 @@ namespace Learun.Application.Organization
         /// </summary>
         /// <returns></returns>
         void GetExportListOfStudent();
+
+        UserEntity GetEntityByMobile(string mobile);
         /// <summary>
         /// 获取实体,通过用户账号
         /// </summary>
@@ -153,6 +155,12 @@ namespace Learun.Application.Organization
         /// 解绑微信
         /// </summary>
         void DoUnbundWeiXin(string keyValue);
+        /// <summary>
+        /// 修改手机号
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="mobile"></param>
+        void UpdateMobile(string keyValue, string mobile);
         #endregion
 
         #region  验证数据
@@ -174,6 +182,13 @@ namespace Learun.Application.Organization
         /// <returns></returns>
         UserEntity CheckLogin(string username, string password);
         /// <summary>
+        /// 验证登录 F_UserOnLine 0 不成功,1成功
+        /// </summary>
+        /// <param name="username">账号</param>
+        /// <param name="password">密码</param>
+        /// <returns></returns>
+        UserEntity CheckLoginByIdCard(string username, string password);
+        /// <summary>
         /// 获取用户头像
         /// </summary>
         /// <param name="userId">用户ID</param>
@@ -193,7 +208,26 @@ namespace Learun.Application.Organization
         IEnumerable<UserEntity> GetAdminList();
 
         void UpdateIp(string ip, string id);
+        /// <summary>
+        /// 记录已登录标记
+        /// </summary>
+        /// <param name="id"></param>
+        void UpdateHaveLogMark(string id);
         void GetImgForDC(string userId);
         UserEntity GetEntityByWeixinOpenIdPC(string openId);
+
+        /// <summary>
+        /// 通过身份证后8位修改密码
+        /// </summary>
+        /// <param name="newPassword"></param>
+        /// <param name="oldPassword"></param>
+        /// <returns></returns>
+        bool RevisePasswordiden(string newPassword, string oldPassword);
+
+        /// <summary>
+        /// 直接修改密码
+        /// </summary>
+        /// <param name="password"></param>
+        void FirstRevisePassword(string password);
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs

@@ -2,6 +2,7 @@
 using Learun.Util;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Data;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -26,6 +27,32 @@ namespace Learun.Application.Organization
         #endregion
 
         #region  获取数据
+        public UserEntity GetEntityByMobile(string mobile)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldSql);
+                strSql.Append(" FROM LR_Base_User t ");
+                strSql.Append(" WHERE t.F_Mobile = @account AND t.F_DeleteMark = 0  ");
+                return this.BaseRepository().FindEntity<UserEntity>(strSql.ToString(), new
+                {
+                    account = mobile
+                });
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取实体,通过用户账号
         /// </summary>
@@ -78,6 +105,31 @@ namespace Learun.Application.Organization
                 }
             }
         }
+
+        /// <summary>
+        /// 获取实体,通过身份证号
+        /// </summary>
+        /// <param name="idcard">身份证号</param>
+        /// <returns></returns>
+        public UserEntity GetEntityByIdCard(string idcard)
+        {
+            try
+            {
+                return this.BaseRepository()
+                    .FindEntity<UserEntity>(a => a.F_IdentityCardNo.Equals(idcard) && a.F_DeleteMark == 0);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 用户列表(根据公司主键)
         /// </summary>
@@ -490,6 +542,7 @@ namespace Learun.Application.Organization
                 userEntity.Modify(keyValue);
                 userEntity.F_Secretkey = Md5Helper.Encrypt(CommonHelper.CreateNo(), 16).ToLower();
                 userEntity.F_Password = Md5Helper.Encrypt(DESEncrypt.Encrypt(password, userEntity.F_Secretkey).ToLower(), 32).ToLower();
+                userEntity.F_ModifyPwdDate = DateTime.Now;
                 this.BaseRepository().Update(userEntity);
             }
             catch (Exception ex)
@@ -517,16 +570,33 @@ namespace Learun.Application.Organization
                 foreach (var item in keyValue.Split(','))
                 {
                     UserEntity userEntity = new UserEntity();
-                    userEntity.Modify(item);
-                    userEntity.F_Secretkey = Md5Helper.Encrypt(CommonHelper.CreateNo(), 16).ToLower();
-                    userEntity.F_Password = Md5Helper.Encrypt(DESEncrypt.Encrypt(password, userEntity.F_Secretkey).ToLower(), 32).ToLower();
-                    db.Update(userEntity);
+                    UserEntity userModel = this.BaseRepository().FindEntity<UserEntity>(x => x.F_UserId == item);
+                    if (userModel != null)
+                    {
+                        userEntity.Modify(userModel.F_UserId);
+                        userEntity.F_Secretkey = Md5Helper.Encrypt(CommonHelper.CreateNo(), 16).ToLower();
+                        if (!string.IsNullOrEmpty(userModel.F_IdentityCardNo) && userModel.F_IdentityCardNo.Length >= 6)
+                        {
+                            //密码规则：前缀+身份证后6位
+                            password = Md5Helper.Encrypt(ConfigurationManager.AppSettings["pwdprex"] + userModel.F_IdentityCardNo.Substring(userModel.F_IdentityCardNo.Length - 6, 6), 32).ToLower();
+                        }
+                        userEntity.F_Password = Md5Helper.Encrypt(DESEncrypt.Encrypt(password, userEntity.F_Secretkey).ToLower(), 32).ToLower();
+                        db.Update(userEntity);
+                    }
                 }
                 db.Commit();
             }
             catch (Exception ex)
             {
                 db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
             }
         }
         /// <summary>
@@ -599,8 +669,19 @@ namespace Learun.Application.Organization
         {
             try
             {
-                var ids = departmentId.Split(',');
-                return this.BaseRepository().FindList<UserEntity>(a => ids.Contains(a.F_DepartmentId)).ToList();
+                if (string.IsNullOrEmpty(departmentId))
+                {
+                    return new List<UserEntity>();
+                }
+                if (departmentId.IndexOf(',') == -1)
+                {
+                    return this.BaseRepository().FindList<UserEntity>(a => a.F_DepartmentId == departmentId && a.F_DeleteMark == 0).ToList();
+                }
+                else
+                {
+                    var ids = departmentId.Split(',');
+                    return this.BaseRepository().FindList<UserEntity>(a => ids.Contains(a.F_DepartmentId) && a.F_DeleteMark == 0).ToList();
+                }
             }
             catch (Exception ex)
             {
@@ -792,7 +873,45 @@ namespace Learun.Application.Organization
                 }
             }
         }
-
+        /// <summary>
+        /// 修改手机号
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="mobile"></param>
+        public void UpdateMobile(string keyValue, string mobile)
+        {
+            try
+            {
+                var userEntity = this.BaseRepository().FindEntity<UserEntity>(keyValue);
+                if (userEntity != null)
+                {
+                    userEntity.F_Mobile = mobile;
+                    userEntity.Modify(keyValue);
+                    this.BaseRepository().Update(userEntity);
+                    if (userEntity.F_Description == "学生")
+                    {
+                        //修改学籍手机号
+                        this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuInfoBasic set mobile='{mobile}' where StuNo='{userEntity.F_Account}' ");
+                    }
+                    else if (userEntity.F_Description == "教师")
+                    {
+                        //修改教师手机号
+                        this.BaseRepository("CollegeMIS").ExecuteBySql($"update EmpInfo set mobile='{mobile}' where EmpNo='{userEntity.F_Account}' ");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         public void UpdateIp(string ip, string id)
         {
             try
@@ -811,6 +930,28 @@ namespace Learun.Application.Organization
                 }
             }
         }
+        /// <summary>
+        /// 记录已登录标记
+        /// </summary>
+        /// <param name="id"></param>
+        public void UpdateHaveLogMark(string id)
+        {
+            try
+            {
+                this.BaseRepository().ExecuteBySql("update LR_Base_User set F_HaveLogMark=1 where F_UserId='" + id + "' ");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
 
         /// <summary>
         /// 获取用户头像，取empinfo照片

Learun.Framework.Ultimate V7/Learun.Application.Organization/app.config

@@ -18,6 +18,10 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

Learun.Framework.Ultimate V7/Learun.Application.Web/App_Start/01 Handler/FinaChargeOperatorHelper.cs

@@ -0,0 +1,47 @@
+using Learun.Util.Operat;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using Learun.Application.TwoDevelopment;
+using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement;
+
+namespace Learun.Application.Web
+{
+    public class FinaChargeOperatorHelper
+    {
+
+        private static FinaChargeLogService finaChargeLogService = new FinaChargeLogService();
+        public static FinaChargeOperatorHelper Instance
+        {
+            get { return new FinaChargeOperatorHelper(); }
+        }
+        public void WriteOperateLog(OperateLogModel operateLogModel)
+        {
+            try
+            {
+                if (operateLogModel.userInfo == null)
+                {
+                    operateLogModel.userInfo = LoginUserInfo.Get();
+                }
+                FinaChargeLogEntity logEntity = new FinaChargeLogEntity();
+                logEntity.F_CategoryId = 3;
+                logEntity.F_OperateTypeId = ((int)operateLogModel.type).ToString();
+                logEntity.F_OperateType = EnumAttribute.GetDescription(operateLogModel.type);
+                logEntity.F_OperateAccount = operateLogModel.userInfo?.account + "(" + operateLogModel.userInfo.realName + ")";
+                logEntity.F_OperateUserId = operateLogModel.userInfo?.userId;
+                logEntity.F_Module = operateLogModel.title;
+                logEntity.F_ExecuteResult = 1;
+                logEntity.F_ExecuteResultJson = "访问地址：" + operateLogModel.url;
+                logEntity.F_SourceObjectId = operateLogModel.sourceObjectId;
+                logEntity.F_SourceContentJson = operateLogModel.sourceContentJson;
+                logEntity.F_Description = "PC端";
+                finaChargeLogService.WriteLog(logEntity);
+            }
+            catch (Exception)
+            {
+            }
+        }
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/App_Start/01 Handler/MvcControllerBase.cs

@@ -101,6 +101,26 @@ namespace Learun.Application.Web
             return Content(new ResParameter { code = ResponseCode.success, info = info, data = new object { } }.ToJson());
         }
 
+
+        /// <summary>
+        /// 带操作日志
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        protected virtual ActionResult Success_FinaCharge(string info, string title, OperationType type, string keyValue, string content)
+        {
+            OperateLogModel operateLogModel = new OperateLogModel();
+            operateLogModel.title = title;
+            operateLogModel.type = type;
+            operateLogModel.url = (string)WebHelper.GetHttpItems("currentUrl");
+            operateLogModel.sourceObjectId = keyValue;
+            operateLogModel.sourceContentJson = content;
+
+            FinaChargeOperatorHelper.Instance.WriteOperateLog(operateLogModel);
+
+            return Content(new ResParameter { code = ResponseCode.success, info = info, data = new object { } }.ToJson());
+        }
+
         /// <summary>
         /// 返回失败消息
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js

@@ -121,12 +121,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '民族', name: 'Nation', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'nationalityno',
+                                code: 'National',
                                 callback: function (_data) {
-                                    callback(_data['nationality']);
+                                    callback(_data.text);
                                 }
                             });
                         }
@@ -134,12 +133,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js

@@ -117,12 +117,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '民族', name: 'Nation', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'nationalityno',
+                                code: 'National',
                                 callback: function (_data) {
-                                    callback(_data['nationality']);
+                                    callback(_data.text);
                                 }
                             });
                         }
@@ -130,12 +129,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateForm.js

@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $("#SexId").lrDataItemSelect({ code: 'usersex' });
-            $('#Nation').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
+            $("#Nation").lrDataItemSelect({ code: 'National' });
             $('#PhotoUrl').lrUploader();
             $('#Province').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
@@ -56,7 +56,7 @@ var bootstrap = function ($, learun) {
             $('#Country').lrselect({
                 value: 'ACODE', text: 'ANAME'
             });
-            $('#PoliticsFace').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $("#PoliticsFace").lrDataItemSelect({ code: 'BCdPartyFace' });
             $("#OriginId").lrDataItemSelect({ code: 'ResidenceNo' });
             $("#DataSource").lrDataItemSelect({ code: 'AdmissionsDataSource' });
             $("#ExamineTypeId").lrDataItemSelect({ code: 'ExamineType' });
@@ -148,13 +148,11 @@ var bootstrap = function ($, learun) {
                         label: '政治面貌', name: 'PoliticalId', width: 100, align: 'left'
                         , edit: {
                             type: 'select',
-                            datatype: 'dataSource',
-                            code: 'BCdPartyFace',
-                            op: {
-                                value: 'partyfaceno',
-                                text: 'partyface',
-                                title: 'partyface'
-                            }
+                            init: function (data, $edit) {
+
+                            },
+                            datatype: 'dataItem',
+                            code: 'BCdPartyFace'
                         }
                     },
                     {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js

@@ -189,12 +189,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '民族', name: 'Nation', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'nationalityno',
+                                code: 'National',
                                 callback: function (_data) {
-                                    callback(_data['nationality']);
+                                    callback(_data.text);
                                 }
                             });
                         }
@@ -202,12 +201,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js

@@ -119,12 +119,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '民族', name: 'Nation', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'nationalityno',
+                                code: 'National',
                                 callback: function (_data) {
-                                    callback(_data['nationality']);
+                                    callback(_data.text);
                                 }
                             });
                         }
@@ -132,12 +131,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Controllers/Ask_MainController.cs

@@ -102,7 +102,7 @@ namespace Learun.Application.Web.Areas.Ask.Controllers
         public ActionResult Form()
         {
             ViewBag.VSerial = "Table_" + CommonHelper.CreateNo();
-            var xnxq = Common.GetSemesterAndYear();
+            var xnxq = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear();
             ViewBag.AcademicYearNo = xnxq.AcademicYearShort;
             ViewBag.Semester = xnxq.Semester;
             return View();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Controllers/Ask_MainOfTeacherController.cs

@@ -0,0 +1,247 @@
+using System;
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.Ask;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+
+namespace Learun.Application.Web.Areas.Ask.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-04-23 15:50
+    /// 描 述：教师问卷管理
+    /// </summary>
+    public class Ask_MainOfTeacherController : MvcControllerBase
+    {
+        private Ask_MainOfTeacherIBLL ask_MainOfTeacherIBLL = new Ask_MainOfTeacherBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+
+        [HttpGet]
+        public ActionResult AnswerIndex()
+        {
+            return View();
+        }
+
+        [HttpGet]
+        public ActionResult TeacherIndex()
+        {
+            var logininfo = LoginUserInfo.Get();
+            ViewBag.EmpNo = logininfo.account;
+            ViewBag.EmpName = logininfo.realName;
+            return View();
+        }
+        [HttpGet]
+        public ActionResult AnswerQuery()
+        {
+            return View();
+        }
+
+        [HttpGet]
+        public ActionResult Paper(string VID)
+        {
+            ViewBag.EmpNo = LoginUserInfo.Get().account;
+            ViewBag.EmpName = LoginUserInfo.Get().realName;
+            if (!string.IsNullOrEmpty(VID))
+            {
+                var Ask_MainOfTeacher = ask_MainOfTeacherIBLL.GetAsk_MainOfTeacherEntityAndQuestions(VID);
+                return View(Ask_MainOfTeacher);
+            }
+            else
+            {
+                return View();
+            }
+        }
+        [HttpGet]
+        public ActionResult PaperAdminView(string VID)
+        {
+            ViewBag.EmpNo = LoginUserInfo.Get().account;
+            ViewBag.EmpName = LoginUserInfo.Get().realName;
+            if (!string.IsNullOrEmpty(VID))
+            {
+                var Ask_MainOfTeacher = ask_MainOfTeacherIBLL.GetAsk_MainOfTeacherEntityAndQuestions(VID);
+                return View(Ask_MainOfTeacher);
+            }
+            else
+            {
+                return View();
+            }
+        }
+        [HttpGet]
+        public ActionResult PaperView(string VID,string EmpNo)
+        {
+            if (!string.IsNullOrEmpty(VID))
+            {
+                var Ask_MainOfTeacher = ask_MainOfTeacherIBLL.GetAsk_MainOfTeacherEntityAndQuestionsResult(VID, EmpNo);
+                return View(Ask_MainOfTeacher);
+            }
+            else
+            {
+                return View();
+            }
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            ViewBag.VSerial = "Table_" + CommonHelper.CreateNo();
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = ask_MainOfTeacherIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetTeacherPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = ask_MainOfTeacherIBLL.GetTeacherPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetAnswerPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = ask_MainOfTeacherIBLL.GetTeacherPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var Ask_MainOfTeacherData = ask_MainOfTeacherIBLL.GetAsk_MainOfTeacherEntity(keyValue);
+            var jsonData = new
+            {
+                Ask_MainOfTeacher = Ask_MainOfTeacherData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            ask_MainOfTeacherIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult SubmitForm(string keyValue)
+        {
+            ask_MainOfTeacherIBLL.ChangeFormStatus(keyValue, true);
+            return Success("操作成功！");
+        }
+
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult UnSubmitForm(string keyValue)
+        {
+            ask_MainOfTeacherIBLL.ChangeFormStatus(keyValue, false);
+            return Success("操作成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            var userinfo = LoginUserInfo.Get();
+            Ask_MainOfTeacherEntity entity = strEntity.ToObject<Ask_MainOfTeacherEntity>();
+            entity.UID = userinfo.userId;
+            entity.UName = userinfo.realName;
+            entity.VCreateTime = DateTime.Now;
+            entity.Status = false;
+            entity.SPVNum = 0;
+            entity.SPNum = 0;
+            entity.SClick = 0;
+            ask_MainOfTeacherIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        [ValidateInput(false)]
+        public ActionResult TeacherSubmitForm(string answerlist,string VID)
+        {
+            var userinfo = LoginUserInfo.Get();
+            List<Ask_QuestionResultEntity> entity = answerlist.ToObject<List<Ask_QuestionResultEntity>>();
+            ask_MainOfTeacherIBLL.SaveAsk_QuestionResultEntity(entity, VID,userinfo.account,userinfo.realName, userinfo.iPAddress);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerIndex.cshtml

@@ -0,0 +1,38 @@
+@{
+    ViewBag.Title = "教师问卷管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="EmpName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">编号</div>
+                                    <input id="EmpNo" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-building-o"></i>&nbsp;查看答卷</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/AnswerIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerIndex.js

@@ -0,0 +1,88 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-04-23 15:50
+ * 描  述：教师问卷管理
+ */
+var refreshGirdData;
+var VID = request("VID");
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 答题情况
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                var EmpNo = $('#gridtable').jfGridValue('EmpNo');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('IsAnswer');
+                    if (Status === false || Status === 'false') {
+                        learun.alert.warning("当前项目未交卷！");
+                        return;
+                    }
+                    learun.frameTab.open({ F_ModuleId: 'paper' + keyValue, F_Icon: 'fa fa-window-maximize', F_FullName: '量表考核答卷', F_UrlAddress: '/Ask/Ask_MainOfTeacher/PaperView?VID=' + keyValue + '&EmpNo=' + EmpNo });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/GetAnswerPageList',
+                headData: [
+                    { label: "姓名", name: "EmpName", width: 80, align: "left" },
+                    { label: "编号", name: "EmpNo", width: 80, align: "left" },
+                    {
+                        label: "性别", name: "GenderNo", width: 80, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue.toLowerCase() === true || cellvalue.toLowerCase() == "true" ? "男" : "女";
+                        }
+                    },
+                    {
+                        label: "考核部门", name: "DepartmentId", width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "是否交卷", name: "IsAnswer", width: 80, align: "left", formatter: function (cellvalue) {
+                            return cellvalue === true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }
+                    },
+                    { label: "得分", name: "TotalScore", width: 80, align: "left" }
+                ],
+                mainId: 'EmpNo',
+                isPage: true,
+                sidx: 'TotalScore',
+                sord: 'DESC'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.VID = VID;
+            param.Manager = true;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerQuery.cshtml

@@ -0,0 +1,46 @@
+@{
+    ViewBag.Title = "教师问卷管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">标题</div>
+                                    <input id="VTitle" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">问卷编号</div>
+                                    <input id="VSerial" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录入</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_question" class="btn btn-default"><i class="fa fa-navicon"></i>&nbsp;管理问题</a>
+                        <a id="lr_answer" class="btn btn-default"><i class="fa fa-building-o"></i>&nbsp;答题情况</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp; 审核</a>
+                        <a id="lr_unsubmit" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp; 去审核</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/AnswerQuery.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/AnswerQuery.js

@@ -0,0 +1,217 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-04-23 15:50
+ * 描  述：教师问卷管理
+ */
+var refreshGirdData;
+var ATId;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.inittree();
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                if (!ATId) {
+                    learun.alert.warning('请选择分类！');
+                    return false;
+                }
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/Form?ATId=' + ATId,
+                    width: 780,
+                    height: 560,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status === true || Status == 'true') {
+                        learun.alert.warning("当前项目已审核不能修改！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/Form?keyValue=' + keyValue,
+                        width: 780,
+                        height: 560,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status === true || Status == 'true') {
+                        learun.alert.warning("当前项目已审核不能删除！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 管理问题
+            $('#lr_question').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status === true || Status == 'true') {
+                        learun.alert.warning("当前项目已审核不能修改！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'formquestion',
+                        title: '管理问题',
+                        url: top.$.rootUrl + '/Ask/Ask_Question/Index?VID=' + keyValue,
+                        width: 980,
+                        height: 760,
+                        btn:null
+                    });
+                }
+            });
+            // 答题情况
+            $('#lr_answer').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formanswer',
+                        title: '答题情况',
+                        url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/AnswerIndex?VID=' + keyValue,
+                        width: 980,
+                        height: 760,
+                        btn:null
+                    });
+                }
+            });
+            //  审核
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status === true || Status == 'true') {
+                        learun.alert.warning("当前项目已审核！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认审核该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/SubmitForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //  去审核
+            $('#lr_unsubmit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status !== true && Status !== 'true') {
+                        learun.alert.warning("当前项目已去审核！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认去审核该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/UnSubmitForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        inittree: function () {
+            $('#companyTree').lrtree({
+                url: top.$.rootUrl + '/Ask/Ask_Type/GetAllTree',
+                nodeClick: page.treeNodeClick
+            });
+        },
+        treeNodeClick: function (item) {
+            ATId = item.id;
+            $('#titleinfo').text(item.text);
+            page.search();
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/GetPageList',
+                headData: [
+                    { label: "问卷编号", name: "VSerial", width: 180, align: "left" },
+                    { label: "标题", name: "VTitle", width: 200, align: "left" },
+                    {
+                        label: "类别", name: "ATId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ask_Type',
+                                key: value,
+                                keyId: 'atid',
+                                callback: function (_data) {
+                                    callback(_data['atname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "开始时间", name: "VStartTime", width: 100, align: "left" },
+                    { label: "结束时间", name: "VStopTime", width: 100, align: "left" },
+                    { label: "考核部门", name: "DepartmentIdsName", width: 150, align: "left" },
+                    { label: "考核人数", name: "SPVNum", width: 80, align: "left" },
+                    { label: "填写人数", name: "SPNum", width: 80, align: "left" },
+                    { label: "点击热度", name: "SClick", width: 80, align: "left" },
+                    { label: "排序", name: "VOrder", width: 80, align: "left" },
+                    {
+                        label: "是否匿名", name: "VHide", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }
+                    },
+                    {
+                        label: "审核标志", name: "Status", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }
+                    }
+                ],
+                mainId: 'VID',
+                isPage: true,
+                sidx:'VOrder'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.ATId = ATId;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Form.cshtml

@@ -0,0 +1,48 @@
+@{
+    ViewBag.Title = "教师问卷管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<script type="text/javascript">
+    var NewVSerial = "@ViewBag.VSerial";
+</script>
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item"  data-table="Ask_MainOfTeacher" >
+        <div class="lr-form-item-title">问卷编号</div>
+        <input id="VSerial" type="text" class="form-control"  readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="Ask_MainOfTeacher" >
+        <div class="lr-form-item-title">标题<font face="宋体">*</font></div>
+        <input id="VTitle" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ask_MainOfTeacher">
+        <div class="lr-form-item-title">类别<font face="宋体">*</font></div>
+        <div id="ATId" isvalid="yes" checkexpession="NotNull"></div>
+        <input id="ATName"   type="hidden" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="Ask_MainOfTeacher" >
+        <div class="lr-form-item-title">排序<font face="宋体">*</font></div>
+        <input id="VOrder" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="Ask_MainOfTeacher" >
+        <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
+        <input id="VStartTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'VStopTime\')}',dateFmt:'yyyy-MM-dd',onpicked: function () { $('#VStartTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="Ask_MainOfTeacher" >
+        <div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
+        <input id="VStopTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'VStartTime\')}',dateFmt:'yyyy-MM-dd',onpicked: function () { $('#VStopTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ask_MainOfTeacher">
+        <div class="lr-form-item-title">考核部门</div>
+        <div id="DepartmentIds"></div>
+        <input id="DepartmentIdsName" type="hidden" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="Ask_MainOfTeacher" >
+        <div class="lr-form-item-title">是否匿名<font face="宋体">*</font></div>
+        <div id="VHide" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="Ask_MainOfTeacher" >
+        <div class="lr-form-item-title">备注说明</div>
+        <textarea id="VContent" class="form-control" style="height:150px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Form.js

@@ -0,0 +1,73 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-04-23 15:50
+ * 描  述：教师问卷管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var pATId = request("ATId");
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#ATId').lrselect({
+                type: 'tree',
+                // 展开最大高度
+                maxHeight: 200,
+                // 是否允许搜索
+                allowSearch: true,
+                // 访问数据接口地址
+                url: top.$.rootUrl + '/Ask/Ask_Type/GetAllTree',
+                select: function(item) {
+                    if (item != null && item != undefined) {
+                        $("#ATName").val(item.text);
+                    }
+                }
+            });
+            if (!!pATId) {
+                $('#ATId').lrselectSet(pATId);
+            }
+            $('#DepartmentIds').lrDepartmentSelect({ type: 'treemultiple' });
+            $('#VHide').lrDataItemSelect({ code: 'YesOrNoBit' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/GetFormData?keyValue=' + keyValue,
+                    function (data) {
+                        for (var id in data) {
+                            if (!!data[id].length && data[id].length > 0) {
+                                $('#' + id).jfGridSet('refreshdata', data[id]);
+                            } else {
+                                $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                            }
+                        }
+                    });
+            } else {
+                $("#VSerial").val(NewVSerial);
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        $("#DepartmentIdsName").val($("#DepartmentIds").find(".lr-select-placeholder").text());
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Index.cshtml

@@ -0,0 +1,57 @@
+@{
+    ViewBag.Title = "教师问卷管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout lr-layout-left-center" id="lr_layout">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title lrlt ">分类</div>
+            <div id="companyTree" class="lr-layout-body"></div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">
+                <span id="titleinfo" class="lrlt">未选择分类</span> - <span class="lrlt">分类信息</span>
+            </div>
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">标题</div>
+                                    <input id="VTitle" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">问卷编号</div>
+                                    <input id="VSerial" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录入</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_question" class="btn btn-default"><i class="fa fa-navicon"></i>&nbsp;管理问题</a>
+                        <a id="lr_answer" class="btn btn-default"><i class="fa fa-building-o"></i>&nbsp;答题情况</a>
+                        <a id="lr_analysis" class="btn btn-default"><i class="fa fa-building-o"></i>&nbsp;结果分析</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看问卷</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp; 审核</a>
+                        <a id="lr_unsubmit" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp; 去审核</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Index.js

@@ -0,0 +1,237 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-04-23 15:50
+ * 描  述：教师问卷管理
+ */
+var refreshGirdData;
+var ATId;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.inittree();
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                if (!ATId) {
+                    learun.alert.warning('请选择分类！');
+                    return false;
+                }
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/Form?ATId=' + ATId,
+                    width: 780,
+                    height: 560,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status === true || Status == 'true') {
+                        learun.alert.warning("当前项目已审核不能修改！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/Form?keyValue=' + keyValue,
+                        width: 780,
+                        height: 560,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status === true || Status == 'true') {
+                        learun.alert.warning("当前项目已审核不能删除！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 管理问题
+            $('#lr_question').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status === true || Status == 'true') {
+                        learun.alert.warning("当前项目已审核不能修改！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'formquestion',
+                        title: '管理问题',
+                        url: top.$.rootUrl + '/Ask/Ask_Question/Index?VID=' + keyValue,
+                        width: 980,
+                        height: 760,
+                        btn: null
+                    });
+                }
+            });
+            // 结果分析
+            $('#lr_analysis').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formanalysis',
+                        title: '结果分析',
+                        url: top.$.rootUrl + '/Ask/Ask_Question/AnalysisIndex?VID=' + keyValue,
+                        width: 1000,
+                        height: 760,
+                        btn: null
+                    });
+                }
+            });
+            // 答题情况
+            $('#lr_answer').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formanswer',
+                        title: '答题情况',
+                        url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/AnswerIndex?VID=' + keyValue,
+                        width: 980,
+                        height: 760,
+                        btn: null
+                    });
+                }
+            });
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    top.learun.frameTab.open({ F_ModuleId: 'paper' + keyValue, F_Icon: 'fa fa-window-maximize', F_FullName: '量表考核答卷', F_UrlAddress: '/Ask/Ask_MainOfTeacher/PaperAdminView?VID=' + keyValue });
+                }
+            });
+            //  审核
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status === true || Status == 'true') {
+                        learun.alert.warning("当前项目已审核！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认审核该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/SubmitForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //  去审核
+            $('#lr_unsubmit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status !== true && Status !== 'true') {
+                        learun.alert.warning("当前项目已去审核！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认去审核该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/UnSubmitForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        inittree: function () {
+            $('#companyTree').lrtree({
+                url: top.$.rootUrl + '/Ask/Ask_Type/GetAllTree',
+                nodeClick: page.treeNodeClick
+            });
+        },
+        treeNodeClick: function (item) {
+            ATId = item.id;
+            $('#titleinfo').text(item.text);
+            page.search();
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/GetPageList',
+                headData: [
+                    { label: "问卷编号", name: "VSerial", width: 180, align: "left" },
+                    { label: "标题", name: "VTitle", width: 200, align: "left" },
+                    {
+                        label: "类别", name: "ATId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ask_Type',
+                                key: value,
+                                keyId: 'atid',
+                                callback: function (_data) {
+                                    callback(_data['atname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "开始时间", name: "VStartTime", width: 100, align: "left" },
+                    { label: "结束时间", name: "VStopTime", width: 100, align: "left" },
+                    { label: "考核部门", name: "DepartmentIdsName", width: 150, align: "left" },
+                    { label: "考核人数", name: "SPVNum", width: 80, align: "left" },
+                    { label: "填写人数", name: "SPNum", width: 80, align: "left" },
+                    { label: "点击热度", name: "SClick", width: 80, align: "left" },
+                    { label: "排序", name: "VOrder", width: 80, align: "left" },
+                    {
+                        label: "是否匿名", name: "VHide", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }
+                    },
+                    {
+                        label: "审核标志", name: "Status", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }
+                    }
+                ],
+                mainId: 'VID',
+                isPage: true,
+                sidx: 'VOrder'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.ATId = ATId;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Paper.cshtml

@@ -0,0 +1,66 @@
+@{
+    ViewBag.Title = "教师问卷管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+@model Learun.Application.TwoDevelopment.Ask.Ask_MainOfTeacherEntity
+<link href="~/Content/paper/css/common.css" rel="stylesheet" />
+<link href="~/Content/paper/dist/demo.css" rel="stylesheet" />
+<link href="~/Content/paper/css/index.css" rel="stylesheet" />
+<script src="~/Content/paper/dist/jquery.validator.min.js?local=zh-CN"></script>
+<script type="text/javascript">
+    $.lrToken = $('@Html.AntiForgeryToken()').val();
+</script>
+<div class="warpper" style="background-color: #FFFFFF;">
+    <!--  / index_sec1  -->
+    <div class="index_sec index_sec1">
+        <input id="EmpNo" type="hidden" value="@ViewBag.EmpNo" />
+        <input id="EmpName" type="hidden" value="@ViewBag.EmpName" />
+        <div class="inSecTitle">@Model.VTitle</div>
+        <div class="inSecTime">@(Model.VStartTime.HasValue ? Model.VStartTime.Value.ToShortDateString() : "")~@(Model.VStopTime.HasValue ? Model.VStopTime.Value.ToShortDateString() : "")</div>
+        <div class="index_box">
+            <form id="AskPaper">
+                @foreach (var question in Model.Ask_Questions)
+                {
+                    <div class="signSec2Box">
+                        <div class="shenInput form-item">
+                            <div class="shenInputBox">
+                                <div class="signTxt">@question.QTitle @Html.Raw((question.QMust == true ? "<font  style=\"color: red\">*</font>" : "")) @(question.QType == 2 && (question.QMin.HasValue) ? "最少选择" + question.QMin.Value + "项" : "") @(question.QType == 2 && (question.QMax.HasValue) ? "最多选择" + question.QMax.Value + "项" : "")</div>
+                                <div class="inputRadioRow">
+                                    @foreach (var questionitem in question.Ask_QuestionItems)
+                                    {
+                                        <div class="inputRadioCol4">
+                                            <i class="@(question.QType == 1 ? "inputRadio" : "inputCheck")" hasinput="@(questionitem.QShowText == true ? "yes" : "")"><input id="@questionitem.IID" qid="@question.QID" hasinput="@(questionitem.QShowText == true ? "yes" : "")" @(question.QMust == true ? "data-rule=" + (question.QTypeString == "input" ? "\"required;\"" : "\"checked;\"") + (question.QMin.HasValue ? "checked(" + question.QMin.Value + "~);" : "") + (question.QMax.HasValue ? "checked(~" + question.QMax.Value + ");" : "") : "") name="@question.QSerial" type="@question.QTypeString" class="xuanze" /></i> <span>@questionitem.ITitle</span>
+                                        </div>
+                                    }
+                                </div>
+                            </div>
+                        </div>
+                        @if (question.Ask_QuestionItems.Count(m => m.QShowText == true) > 0)
+                        {
+                            <div class="shenInput form-item shenInput3">
+                                <span>@question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true).ITitle</span>
+                                <div class="shenInputBox shenInputBox1">
+                                    <input id="@(question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true).IID)Other" qid="@question.QID" type="text" name="@(question.QSerial)Other" class="inputTxt" data-rule="required(#@(question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true).IID):checked)" />
+                                </div>
+                            </div>
+                        }
+
+                    </div>
+                }
+
+                <div class="shenBtnBox">
+                    <div class="signTxt">本人声明在此报名表中填写的所有信息、 及提供与本表相关的一切资料均真实、准确</div>
+                    <div class="shenRow">
+                        <div class="shenCol6">
+                            <div class="shenBtn">提&nbsp;&nbsp;交</div>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+    <!--  / index_sec1  -->
+
+
+</div>
+@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/Paper.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/Paper.js

@@ -0,0 +1,77 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-04-23 15:50
+ * 描  述：教师问卷管理
+ */
+var refreshGirdData;
+var VID = request("VID");
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.warpper').lrscroll();
+            page.bind();
+        },
+        bind: function () {
+            $('.shenBtn').click(function () {
+                $('#AskPaper').trigger("validate");
+            });
+            //单选框
+            $('.shenInputBox').on('click',
+                '.inputRadio',
+                function () {
+                    if (!$(this).hasClass('active')) {
+                        $(this).addClass('active').parents('.shenInputBox').find('.inputRadio').not($(this))
+                            .removeClass('active');
+                        judgeRideo($(this));
+                    }
+                });
+
+            //多选框
+            $('.inputCheck').click(function () {
+                if ($(this).hasClass('active')) {
+                    $(this).removeClass('active');
+                } else {
+                    $(this).addClass('active');
+                }
+                judgeRideo($(this));
+            });
+            //是否为其他选项判断
+            function judgeRideo(obj) {
+                var parents = obj.parents('.signSec2Box');
+                var inputs = parents.find('.shenInput3');
+                if (parents.find("i[hasinput='yes']").hasClass('active')) {
+                    inputs.css({ display: 'block' });
+                } else {
+                    inputs.css({ display: 'none' });
+                }
+            }
+            $('#AskPaper').validator({
+                timely: 2,
+                theme: 'yellow_right_effect',
+                valid: function (form) {
+                    learun.layerConfirm('是否确认提交答案？', function (res) {
+                        var answerlist = new Array();
+                        var strStuNo = $("#EmpNo").val();
+                        var strStuName = $("#EmpName").val();
+                        $(form).find("input.xuanze:checked").each(function (index, element) {
+                            var itemvalue = { QID: $(this).attr("qid"), IID: $(this).attr("id"), UText: "", UID: strStuNo, UName:strStuName};
+                            if ($(this).attr("hasinput")=="yes") {
+                                itemvalue.UText = $("#" + $(this).attr("id") + "Other").val();
+                            }
+                            answerlist.push(itemvalue);
+                        });
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/TeacherSubmitForm', { answerlist: JSON.stringify(answerlist), VID: VID, "__RequestVerificationToken": $.lrToken }, function () {
+                                learun.frameTab.parentIframe().refreshGirdData();
+                                learun.frameTab.close("paper" + VID);
+                            });
+                        }
+                    });
+                }
+            });
+        }
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperAdminView.cshtml

@@ -0,0 +1,57 @@
+@{
+    ViewBag.Title = "教师问卷管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+@model Learun.Application.TwoDevelopment.Ask.Ask_MainOfTeacherEntity
+<link href="~/Content/paper/css/common.css" rel="stylesheet" />
+<link href="~/Content/paper/dist/demo.css" rel="stylesheet" />
+<link href="~/Content/paper/css/index.css" rel="stylesheet" />
+<script src="~/Content/paper/dist/jquery.validator.min.js?local=zh-CN"></script>
+<script type="text/javascript">
+    $.lrToken = $('@Html.AntiForgeryToken()').val();
+</script>
+<div class="warpper" style="background-color: #FFFFFF;">
+    <!--  / index_sec1  -->
+    <div class="index_sec index_sec1">
+        <input id="EmpNo" type="hidden" value="@ViewBag.EmpNo" />
+        <input id="EmpName" type="hidden" value="@ViewBag.EmpName" />
+        <div class="inSecTitle">@Model.VTitle</div>
+        <div class="inSecTime">@(Model.VStartTime.HasValue ? Model.VStartTime.Value.ToShortDateString() : "")~@(Model.VStopTime.HasValue ? Model.VStopTime.Value.ToShortDateString() : "")</div>
+        <div class="index_box">
+            <form id="AskPaper">
+                @foreach (var question in Model.Ask_Questions)
+                {
+                    <div class="signSec2Box">
+                        <div class="shenInput form-item">
+                            <div class="shenInputBox">
+                                <div class="signTxt">@question.QTitle @Html.Raw((question.QMust == true ? "<font  style=\"color: red\">*</font>" : "")) @(question.QType == 2 && (question.QMin.HasValue) ? "最少选择" + question.QMin.Value + "项" : "") @(question.QType == 2 && (question.QMax.HasValue) ? "最多选择" + question.QMax.Value + "项" : "")</div>
+                                <div class="inputRadioRow">
+                                    @foreach (var questionitem in question.Ask_QuestionItems)
+                                    {
+                                        <div class="inputRadioCol4">
+                                            <i class="@(question.QType == 1 ? "inputRadio" : "inputCheck")" hasinput="@(questionitem.QShowText == true ? "yes" : "")"><input id="@questionitem.IID" qid="@question.QID" hasinput="@(questionitem.QShowText == true ? "yes" : "")" @(question.QMust == true ? "data-rule=" + (question.QTypeString == "input" ? "\"required;\"" : "\"checked;\"") + (question.QMin.HasValue ? "checked(" + question.QMin.Value + "~);" : "") + (question.QMax.HasValue ? "checked(~" + question.QMax.Value + ");" : "") : "") name="@question.QSerial" type="@question.QTypeString" class="xuanze" /></i> <span>@questionitem.ITitle</span>
+                                        </div>
+                                    }
+                                </div>
+                            </div>
+                        </div>
+                        @if (question.Ask_QuestionItems.Count(m => m.QShowText == true) > 0)
+                        {
+                            <div class="shenInput form-item shenInput3">
+                                <span>@question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true).ITitle</span>
+                                <div class="shenInputBox shenInputBox1">
+                                    <input id="@(question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true).IID)Other" qid="@question.QID" type="text" name="@(question.QSerial)Other" class="inputTxt" data-rule="required(#@(question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true).IID):checked)" />
+                                </div>
+                            </div>
+                        }
+
+                    </div>
+                }
+            </form>
+        </div>
+    </div>
+    <!--  / index_sec1  -->
+
+
+</div>
+@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/PaperAdminView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperAdminView.js

@@ -0,0 +1,77 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-04-23 15:50
+ * 描  述：教师问卷管理
+ */
+var refreshGirdData;
+var VID = request("VID");
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.warpper').lrscroll();
+            page.bind();
+        },
+        bind: function () {
+            $('.shenBtn').click(function () {
+                $('#AskPaper').trigger("validate");
+            });
+            //单选框
+            $('.shenInputBox').on('click',
+                '.inputRadio',
+                function () {
+                    if (!$(this).hasClass('active')) {
+                        $(this).addClass('active').parents('.shenInputBox').find('.inputRadio').not($(this))
+                            .removeClass('active');
+                        judgeRideo($(this));
+                    }
+                });
+
+            //多选框
+            $('.inputCheck').click(function () {
+                if ($(this).hasClass('active')) {
+                    $(this).removeClass('active');
+                } else {
+                    $(this).addClass('active');
+                }
+                judgeRideo($(this));
+            });
+            //是否为其他选项判断
+            function judgeRideo(obj) {
+                var parents = obj.parents('.signSec2Box');
+                var inputs = parents.find('.shenInput3');
+                if (parents.find("i[hasinput='yes']").hasClass('active')) {
+                    inputs.css({ display: 'block' });
+                } else {
+                    inputs.css({ display: 'none' });
+                }
+            }
+            $('#AskPaper').validator({
+                timely: 2,
+                theme: 'yellow_right_effect',
+                valid: function (form) {
+                    learun.layerConfirm('是否确认提交答案？', function (res) {
+                        var answerlist = new Array();
+                        var strStuNo = $("#EmpNo").val();
+                        var strStuName = $("#EmpName").val();
+                        $(form).find("input.xuanze:checked").each(function (index, element) {
+                            var itemvalue = { QID: $(this).attr("qid"), IID: $(this).attr("id"), UText: "", UID: strStuNo, UName:strStuName};
+                            if ($(this).attr("hasinput")=="yes") {
+                                itemvalue.UText = $("#" + $(this).attr("id") + "Other").val();
+                            }
+                            answerlist.push(itemvalue);
+                        });
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/Ask/Ask_MainOfTeacher/TeacherSubmitForm', { answerlist: JSON.stringify(answerlist), VID: VID, "__RequestVerificationToken": $.lrToken }, function () {
+                                learun.frameTab.parentIframe().refreshGirdData();
+                                learun.frameTab.close("paper" + VID);
+                            });
+                        }
+                    });
+                }
+            });
+        }
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperView.cshtml

@@ -0,0 +1,56 @@
+@{
+    ViewBag.Title = "教师问卷管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+@model Learun.Application.TwoDevelopment.Ask.Ask_MainOfTeacherEntity
+<link href="~/Content/paper/css/common.css" rel="stylesheet" />
+<link href="~/Content/paper/dist/demo.css" rel="stylesheet" />
+<link href="~/Content/paper/css/index.css" rel="stylesheet" />
+<script src="~/Content/paper/dist/jquery.validator.min.js?local=zh-CN"></script>
+<script type="text/javascript">
+    $.lrToken = $('@Html.AntiForgeryToken()').val();
+</script>
+<div class="warpper" style="background-color: #FFFFFF;">
+    <!--  / index_sec1  -->
+    <div class="index_sec index_sec1">
+        <div class="inSecTitle">@Model.VTitle</div>
+        <div class="inSecTime">@(Model.VStartTime.HasValue ? Model.VStartTime.Value.ToShortDateString() : "")~@(Model.VStopTime.HasValue ? Model.VStopTime.Value.ToShortDateString() : "")</div>
+        <div class="index_box">
+            <form id="AskPaper">
+                @foreach (var question in Model.Ask_Questions)
+                {
+                    <div class="signSec2Box">
+                        <div class="shenInput form-item">
+                            <div class="shenInputBox">
+                                <div class="signTxt">@question.QTitle @Html.Raw((question.QMust == true ? "<font  style=\"color: red\">*</font>" : "")) @(question.QType == 2 && (question.QMin.HasValue) ? "最少选择" + question.QMin.Value + "项" : "") @(question.QType == 2 && (question.QMax.HasValue) ? "最多选择" + question.QMax.Value + "项" : "")</div>
+                                <div class="inputRadioRow">
+                                    @foreach (var questionitem in question.Ask_QuestionItems)
+                                    {
+                                        <div class="inputRadioCol4">
+                                            <i class="@(question.QType == 1 ? "inputRadio" : "inputCheck")" hasinput="@(questionitem.QShowText == true ? "yes" : "")"><input id="@questionitem.IID" qid="@question.QID" hasinput="@(questionitem.QShowText == true ? "yes" : "")" @(question.QMust == true ? "data-rule=" + (question.QTypeString == "input" ? "\"required;\"" : "\"checked;\"") + (question.QMin.HasValue ? "checked(" + question.QMin.Value + "~);" : "") + (question.QMax.HasValue ? "checked(~" + question.QMax.Value + ");" : "") : "") name="@question.QSerial" type="@question.QTypeString" class="xuanze" @(questionitem.IsChecked?"checked=\"checked\"":"")  /></i> <span>@questionitem.ITitle</span>
+                                        </div>
+                                    }
+                                </div>
+                            </div>
+                        </div>
+                        @if (question.Ask_QuestionItems.Count(m => m.QShowText == true) > 0)
+                        {
+                            <div class="shenInput form-item shenInput3">
+                                <span>@question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true).ITitle</span>
+                                <div class="shenInputBox shenInputBox1">
+                                    <input id="@(question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true).IID)Other" qid="@question.QID" type="text" name="@(question.QSerial)Other" class="inputTxt" data-rule="required(#@(question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true).IID):checked)"  value="@(question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true&&!string.IsNullOrEmpty(m.UText))!=null?question.Ask_QuestionItems.FirstOrDefault(m => m.QShowText == true&&!string.IsNullOrEmpty(m.UText)).UText:"")" />
+                                </div>
+                            </div>
+                        }
+
+                    </div>
+                }
+
+            </form>
+        </div>
+    </div>
+    <!--  / index_sec1  -->
+
+
+</div>
+@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/PaperView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/PaperView.js

@@ -0,0 +1,55 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-04-23 15:50
+ * 描  述：教师问卷管理
+ */
+var refreshGirdData;
+var VID = request("VID");
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.warpper').lrscroll();
+            page.bind();
+        },
+        bind: function () {
+            //单选框
+            $('.shenInputBox').on('click',
+                '.inputRadio',
+                function () {
+                    if (!$(this).hasClass('active')) {
+                        $(this).addClass('active').parents('.shenInputBox').find('.inputRadio').not($(this))
+                            .removeClass('active');
+                        judgeRideo($(this));
+                    }
+                });
+
+            //多选框
+            $('.inputCheck').click(function () {
+                if ($(this).hasClass('active')) {
+                    $(this).removeClass('active');
+                } else {
+                    $(this).addClass('active');
+                }
+                judgeRideo($(this));
+            });
+            //是否为其他选项判断
+            function judgeRideo(obj) {
+                var parents = obj.parents('.signSec2Box');
+                var inputs = parents.find('.shenInput3');
+                if (parents.find("i[hasinput='yes']").hasClass('active')) {
+                    inputs.css({ display: 'block' });
+                } else {
+                    inputs.css({ display: 'none' });
+                }
+            }
+            $('form').find("input.xuanze:checked").each(function (index, element) {
+                if ($(this).attr("hasinput") == "yes") {
+                    $("#" + $(this).attr("id") + "Other").parents(".shenInput3").css({ display: 'block' });
+                }
+            });
+        }
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/TeacherIndex.cshtml

@@ -0,0 +1,42 @@
+@{
+    ViewBag.Title = "教师问卷管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<script type="text/javascript">
+    var EmpNo = '@ViewBag.EmpNo';
+</script>
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">标题</div>
+                                    <input id="VTitle" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">问卷编号</div>
+                                    <input id="VSerial" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_start" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;开始考核</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看答题情况</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/Ask/Views/Ask_MainOfTeacher/TeacherIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_MainOfTeacher/TeacherIndex.js

@@ -0,0 +1,93 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-04-23 15:50
+ * 描  述：教师问卷管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#lr_start').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('IsAnswer');
+                    if (Status === true || Status === 'true') {
+                        learun.alert.warning("当前项目已交卷！");
+                        return;
+                    }
+                    top.learun.frameTab.open({ F_ModuleId: 'paper' + keyValue, F_Icon: 'fa fa-window-maximize', F_FullName: '量表考核答卷', F_UrlAddress: '/Ask/Ask_MainOfTeacher/Paper?VID=' + keyValue });
+                }
+            });
+            //查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                var EmpNo = $('#gridtable').jfGridValue('EmpNo');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('IsAnswer');
+                    if (Status === false || Status === 'false') {
+                        learun.alert.warning("当前项目未交卷！");
+                        return;
+                    }
+                    top.learun.frameTab.open({ F_ModuleId: 'paper' + keyValue, F_Icon: 'fa fa-window-maximize', F_FullName: '量表考核答卷', F_UrlAddress: '/Ask/Ask_MainOfTeacher/PaperView?VID=' + keyValue + '&EmpNo=' + EmpNo });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/Ask/Ask_MainOfTeacher/GetTeacherPageList',
+                headData: [
+                    { label: "问卷编号", name: "VSerial", width: 180, align: "left" },
+                    { label: "标题", name: "VTitle", width: 200, align: "left" },
+                    {
+                        label: "类别", name: "ATId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ask_Type',
+                                key: value,
+                                keyId: 'atid',
+                                callback: function (_data) {
+                                    callback(_data['atname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "开始时间", name: "VStartTime", width: 100, align: "left" },
+                    { label: "结束时间", name: "VStopTime", width: 100, align: "left" },
+                    {
+                        label: "是否交卷", name: "IsAnswer", width: 80, align: "left", formatter: function (cellvalue) {
+                            return cellvalue === true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }
+                    },
+                    { label: "考核评分", name: "TotalScore", width: 80, align: "left" },
+                    { label: "提交时间", name: "CreateDate", width: 80, align: "left" }
+                ],
+                mainId: 'VID',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.EmpNo = EmpNo;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoApplyController.cs

@@ -4,6 +4,8 @@ using Learun.Application.TwoDevelopment.AssetManagementSystem;
 using System.Web.Mvc;
 using System.Collections.Generic;
 using System;
+using System.Linq;
+using Learun.Application.Base.SystemModule;
 
 namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
 {
@@ -17,6 +19,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
     public class Ass_AssetsInfoApplyController : MvcControllerBase
     {
         private Ass_AssetsInfoApplyIBLL ass_AssetsInfoApplyIBLL = new Ass_AssetsInfoApplyBLL();
+        private DataItemIBLL dataItemIbll = new DataItemBLL();
 
         #region  视图功能
 
@@ -48,6 +51,15 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 打印清单
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Inventory()
+        {
+            return View();
+        }
         [HttpGet]
         public ActionResult FormViewJY()
         {
@@ -149,6 +161,43 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
             };
             return Success(jsonData);
         }
+
+
+        /// <summary>
+        /// 获取入库清单数据
+        /// </summary>
+        /// <param name="applyId">入库清单id</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetInventoryInfo(string applyId)
+        {
+            var applyEntity = ass_AssetsInfoApplyIBLL.GetAss_AssetsInfoApplyEntity(applyId);
+            var applyItemList = ass_AssetsInfoApplyIBLL.GetAss_AssetsInfoItemApplyList(applyId).ToList();
+            var unitList = dataItemIbll.GetDetailList("sldw");
+            var ItemList = new List<object>();
+            foreach (var item in applyItemList)
+            {
+                ItemList.Add(new
+                {
+                    aOrder = applyItemList.IndexOf(item),//序号
+                    aName = item.AAIName,//名字
+                    aUnit = unitList.FirstOrDefault(a => a.F_ItemValue == item.AAIUnit)?.F_ItemName,//单位
+                    aNum = item.AAIStock,
+                    aPrice = item.AAIPrice,//价格
+                    aAllPrice = item.AAIPrice * item.AAIStock,//总价格
+                });
+            }
+            var data = new
+            {
+                projectName = "",
+                applyData=applyEntity.AACreateTime.ToDate().ToString("yyyy年MM月dd日"),
+                list = ItemList
+            };
+
+            return Success(data);
+        }
+
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoController.cs

@@ -1,8 +1,12 @@
-using Learun.Util;
+using System;
+using Learun.Util;
 using System.Data;
 using Learun.Application.TwoDevelopment.AssetManagementSystem;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using System.Linq;
+using ClosedXML.Excel;
+using Learun.Application.Base.SystemModule;
 
 namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
 {
@@ -16,6 +20,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
     public class Ass_AssetsInfoController : MvcControllerBase
     {
         private Ass_AssetsInfoIBLL ass_AssetsInfoIBLL = new Ass_AssetsInfoBLL();
+        private DataItemIBLL dataItemIbll=new DataItemBLL();
 
         #region  视图功能
 
@@ -37,6 +42,15 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         {
              return View();
         }
+        /// <summary>
+        /// 打印清单
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Inventory()
+        {
+             return View();
+        }
         #endregion
 
         #region  获取数据
@@ -75,6 +89,20 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
             return Success(data);
         }
 
+
+        /// <summary>
+        /// 获取列表不带分页
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetListHaoCai(string queryJson)
+        {
+            var data = ass_AssetsInfoIBLL.GetListHaoCai(queryJson);
+            return Success(data);
+        }
+
         /// <summary> 
         /// 获取左侧树形数据 
         /// <summary> 
@@ -134,6 +162,42 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
             return Success("整理成功");
         }
 
+
+        /// <summary>
+        /// 根据资产id 获取资产信息
+        /// </summary>
+        /// <param name="assIds">资产id</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetInventoryInfo(string assIds)
+        {
+            var ids = assIds.Split(',').ToList();
+            var assList = ass_AssetsInfoIBLL.GetListByIds(ids).ToList();
+            var unitList = dataItemIbll.GetDetailList("sldw");
+            var ItemList = new List<object>();
+            foreach (var item in assList)
+            {
+                ItemList.Add(new
+                {
+                    aOrder = assList.IndexOf(item),//序号
+                    aName = item.AName,//名字
+                    aUnit = unitList.FirstOrDefault(a => a.F_ItemValue == item.AUnit)?.F_ItemName,//单位
+                    aNum = item.AStock,
+                    aPrice = item.APrice,//价格
+                    aAllPrice = item.APrice * item.AStock,//总价格
+                });
+            }
+            var data = new
+            {
+                projectName = "",
+                applyData = DateTime.Now.ToString("yyyy年MM月dd日"), 
+                list = ItemList
+            };
+
+            return Success(data);
+        }
+
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsOutApplyController.cs

@@ -4,6 +4,9 @@ using Learun.Application.TwoDevelopment.AssetManagementSystem;
 using System.Web.Mvc;
 using System.Collections.Generic;
 using System;
+using System.Linq;
+using Learun.Application.Base.SystemModule;
+using Learun.Application.Organization;
 
 namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
 {
@@ -17,6 +20,8 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
     public class Ass_AssetsOutApplyController : MvcControllerBase
     {
         private Ass_AssetsOutApplyIBLL ass_AssetsOutApplyIBLL = new Ass_AssetsOutApplyBLL();
+        private DataItemIBLL dataItemIbll=new DataItemBLL();
+        private UserIBLL userIbll=new UserBLL();
 
         #region  视图功能
 
@@ -27,7 +32,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单查看页
@@ -48,6 +53,15 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
             ViewBag.AOCode = "CKSQ_" + CommonHelper.CreateNo();
             return View();
         }
+        /// <summary>
+        /// 出库清单
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Inventory()
+        {
+            return View();
+        }
         #endregion
 
         #region  获取数据
@@ -80,9 +94,10 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var Ass_AssetsOutApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutApplyEntity( keyValue );
-            var Ass_AssetsOutItemApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutItemApplyList( Ass_AssetsOutApplyData.AOId );
-            var jsonData = new {
+            var Ass_AssetsOutApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutApplyEntity(keyValue);
+            var Ass_AssetsOutItemApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutItemApplyList(Ass_AssetsOutApplyData.AOId);
+            var jsonData = new
+            {
                 Ass_AssetsOutApply = Ass_AssetsOutApplyData,
                 Ass_AssetsOutItemApply = Ass_AssetsOutItemApplyData,
             };
@@ -96,9 +111,10 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult GetFormDataByProcessId(string processId)
         {
-            var Ass_AssetsOutApplyData = ass_AssetsOutApplyIBLL.GetEntityByProcessId( processId );
-            var Ass_AssetsOutItemApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutItemApplyList( Ass_AssetsOutApplyData.AOId );
-            var jsonData = new {
+            var Ass_AssetsOutApplyData = ass_AssetsOutApplyIBLL.GetEntityByProcessId(processId);
+            var Ass_AssetsOutItemApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutItemApplyList(Ass_AssetsOutApplyData.AOId);
+            var jsonData = new
+            {
                 Ass_AssetsOutApply = Ass_AssetsOutApplyData,
                 Ass_AssetsOutItemApply = Ass_AssetsOutItemApplyData,
             };
@@ -106,6 +122,45 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         }
         #endregion
 
+
+        /// <summary>
+        /// 获取出库清单数据
+        /// </summary>
+        /// <param name="applyId">出库单id</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetInventoryInfo(string applyId)
+        {
+            var outEntity = ass_AssetsOutApplyIBLL.GetAss_AssetsOutApplyEntity(applyId);
+            var departmentId = userIbll.GetEntityByUserId(outEntity.AOCreateUserId)?.F_DepartmentId;
+            var outItem = ass_AssetsOutApplyIBLL.GetAss_AssetsOutItemApplyList(applyId).ToList();
+            var unitList= dataItemIbll.GetDetailList("sldw");
+            var ItemList = new List<object>();
+            foreach (var item in outItem)
+            {
+                ItemList.Add(new
+                {
+                    aOrder = outItem.IndexOf(item),//序号
+                    aName = item.AOIName,//名字
+                    aUnit =unitList.FirstOrDefault(a=>a.F_ItemValue==item.AOIUnit)?.F_ItemName,//单位
+                    aNum = 1,
+                    aPrice = item.AOIPrice,//价格
+                    aAllPrice = item.AOIPrice,//总价格
+                });
+
+            }
+
+            var data = new
+            {
+                projectName = outEntity.AOProjectName,
+                departmentId,
+                applyData =outEntity.AOCreateTime.ToDate().ToString("yyyy年MM月dd日"),
+                list = ItemList
+            };
+            return Success(data);
+        }
+
         #region  提交数据
 
         /// <summary>
@@ -135,7 +190,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
             entity.AOOutStatus = 0;
             entity.AOCreateTime = DateTime.Now;
             List<Ass_AssetsOutItemApplyEntity> ass_AssetsOutItemApplyList = strass_AssetsOutItemApplyList.ToObject<List<Ass_AssetsOutItemApplyEntity>>();
-            ass_AssetsOutApplyIBLL.SaveEntity(keyValue,entity,ass_AssetsOutItemApplyList);
+            ass_AssetsOutApplyIBLL.SaveEntity(keyValue, entity, ass_AssetsOutItemApplyList);
             return Success("保存成功！");
         }
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_PurchaseApplyController.cs

@@ -4,6 +4,8 @@ using Learun.Application.TwoDevelopment.AssetManagementSystem;
 using System.Web.Mvc;
 using System.Collections.Generic;
 using System;
+using System.Linq;
+using System.Text;
 
 namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
 {
@@ -45,7 +47,8 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public ActionResult FormView() {
+        public ActionResult FormView()
+        {
             return View();
         }
         #endregion
@@ -82,6 +85,10 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         {
             var Ass_PurchaseApplyData = ass_PurchaseApplyIBLL.GetAss_PurchaseApplyEntity(keyValue);
             var Ass_PurchaseItemApplyData = ass_PurchaseApplyIBLL.GetAss_PurchaseItemApplyList(Ass_PurchaseApplyData.PAId);
+            foreach (var item in Ass_PurchaseItemApplyData)
+            {
+                item.PAAllAmount = item.PAIPrice * item.PAIAmount;
+            }
             var jsonData = new
             {
                 Ass_PurchaseApply = Ass_PurchaseApplyData,
@@ -99,6 +106,10 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         {
             var Ass_PurchaseApplyData = ass_PurchaseApplyIBLL.GetEntityByProcessId(processId);
             var Ass_PurchaseItemApplyData = ass_PurchaseApplyIBLL.GetAss_PurchaseItemApplyList(Ass_PurchaseApplyData.PAId);
+            foreach (var item in Ass_PurchaseItemApplyData)
+            {
+                item.PAAllAmount = item.PAIPrice * item.PAIAmount;
+            }
             var jsonData = new
             {
                 Ass_PurchaseApply = Ass_PurchaseApplyData,
@@ -156,6 +167,15 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
             entity.PStatus = 0;
             entity.PACreateTime = DateTime.Now;
             List<Ass_PurchaseItemApplyEntity> ass_PurchaseItemApplyList = strass_PurchaseItemApplyList.ToObject<List<Ass_PurchaseItemApplyEntity>>();
+            StringBuilder nameOfCollection = new StringBuilder();
+            //将所有名字的名字集中到一个字段中， 方便查询
+            foreach (var item in ass_PurchaseItemApplyList)
+            {
+                nameOfCollection.Append(item.PAIName);
+            }
+
+
+            entity.NameOfCollection = nameOfCollection.ToString();
             ass_PurchaseApplyIBLL.SaveEntity(keyValue, entity, ass_PurchaseItemApplyList);
             return Success("保存成功！");
         }
@@ -170,9 +190,9 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         /// <param name="pastatus">审核状态</param>
         /// <param name="processId">流程Id</param>
         /// <returns></returns>
-        public ActionResult ModifyPAStatus(string keyValue, int pastatus,string processId)
+        public ActionResult ModifyPAStatus(string keyValue, int pastatus, string processId)
         {
-            ass_PurchaseApplyIBLL.ModifyPAStatus(keyValue, pastatus,processId);
+            ass_PurchaseApplyIBLL.ModifyPAStatus(keyValue, pastatus, processId);
             return Success("提交成功！");
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_ReceiveController.cs

@@ -3,6 +3,9 @@ using System.Data;
 using Learun.Application.TwoDevelopment.AssetManagementSystem;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using System.Linq;
+using Learun.Application.Base.SystemModule;
+using Learun.Application.Organization;
 
 namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
 {
@@ -17,7 +20,9 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
     {
         private Ass_ReceiveIBLL ass_ReceiveIBLL = new Ass_ReceiveBLL();
         private Ass_ReceiveItemIBLL assReceiveItemIbll = new Ass_ReceiveItemBLL();
-
+        private DataItemIBLL dataItemIbll = new DataItemBLL();
+        private Ass_AssetsInfoIBLL assAssetsInfoIbll = new Ass_AssetsInfoBLL();
+        private UserIBLL userIbll=new UserBLL();
         #region  视图功能
 
         /// <summary>
@@ -43,6 +48,11 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         {
             return View();
         }
+        [HttpGet]
+        public ActionResult Inventory()
+        {
+            return View();
+        }
         #endregion
 
         #region  获取数据
@@ -104,6 +114,44 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         }
         #endregion
 
+        /// <summary>
+        /// 获取出库清单数据
+        /// </summary>
+        /// <param name="applyId">出库单id</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetInventoryInfo(string applyId)
+        {
+            var outEntity = ass_ReceiveIBLL.GetAss_ReceiveEntity(applyId);
+            var outItem = assReceiveItemIbll.GetList(applyId).ToList();
+            var unitList = dataItemIbll.GetDetailList("sldw");
+            var ItemList = new List<object>();
+            foreach (var item in outItem)
+            {
+                var entity = assAssetsInfoIbll.GetAss_AssetsInfoEntity(item.AID);
+                ItemList.Add(new
+                {
+                    aOrder = outItem.IndexOf(item),//序号
+                    aName = entity.AName,//名字
+                    aUnit = unitList.FirstOrDefault(a => a.F_ItemValue == entity.AUnit)?.F_ItemName,//单位
+                    aNum = item.ANum,
+                    aPrice = entity.APrice,//价格
+                    aAllPrice = entity.APrice * int.Parse(item.ANum),//总价格
+                });
+
+            }
+
+            var data = new
+            {
+                projectName = "",
+                departmentId=outEntity.PDepartment,
+                applyData=outEntity.RTime.ToDate().ToString("yyyy年MM月dd日"),
+                list = ItemList
+            };
+            return Success(data);
+        }
+
         #region  提交数据
 
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.cshtml

@@ -43,6 +43,7 @@
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录入</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
                         <a id="lr_arrangement" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;整理资产数据</a>
+                        <a id="lr_inventory" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;打印清单</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                         <a id="lr_detail" class="btn btn-default"><i class="fa fa-bars"></i>&nbsp;查看明细</a>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js

@@ -103,6 +103,25 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+
+
+            //打印清单
+            $('#lr_inventory').on('click',
+                function () {
+                    var keyValue = $('#gridtable').jfGridValue('AId');
+                    console.log(keyValue);
+                    if (learun.checkrow(keyValue)) {
+                        learun.layerForm({
+                            id: 'formAss_AssetsOutApply',
+                            title: '清单',
+                            url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/Inventory?keyValue=' + keyValue,
+                            width: 1000,
+                            height: 700,
+                            callBack: function (id) {
+                            }
+                        });
+                    }
+                });
         },
         // 初始化列表
         initGird: function () {
@@ -189,6 +208,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'AId',
                 isPage: true,
+                isMultiselect: true,
                 sidx: 'AOrder'
             });
             page.search();