Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl

Learun.Framework.Ultimate V7/Learun.Application.Mobile/_sgbak/Learun.Application.Mobile.jsproj.51038.2.2020-04-20.17-16-21.9995

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Android">
-      <Configuration>Debug</Configuration>
-      <Platform>Android</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|iOS">
-      <Configuration>Debug</Configuration>
-      <Platform>iOS</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Windows-x64">
-      <Configuration>Debug</Configuration>
-      <Platform>Windows-x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Windows-x86">
-      <Configuration>Debug</Configuration>
-      <Platform>Windows-x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Windows-ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>Windows-ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Android">
-      <Configuration>Release</Configuration>
-      <Platform>Android</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|iOS">
-      <Configuration>Release</Configuration>
-      <Platform>iOS</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Windows-x64">
-      <Configuration>Release</Configuration>
-      <Platform>Windows-x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Windows-x86">
-      <Configuration>Release</Configuration>
-      <Platform>Windows-x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Windows-ARM">
-      <Configuration>Release</Configuration>
-      <Platform>Windows-ARM</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>b9943e88-bf67-46ec-a4d8-d0c81d5846c4</ProjectGuid>
-    <SccProjectName>Learun.Application.Mobile</SccProjectName>
-    <SccProvider>SourceGear Vault Visual Studio 2005 Client:{1EA47954-8515-402d-82D9-B5C332120A8D}</SccProvider>
-    <SccAuxPath>http://123.57.209.16:8090/VaultService</SccAuxPath>
-    <SccLocalPath>1~a7250b02-76e9-4d74-aa27-f5cdf7719296</SccLocalPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectCapability Include="UseFileGlobs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TypeScriptCompileOnSaveEnabled>false</TypeScriptCompileOnSaveEnabled>
-    <TypeScriptToolsVersion>2.3</TypeScriptToolsVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\ApacheCordovaTools\vs-mda-targets\Microsoft.TypeScript.MDA.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\ApacheCordovaTools\vs-mda-targets\Microsoft.MDA.FileMirroring.targets" />
-  <PropertyGroup>
-    <ProjectUISubcaption>Tools for Apache Cordova</ProjectUISubcaption>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetPlatformIdentifier>MDD</TargetPlatformIdentifier>
-  </PropertyGroup>
-  <Target Name="EnsureBuildPrerequisites">
-    <!-- These errors will trigger if building from inside Visual Studio and requirements could not be determined -->
-    <Error Condition="$(MDAPropertiesEvaluated) == 'true' And $(NodeJsDir) == ''" Text="Path to NodeJs could not be determined. Please check that NodeJs has been installed." />
-    <!-- These errors will trigger if building from outside Visual Studio (e.g. command line) and environment variables have not been set -->
-    <Error Condition="$(MDAPropertiesEvaluated) == '' And $(NodeJsDir) == ''" Text="Path to NodeJs has not been specified. Please check that NodeJs has been installed and set the NodeJsDir environment variable before building." />
-    <!-- Sanity check that things exist in the specified places. These are more likely to fail if building outside Visual Studio and the required environment variables have not been set, or set incorrectly. -->
-    <Error Condition="!Exists('$(NodeJsDir)') Or !Exists('$(NodeJsDir)\node.exe')" Text="The specified NodeJs directory $(NodeJsDir) either does not exist, or does not contain node.exe. Please check that NodeJs has been installed, and set the NodeJsDir variable to the correct directory." />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties />
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <!-- Customize which folders are not shown by default -->
-    <ExcludedItems>bin;bld;platforms;node_modules;simulation;plugins</ExcludedItems>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="**\**" Exclude="**\platforms\**;**\bin\**;**\bld\**;**\node_modules\**;**\simulation\**;**\plugins\**;.gitignore;Learun.Application.Mobile.*" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Update=".vs\config\applicationhost.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Update="config.xml">
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{4a0dddb5-7a95-4fbf-97cc-616d07737a77}" />
-  </ItemGroup>
-</Project>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/_sgbak/Learun.Application.Mobile.jsproj.51038.2.2020-06-08.18-21-40.5401

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Android">
-      <Configuration>Debug</Configuration>
-      <Platform>Android</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|iOS">
-      <Configuration>Debug</Configuration>
-      <Platform>iOS</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Windows-x64">
-      <Configuration>Debug</Configuration>
-      <Platform>Windows-x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Windows-x86">
-      <Configuration>Debug</Configuration>
-      <Platform>Windows-x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Windows-ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>Windows-ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Android">
-      <Configuration>Release</Configuration>
-      <Platform>Android</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|iOS">
-      <Configuration>Release</Configuration>
-      <Platform>iOS</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Windows-x64">
-      <Configuration>Release</Configuration>
-      <Platform>Windows-x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Windows-x86">
-      <Configuration>Release</Configuration>
-      <Platform>Windows-x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Windows-ARM">
-      <Configuration>Release</Configuration>
-      <Platform>Windows-ARM</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>b9943e88-bf67-46ec-a4d8-d0c81d5846c4</ProjectGuid>
-    <SccProjectName>Learun.Application.Mobile</SccProjectName>
-    <SccProvider>SourceGear Vault Visual Studio 2005 Client:{1EA47954-8515-402d-82D9-B5C332120A8D}</SccProvider>
-    <SccAuxPath>http://123.57.209.16:8090/VaultService</SccAuxPath>
-    <SccLocalPath>1~a7250b02-76e9-4d74-aa27-f5cdf7719296</SccLocalPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectCapability Include="UseFileGlobs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TypeScriptCompileOnSaveEnabled>false</TypeScriptCompileOnSaveEnabled>
-    <TypeScriptToolsVersion>2.3</TypeScriptToolsVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\ApacheCordovaTools\vs-mda-targets\Microsoft.TypeScript.MDA.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\ApacheCordovaTools\vs-mda-targets\Microsoft.MDA.FileMirroring.targets" />
-  <PropertyGroup>
-    <ProjectUISubcaption>Tools for Apache Cordova</ProjectUISubcaption>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetPlatformIdentifier>MDD</TargetPlatformIdentifier>
-  </PropertyGroup>
-  <Target Name="EnsureBuildPrerequisites">
-    <!-- These errors will trigger if building from inside Visual Studio and requirements could not be determined -->
-    <Error Condition="$(MDAPropertiesEvaluated) == 'true' And $(NodeJsDir) == ''" Text="Path to NodeJs could not be determined. Please check that NodeJs has been installed." />
-    <!-- These errors will trigger if building from outside Visual Studio (e.g. command line) and environment variables have not been set -->
-    <Error Condition="$(MDAPropertiesEvaluated) == '' And $(NodeJsDir) == ''" Text="Path to NodeJs has not been specified. Please check that NodeJs has been installed and set the NodeJsDir environment variable before building." />
-    <!-- Sanity check that things exist in the specified places. These are more likely to fail if building outside Visual Studio and the required environment variables have not been set, or set incorrectly. -->
-    <Error Condition="!Exists('$(NodeJsDir)') Or !Exists('$(NodeJsDir)\node.exe')" Text="The specified NodeJs directory $(NodeJsDir) either does not exist, or does not contain node.exe. Please check that NodeJs has been installed, and set the NodeJsDir variable to the correct directory." />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties />
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <!-- Customize which folders are not shown by default -->
-    <ExcludedItems>bin;bld;platforms;node_modules;simulation;plugins</ExcludedItems>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="**\**" Exclude="**\platforms\**;**\bin\**;**\bld\**;**\node_modules\**;**\simulation\**;**\plugins\**;.gitignore;Learun.Application.Mobile.*" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Update=".vs\config\applicationhost.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Update="config.xml">
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{4a0dddb5-7a95-4fbf-97cc-616d07737a77}" />
-  </ItemGroup>
-</Project>

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 = {
+    webapi: 'http://localhost:8088/',
+    web: "http://localhost:8087/"//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://localhost:31173/',
+//    web: "http://localhost:20472/"//web地址，用于配置logo
+//}; 
 
 
 //var config = {

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

@@ -0,0 +1,137 @@
+.welcome {
+    padding: 1px 12px 20px;
+    background: #fff;
+}
+
+.welT {
+    font-size: 16px;
+    margin-bottom: 10px;
+    line-height: 26px;
+}
+
+    .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;
+}
+
+.welText {
+    overflow: hidden;
+    font-size: 14px;
+    margin-top: 5px;
+}
+
+    .welText span {
+        float: right;
+        width: 60%;
+        text-align: right;
+    }
+
+.welInput {
+    overflow: hidden;
+    font-size: 14px;
+    margin-top: 10px;
+}
+
+    .welInput span {
+        float: left;
+        width: 26%;
+        text-align: right;
+        line-height: 30px;
+    }
+
+    .welInput input {
+        display: block;
+        margin-left: 28%;
+        width: 72%;
+        border: 1px solid #efefef;
+        border-radius: 4px;
+        height: 30px;
+        line-height: 28px;
+        padding: 0 10px;
+        margin-bottom: 0;
+    }
+
+.welCon {
+    padding: 10px;
+    border: 1px solid #efefef;
+    margin-top: 18px;
+    border-radius: 4px;
+    position: relative;
+}
+
+.welDel {
+    position: absolute;
+    top: -8px;
+    left: -8px;
+    background: #fff;
+}
+
+    .welDel i {
+        text-align: center;
+        width: 26px;
+        height: 26px;
+        display: block;
+        line-height: 24px;
+        border: 1px solid #efefef;
+        border-radius: 50%;
+    }
+
+.welImgAdd {
+    text-align: center;
+    line-height: 0;
+}
+
+#files {
+    opacity: 0;
+    -webkit-opacity: 0;
+    z-index: 9;
+    display: none;
+}
+
+#welImgBtn {
+    display: block;
+    width: 110px;
+    height: 30px;
+    text-align: center;
+    line-height: 26px;
+    border: 2px solid #efefef;
+    border-radius: 4px;
+    font-size: 14px;
+    color: #999;
+    margin: 10px auto;
+    cursor: pointer;
+}
+
+#PhotoImg {
+    width: 200px;
+    height: 200px;
+    margin: 30px auto;
+}
+
+    #PhotoImg img {
+        width: 100%;
+        height: 100%;
+    }
+
+.btnBox {
+    margin-top: 20px;
+    text-align: center;
+}
+
+#saveBtn {
+    margin: auto;
+    margin-top: 25px;
+    width: 92%;
+}

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

@@ -0,0 +1,70 @@
+<div class="welcome">
+    <div class="welT">报到二维码</div>
+    <div class="welBox">
+        <div class="welImgAdd">
+            <div id="PhotoImg"></div>
+        </div>
+    </div>
+    <div class="welLine"></div>
+    <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="ClassDiredctorNo"></span>
+        </div>
+        <div class="welText">
+            班主任姓名
+            <span id="ClassDiredctorName"></span>
+        </div>
+        <div class="welText">
+            班主任电话
+            <span id="ClassDiredctorMobile"></span>
+        </div>
+        <div class="welText">
+            辅导员编号
+            <span id="ClassTutorNo"></span>
+        </div>
+        <div class="welText">
+            辅导员姓名
+            <span id="ClassTutorName"></span>
+        </div>
+        <div class="welText">
+            辅导员电话
+            <span id="ClassTutorMobile"></span>
+        </div>
+    </div>
+    <div class="welLine"></div>
+
+</div>

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

@@ -0,0 +1,80 @@
+(function () {
+    var colDataItemArr = ['GenderNo'];
+    var colDataItemCode = ['usersex'];
+
+    var page = {
+        isScroll: false,
+        init: function ($page) {
+            // 获取登录者信息
+            var userinfo = learun.storage.get('userinfo');
+
+            //数据绑定 
+            learun.layer.loading(true, '获取数据中');
+            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => {
+                if (data) {
+                    //判断是否显示报到二维码：未确认报到，且已完善信息，且缴费三有一；
+                    var entity = data["StuInfoFreshEntity"];
+                    if (entity.RegisterStatus == "1") {
+                        learun.layer.loading(false);
+                        learun.layer.confirm('新生已确认报到！', function (_index) {
+                            learun.nav.closeCurrent();
+                        }, '智慧校园提示', ['确定']);
+                        return false;
+                    }
+                    if (entity.IsCompleteInfo == "未完善") {
+                        learun.layer.loading(false);
+                        learun.layer.confirm('新生未完善个人信息，无法报到！', function (_index) {
+                            learun.nav.closeCurrent();
+                        }, '智慧校园提示', ['确定']);
+                        return false;
+                    }
+                    if (entity.PayFeeStatus == "未缴费" && (entity.StudentLoan == null || entity.StudentLoan == "" || entity.StudentLoan == undefined) && entity.OnsitePayFeeStatus != "1") {
+                        learun.layer.loading(false);
+                        learun.layer.confirm('新生未缴费，无法报到！', function (_index) {
+                            learun.nav.closeCurrent();
+                        }, '智慧校园提示', ['确定']);
+                        return false;
+                    }
+
+                    //报到信息
+                    for (var id in entity) {
+                        var dom = $('#' + id)[0];
+                        if (dom) {
+                            if (dom.tagName.toLowerCase() == "span") {
+                                $('#' + id).html(entity['' + id + '']);
+                                //数据字典
+                                if ($.inArray(id, colDataItemArr) >= 0) {
+                                    learun.clientdata.get('dataItem', {
+                                        code: colDataItemCode[$.inArray(id, colDataItemArr)],
+                                        key: entity['' + id + ''],
+                                        callback: function (data, op) {
+                                            $('#' + id).html(data.text);
+                                        }
+                                    });
+                                }
+
+                            } else if (dom.tagName.toLowerCase() == "input") {
+                                $('#' + id).val(entity['' + id + '']);
+                            }
+                        }
+                    }
+                    //二维码
+                    learun.code.encode({ id: 'PhotoImg', text: userinfo.baseinfo.account });
+
+                    page.bind($page);
+
+                    learun.layer.loading(false);
+                }
+
+            });
+
+
+        },
+        bind: function ($page) {
+
+        }
+    };
+
+
+    return page;
+})();

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

@@ -0,0 +1,131 @@
+
+.welcome {
+    padding: 1px 12px 20px;
+    background: #fff;
+}
+
+.welT {
+    font-size: 16px;
+    margin-bottom: 10px;
+    line-height: 26px;
+}
+
+    .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;
+}
+
+.welText {
+    overflow: hidden;
+    font-size: 14px;
+    margin-top: 5px;
+}
+
+    .welText span {
+        float: right;
+        width: 60%;
+        text-align: right;
+    }
+
+.welInput {
+    overflow: hidden;
+    font-size: 14px;
+    margin-top: 10px;
+}
+
+    .welInput span {
+        float: left;
+        width: 26%;
+        text-align: right;
+        line-height: 30px;
+    }
+
+    .welInput input {
+        display: block;
+        margin-left: 28%;
+        width: 72%;
+        border: 1px solid #efefef;
+        border-radius: 4px;
+        height: 30px;
+        line-height: 28px;
+        padding: 0 10px;
+        margin-bottom: 0;
+    }
+
+.welCon {
+    padding: 10px;
+    border: 1px solid #efefef;
+    margin-top: 18px;
+    border-radius: 4px;
+    position: relative;
+}
+
+.welDel {
+    position: absolute;
+    top: -8px;
+    left: -8px;
+    background: #fff;
+}
+
+    .welDel i {
+        text-align: center;
+        width: 26px;
+        height: 26px;
+        display: block;
+        line-height: 24px;
+        border: 1px solid #efefef;
+        border-radius: 50%;
+    }
+
+.welImgAdd {
+    text-align: center;
+    line-height: 0;
+}
+
+#files {
+    opacity: 0;
+    -webkit-opacity: 0;
+    z-index: 9;
+    display: none;
+}
+
+#welImgBtn {
+    display: block;
+    width: 110px;
+    height: 30px;
+    text-align: center;
+    line-height: 26px;
+    border: 2px solid #efefef;
+    border-radius: 4px;
+    font-size: 14px;
+    color: #999;
+    margin: 10px auto;
+    cursor: pointer;
+}
+
+#PhotoImg {
+    width: 110px;
+}
+
+.btnBox {
+    margin-top: 30px;
+    text-align: center;
+}
+
+#saveBtn {
+    margin: auto;
+    margin-top: 25px;
+    width: 92%;
+}

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

@@ -0,0 +1,15 @@
+<div class="welcome">
+    
+    <div class="welBox">
+        <div class="welInput">
+            <span>贷款回执码</span>
+            <input id="ID" type="hidden"/>
+            <input id="StudentLoan" type="text" placeholder="请填写贷款回执码" />
+        </div>
+    </div>
+    <div class="welLine"></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/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js

@@ -0,0 +1,44 @@
+(function () {
+    var page = {
+        isScroll: false,
+        init: function ($page) {
+            //数据绑定 
+            learun.layer.loading(true, '获取数据中');
+            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFresh", {}, (data) => {
+                if (data) {
+                    for (var id in data) {
+                        if (id == "StuInfoFreshEntity") {
+                            $("#ID").val(data[id].ID);
+                            $("#StudentLoan").val(data[id].StudentLoan);
+                        }
+                    }
+                    page.bind($page);
+                    learun.layer.loading(false);
+                }
+            });
+
+            //保存
+            $page.find('#saveBtn').on('tap', function () {
+                var postdata = {
+                    ID: $('#ID').val(),
+                    StudentLoan: $('#StudentLoan').val()
+                };
+                learun.httpget(config.webapi + "StuInfoFresh/saveLoan", postdata, (data) => {
+                    if (data) {
+                        learun.layer.toast('保存成功');
+                        setTimeout(function () {
+                            learun.nav.closeCurrent();
+                        }, 2000);
+                    }
+                });
+
+            });
+
+        },
+        bind: function ($page) {
+
+        }
+    };
+
+    return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/ConfirmStudentsCheckIn.css

@@ -0,0 +1,99 @@
+.lr-contact-page {
+    position: relative;
+    height: 100%;
+    width: 100%;
+}
+
+    .lr-contact-page .searchBox {
+        position: relative;
+        top: 0;
+        left: 0;
+        height: 50px;
+        padding: 10px;
+        width: 100%;
+        background: #f5f5f5;
+    }
+
+        .lr-contact-page .searchBox i {
+            position: absolute;
+            top: 19px;
+            left: 30px;
+            color: #999;
+            z-index: 1;
+            font-size: 12px;
+        }
+
+        .lr-contact-page .searchBox .search {
+            position: relative;
+            width: 100%;
+            height: 100%;
+            border-radius: 3px;
+            line-height: 30px;
+            font-size: 14px;
+            background-color: #fff;
+            padding-left: 42px;
+            color: #999;
+        }
+
+    .lr-contact-page .lr-user-list {
+        position: relative;
+        width: 100%;
+    }
+
+    .lr-contact-page .lr-list-item:after {
+        display: none;
+    }
+
+    .lr-contact-page .lr-list-item {
+        min-height: 36px;
+        line-height: 36px;
+    }
+
+        .lr-contact-page .lr-list-item.user {
+            position: relative;
+            height: 43px;
+            line-height: 43px;
+            padding-left: 40px;
+        }
+
+            .lr-contact-page .lr-list-item.user img {
+                position: absolute;
+                top: 6px;
+                left: 0;
+                width: 30px;
+                height: 30px;
+                border-radius: 50%;
+            }
+
+.InputBtnBox {
+    margin: 0 15px;
+}
+
+.scbottom {
+    padding-top: 15px;
+    padding-bottom: 10px;
+    width: 100%;
+    color: #FFFFF4;
+    text-align: center;
+    font-size: 14px;
+    background-color: #242424;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+}
+
+#bcid {
+    background-color: #242424;
+    width: 100%;
+    height: 100%;
+}
+
+.bcidBox {
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 999;
+    display: none;
+}

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/ConfirmStudentsCheckIn.html

@@ -0,0 +1,8 @@
+<div class="lr-page lr-WelcomNewStudentsConfirmStudentsCheckIn-page">
+    <div class="lr-form-container">
+        <div class="btnBox">
+            <div>点击开始扫描按钮对准学生二维码扫描</div>
+            <button id="btnscan" type="button" class="lr-btn-primary lr-btn-block">开始扫描</button>
+        </div>
+    </div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/ConfirmStudentsCheckIn.js

@@ -0,0 +1,60 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
+ * Copyright (c) 2013-2018 北京泉江科技有限公司
+ * 创建人：超级管理员
+ * 日  期：2020-04-21 09:27
+ * 描  述：扫码报到
+ */
+(function () {
+    var page = {
+        grid: null,
+        init: function ($page) {
+            $page.find('#btnscan').on('tap', function () {
+                var ua = navigator.userAgent.toLowerCase();
+                if (/(html5plus)/i.test(ua)) {
+                    //if (false) {
+                    $('.bcidBox').css('display', 'block');
+                    var scan = new plus.barcode.Barcode('bcid');
+                    scan.onmarked = function onmarked(type, result) {
+                        scan.close();
+                        $('.bcidBox').css('display', 'none');
+                        learun.layer.loading(true, '正在读取学生数据');
+                        learun.nav.closeCurrent();
+                        learun.nav.go({ path: 'WelcomNewStudents/ConfirmStudentsCheckIn/form', title: '确认报到', param: { StuNo: result }, isBack: true, isHead: true });
+                    };
+                    scan.start();
+                } else if (/micromessenger/.test(ua)) {
+                    $.ajax({
+                        url: config.webapi + "weixinapi/getweixinwebaccess_token?url=" + encodeURIComponent(window.location.href),
+                        type: "get",
+                        success: function (res) {
+                            wx.config({
+                                debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+                                appId: res.data.appid, // 必填，公众号的唯一标识
+                                timestamp: res.data.timestamp, // 必填，生成签名的时间戳
+                                nonceStr: res.data.noncestr, // 必填，生成签名的随机串
+                                signature: res.data.certificate, // 必填，签名
+                                jsApiList: ["scanQRCode"] // 必填，需要使用的JS接口列表
+                            });
+
+                            wx.ready(function () {
+                                wx.scanQRCode({
+                                    needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+                                    scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+                                    success: function (res) {
+                                        learun.layer.loading(true, '正在读取学生数据');
+                                        learun.nav.closeCurrent();
+                                        learun.nav.go({ path: 'WelcomNewStudents/ConfirmStudentsCheckIn/form', title: '确认报到', param: { StuNo: res.resultStr }, isBack: true, isHead: true });
+                                    }
+                                });
+                            });
+                        }
+                    });
+                } else {
+                    learun.layer.warning('请下载app或者到微信浏览器打开网页');
+                }
+            });
+            
+        }
+    };
+    return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.css

@@ -0,0 +1,130 @@
+.welcome {
+    padding: 1px 12px 20px;
+    background: #fff;
+}
+
+.welT {
+    font-size: 16px;
+    margin-bottom: 10px;
+    line-height: 26px;
+}
+
+    .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;
+}
+
+.welText {
+    overflow: hidden;
+    font-size: 14px;
+    margin-top: 5px;
+}
+
+    .welText span {
+        float: right;
+        width: 60%;
+        text-align: right;
+    }
+
+.welInput {
+    overflow: hidden;
+    font-size: 14px;
+    margin-top: 10px;
+}
+
+    .welInput span {
+        float: left;
+        width: 26%;
+        text-align: right;
+        line-height: 30px;
+    }
+
+    .welInput input {
+        display: block;
+        margin-left: 28%;
+        width: 72%;
+        border: 1px solid #efefef;
+        border-radius: 4px;
+        height: 30px;
+        line-height: 28px;
+        padding: 0 10px;
+        margin-bottom: 0;
+    }
+
+.welCon {
+    padding: 10px;
+    border: 1px solid #efefef;
+    margin-top: 18px;
+    border-radius: 4px;
+    position: relative;
+}
+
+.welDel {
+    position: absolute;
+    top: -8px;
+    left: -8px;
+    background: #fff;
+}
+
+    .welDel i {
+        text-align: center;
+        width: 26px;
+        height: 26px;
+        display: block;
+        line-height: 24px;
+        border: 1px solid #efefef;
+        border-radius: 50%;
+    }
+
+.welImgAdd {
+    text-align: center;
+    line-height: 0;
+}
+
+#files {
+    opacity: 0;
+    -webkit-opacity: 0;
+    z-index: 9;
+    display: none;
+}
+
+#welImgBtn {
+    display: block;
+    width: 110px;
+    height: 30px;
+    text-align: center;
+    line-height: 26px;
+    border: 2px solid #efefef;
+    border-radius: 4px;
+    font-size: 14px;
+    color: #999;
+    margin: 10px auto;
+    cursor: pointer;
+}
+
+#PhotoImg {
+    width: 110px;
+}
+
+.btnBox {
+    margin-top: 20px;
+    text-align: center;
+}
+
+#saveBtn {
+    margin: auto;
+    margin-top: 25px;
+    width: 92%;
+}

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.html

@@ -0,0 +1,140 @@
+<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">
+            <img id="PhotoImg" src="" alt="">
+        </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">家庭成员(直系家属)</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">紧急联系人</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="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/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.js

@@ -0,0 +1,206 @@
+(function () {
+    var colDataItemArr = ['GenderNo', 'PartyFaceNo'];
+    var colDataItemCode = ['usersex', 'PolityStatus'];
+
+    var page = {
+        isScroll: false,
+        init: function ($page,param) {
+            //数据绑定 
+            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntityByStuNo", '\''+param.StuNo+'\'', (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);
+                                        }
+                                    });
+                                }
+
+                            } else if (dom.tagName.toLowerCase() == "input") {
+                                $('#' + id).val(data['StuInfoFreshEntity']['' + id + '']);
+                            }
+                        }
+                    }
+                    //头像
+                    $('#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);
+
+                    });
+
+                    //紧急联系人
+                    $('#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);
+
+                    });
+
+                    page.bind($page);
+
+
+                }
+
+            });
+
+            //保存
+            $page.find('#saveBtn').on('tap', function () {
+                var postdata = {
+                    ID: $('#ID').val()
+                };
+                learun.httpget(config.webapi + "/保存地址/", postdata, (data) => {
+                    if (data) {
+                        learun.layer.toast('保存成功');
+                        location.reload();
+                    }
+                });
+
+            });
+
+
+        },
+        bind: function ($page) {
+            //性别
+            $.each($page.find('[name="Sex"]'), function (i, item) {
+                $page.find(item).lrpickerex({
+                    code: 'usersex',
+                    type: 'dataItem'
+                });
+                //赋值
+                $(item).lrpickerSet($(item).attr('value'));
+            });
+            //政治面貌
+            $.each($page.find('[name="Politicy"]'), function (i, item) {
+                $page.find(item).lrpickerex({
+                    code: 'PolityStatus',
+                    type: 'dataItem'
+                });
+                //赋值
+                $(item).lrpickerSet($(item).attr('value'));
+            });
+            //与本人关系
+            $.each($page.find('#StuInfoFreshFamily').find('[name="Relation"]'), function (i, item) {
+                $page.find(item).lrpickerex({
+                    code: 'FamilyRelation',
+                    type: 'dataItem'
+                });
+                //赋值
+                $(item).lrpickerSet($(item).attr('value'));
+            });
+        }
+    };
+    //数据处理
+    function family() {
+        var list = new Array();
+        $.each($('#StuInfoFreshFamily').children('.welCon'), function (i, item) {
+            var o = $(item).children(".welConForm").serializeObject();
+            o.Sex = $(item).find('[name="Sex"]').lrpickerGet();
+            o.Politicy = $(item).find('[name="Politicy"]').lrpickerGet();
+            o.Relation = $(item).find('[name="Relation"]').lrpickerGet();
+            list.push(o);
+        });
+        return list;
+    }
+    function emergePeople() {
+        var list = new Array();
+        $.each($('#StuInfoFreshEmergePeople').children('.welCon'), function (i, item) {
+            var o = $(item).children(".welConForm").serializeObject();
+            list.push(o);
+        });
+        return list;
+    }
+
+    $.fn.serializeObject = function () {
+        var o = {};
+        var a = this.serializeArray();
+        $.each(a, function () {
+            if (o[this.name]) {
+                if (!o[this.name].push) {
+                    o[this.name] = [o[this.name]];
+                }
+                o[this.name].push(this.value || '');
+            } else {
+                o[this.name] = this.value || '';
+            }
+        });
+        return o;
+    }
+    
+
+    //产生随机数
+    function GenerateRandom() {
+        var retstr = "";
+        var date = new Date();
+        retstr = date.getFullYear().toString() + "-" + date.getMonth().toString() + "-" + date.getDate().toString() + "-" + date.getUTCHours().toString() + "-" + date.getUTCMinutes() + "-" + date.getUTCSeconds().toString();
+        var Num = "";
+        for (var i = 0; i < 6; i++) {
+            Num += Math.floor(Math.random() * 10);
+        }
+        return retstr + Num;
+    }
+
+    return page;
+})();

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

@@ -35,7 +35,7 @@
     <div class="noticeBox">
         <div class="noticeTitle">报到内容</div>
         <div class="noticeTxt">
-            <span>是否完善个人信息</span><span id="ClassTutorNo">未完善</span>
+            <span>是否完善个人信息</span><span id="IsCompleteInfo">未完善</span>
         </div>
         <div class="noticeTxt">
             <span>交档案状态</span><span id="CollectFileStatus">未提交</span>

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

@@ -19,7 +19,7 @@
                         $('#PayFeeStatus').html(entity.PayFeeStatus);
                         $('#CollectFileStatus').html(entity.CollectFileStatus);
                         $('#GetKeyStatus').html(entity.GetKeyStatus);
-                        $('#ClassTutorNo').html(entity.ClassTutorNo);
+                        $('#IsCompleteInfo').html(entity.IsCompleteInfo);
                         $('#Dormitory').html(entity.DormitoryName);
                     }
                 }

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

@@ -0,0 +1,112 @@
+.enSecBox{
+	min-height: 100%;
+	background-color: #fff;
+}
+.ensTime{
+	position: relative;
+	text-align: center;
+	line-height: 24px;
+	font-size: 14px;
+	color: #B8E2FF;
+}
+.ensTime:after,.ensTime::before{
+	content: '';
+	width: .12rem;
+	height: .12rem;
+	background-color: #B8E2FF;
+	border-radius: 50%;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	margin: auto;
+}
+.ensTime:after{
+	right: 20%;
+}
+.ensTime::before{
+	left: 20%;
+}
+.ensHeader{
+	background-color: #0C86D8;
+	padding: .4rem 0;
+}
+.ensHeadT{
+	font-size: 18px;
+	color: #fff;
+	text-align: center;
+	margin-top: .3rem;
+}
+.ensSec1{
+	padding: 0 15px;
+}
+.eSec1Box{
+	position: relative;
+	margin-top: .4rem;
+}
+.eSec1Box:first-child{
+	margin-top: .2rem;
+}
+.sSecDown{
+	position: absolute;
+	width: .5rem;
+	left: 0;
+	right: 0;
+	top: -.08rem;
+	margin: auto;
+}
+.eSec1Top{
+	font-size: 14px;
+	font-weight: bold;
+	color: #ABDDFF;
+	font-style: italic;
+	padding-left: .35rem;
+}
+.eSec1Top span {
+	color: #0C86D8;
+	font-size: 20px;
+	margin-left: 5px;
+}
+.sSec1Con{
+	padding: .1rem .3rem .1rem .5rem;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-top: .2rem;
+}
+.sSec1Type1{
+	border: 2px solid #AEE8CF;
+	border-radius: .6rem;
+}
+.sSec1Type1 .sSec1State{
+	color: #12B215;
+}
+.sSec1Type2{
+	border: 2px solid #B8E2FF;
+	border-radius: .65rem;
+}
+.sSec1Type2 .sSec1State{
+	color: #17AAEE;
+}
+.sSec1Con > img{
+	width: .6rem;
+}
+.sSec1State{
+	font-size: 14px;
+} 
+.sSec1Txt{
+	font-size: 16px;
+	text-align: center;
+	color: #1A1A1A;
+	margin: .1rem 0;
+}
+.sSec1Txt span{
+	display: block;
+	color: #9A9A9A;
+	margin-top: 2px;
+	font-size: 12px;
+}
+
+
+
+
+

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

@@ -0,0 +1,61 @@
+<div class="enSecBox">
+	<!-- 已完成 类名 sSec1Type1 图片   enter1-1 enter1-2 enter1-3 enter1-4 enter1-5-->
+	<!-- 未完成 类名 sSec1Type2 图片   enter2-1 enter2-2 enter2-3 enter2-4 enter2-5-->
+	<!-- 可以点击类名  sSec1Tap -->
+	<div class="ensHeader">
+		<div class="ensTime">2020</div>
+		<div class="ensHeadT">新生入校流程</div>
+	</div>
+	<div class="ensSec1">
+		<div class="eSec1Box">
+			<div class="eSec1Top">step<span>1</span></div>
+			<div class="sSec1Con sSec1Type1" id="IsCompleteInfo">
+				<img src="images/enter1-1.png" alt="">
+				<div class="sSec1Txt">
+					完善学生信息
+				</div>
+				<div class="sSec1State">已完成</div>
+			</div>
+		</div>
+		<div class="eSec1Box">
+			<img src="images/enter1-6.png" alt="" class="sSecDown">
+			<div class="eSec1Top">step<span>2</span></div>
+			<div class="sSec1Con sSec1Type2" id="PayFeeStatus">
+				<img src="images/enter1-2.png" alt="">
+				<div class="sSec1Txt">
+					线上缴费
+					<span>( 已缴费、未缴费 )</span>
+				</div>
+				<div class="sSec1State">未完成</div>
+			</div>
+			<div class="sSec1Con sSec1Type1" id="StudentLoan">
+				<img src="images/enter1-3.png" alt="">
+				<div class="sSec1Txt">
+					助学贷款
+					<span>( 填写贷款回执码 )</span>
+				</div>
+				<div class="sSec1State">已完成</div>
+			</div>
+			<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 class="eSec1Box">
+			<img src="images/enter1-6.png" alt="" class="sSecDown">
+			<div class="eSec1Top">step<span>3</span></div>
+			<div class="sSec1Con sSec1Type2" id="RegisterStatus">
+				<img src="images/enter2-5.png" alt="">
+				<div class="sSec1Txt">
+					报到注册
+					<span>( 生成报到二维码，并显示报到教室 )</span>
+				</div>
+				<div class="sSec1State">未完成</div>
+			</div>
+		</div>
+	</div>
+</div>

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

@@ -0,0 +1,83 @@
+(function () {
+    (function fontSize() {
+        var html = document.documentElement;
+        var windowWidth = html.clientWidth;
+        html.style.fontSize = 100 * (windowWidth / 750) + 'px';
+    })()
+    var page = {
+        isScroll: false,
+        init: function ($page) {
+            //数据绑定 
+            learun.layer.loading(true, '获取数据中');
+            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => {
+                if (data) {
+                    for (var id in data) {
+                        if (id == "StuInfoFreshEntity") {
+                            //todo:乱码
+                            console.log(data[id].IsCompleteInfo == "已完善");//false
+
+                            if (data[id].IsCompleteInfo == "已完善") {
+                                completeStyle("#IsCompleteInfo", "images/enter1-1.png");
+                            } else {
+                                notCompleteStyle("#IsCompleteInfo", "images/enter2-1.png");
+                            }
+                            if (data[id].PayFeeStatus == "已缴费") {
+                                completeStyle("#PayFeeStatus", "images/enter1-2.png");
+                            } else {
+                                notCompleteStyle("#PayFeeStatus", "images/enter2-2.png");
+                            }
+                            if (data[id].StudentLoan == null || data[id].StudentLoan == "" || data[id].StudentLoan == undefined) {
+                                notCompleteStyle("#StudentLoan", "images/enter2-3.png");
+                            } else {
+                                completeStyle("#StudentLoan", "images/enter1-3.png");
+                            }
+                            if (data[id].OnsitePayFeeStatus == "1") {
+                                completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
+                            } else {
+                                notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
+                            }
+                            if (data[id].RegisterStatus == "1") {
+                                completeStyle("#RegisterStatus", "images/enter1-5.png");
+                            } else {
+                                notCompleteStyle("#RegisterStatus", "images/enter2-5.png");
+                            }
+
+                        }
+                    }
+                    page.bind($page);
+                    learun.layer.loading(false);
+                }
+            });
+
+            //点击步骤
+            $page.on('tap', '#IsCompleteInfo', function () {
+                learun.nav.go({ path: 'welcome', title: '完善新生信息', isBack: true, isHead: true, param: {}, type: 'right' });
+            });
+            $page.on('tap', '#RegisterStatus', function () {
+                learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: '生成报到二维码', isBack: true, isHead: true, param: {}, type: 'right' });
+            });
+            $page.on('tap', '#StudentLoan', function () {
+                learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/StudentLoan', title: '填写贷款回执码', isBack: true, isHead: true, param: {}, type: 'right' });
+            });
+
+        },
+        bind: function ($page) {
+
+        }
+    };
+    //已完成样式
+    var completeStyle = function (box, img) {
+        $(box).removeClass("sSec1Type2").addClass("sSec1Type1");
+        $(box).find(".sSec1State").html("已完成");
+        $(box).find('img').attr("src", img);
+    };
+    //已完成样式
+    var notCompleteStyle = function (box, img) {
+        $(box).removeClass("sSec1Type1").addClass("sSec1Type2");
+        $(box).find(".sSec1State").html("未完成");
+        $(box).find('img').attr("src", img);
+
+    };
+
+    return page;
+})();

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

@@ -46,7 +46,6 @@
                         $desktop.append(_html);
 
                         learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'list', id: _item.F_Id }, function (data) {
-                            console.log(data);
                             if (data) {
                                 var $list = $('[data-desktop="' + data.Id + '"]');
                                 //待办
@@ -202,11 +201,11 @@
                         var $desktop = $('#lr_desktop_msg_content');
                         $desktop.html('');
                         var logininfo = learun.storage.get('userinfo');
-                        //if (logininfo.baseinfo.Description != "学生") {
-                        //    target(data.target || [], $desktop);
-                        //    chart(data.chart || [], $desktop);
-                        //}
-                        list(data.list || [], $desktop);
+                        if (logininfo.baseinfo.Description != "学生") {
+                            //target(data.target || [], $desktop);
+                            //chart(data.chart || [], $desktop);
+                            list(data.list || [], $desktop);
+                        }
 
                         if (self) {
                             self.refresh(true);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Controllers/AP_OnlineUserInfoController.cs

@@ -83,6 +83,33 @@ namespace Learun.Application.Web.Areas.AdmissionsPlatform.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 主页面【缴费信息】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult PaymentIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面【报到信息】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ReportIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面【退学信息】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult DropOutIndex()
+        {
+            return View();
+        }
         #endregion
 
         #region  获取数据
@@ -261,9 +288,9 @@ namespace Learun.Application.Web.Areas.AdmissionsPlatform.Controllers
         /// <returns></returns>
         [HttpPost]
         [AjaxOnly]
-        public ActionResult DoDropOut(string keyValue)
+        public ActionResult DoDropOut(string keyValue, string status)
         {
-            onlineUserInfoIBLL.DoDropOut(keyValue);
+            onlineUserInfoIBLL.DoDropOut(keyValue, status);
             return Success("操作成功！");
         }
         /// <summary>

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

@@ -0,0 +1,59 @@
+@{
+    ViewBag.Title = "退学信息";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout" id="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-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="RealName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">手机号</div>
+                                    <input id="Mobile" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">性别</div>
+                                    <div id="SexId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">报名方式</div>
+                                    <div id="EnrollMode"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">推荐老师</div>
+                                    <div id="UserTeacherId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="AppStatus"></div>
+                                </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_Drop" class="btn btn-default"><i class="fa fa-trash"></i>&nbsp;退学</a>
+                        <a id="lr_DropCancel" class="btn btn-default"><i class="fa fa-trash"></i>&nbsp;取消退学</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js")

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

@@ -0,0 +1,328 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-04-17 15:45
+ * 描  述：退学信息
+ */
+var selectedRow;
+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);
+            }, 250, 400);
+            $("#SexId").lrDataItemSelect({ code: 'usersex' });
+            $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+            $('#UserTeacherId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+                param: { strWhere: "1=1 " },
+                value: "empid",
+                text: "empname"
+            });
+            $("#EnrollMode").lrDataItemSelect({ code: 'EnrollMode' });
+            $("#AppStatus").lrDataItemSelect({ code: 'AdmissionsAppStatus' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //退学
+            $('#lr_Drop').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var IsDropOut = $('#gridtable').jfGridValue('IsDropOut');
+                    if (IsDropOut.indexOf('1') != -1) {
+                        learun.alert.warning("选中记录中包含已退学项目！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认退学该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/DoDropOut', { keyValue: keyValue, status: '1' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //取消退学
+            $('#lr_DropCancel').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var IsDropOut = $('#gridtable').jfGridValue('IsDropOut');
+                    if (IsDropOut.indexOf('0') != -1) {
+                        learun.alert.warning("选中记录中包含未退学项目！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认取消退学该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/DoDropOut', { keyValue: keyValue, status: '0' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/GetPageListOfRegistrate',
+                headData: [
+                    {
+                        label: '审核状态', name: 'AppStatus', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'AdmissionsAppStatus',
+                                callback: function (_data) {
+                                    //callback(_data.text);
+                                    if (_data.text) {
+                                        if (_data.text == "通过") {
+                                            callback('<span class=\"label label-success\">' + _data.text + '</span>');
+                                        } else if (_data.text == "未通过") {
+                                            callback('<span class=\"label label-danger\">' + _data.text + '</span>');
+                                        } else {
+                                            callback('<span class=\"label label-default\">' + _data.text + '</span>');
+                                        }
+                                    }
+                                }
+                            });
+                        }
+                    },
+                    { label: '创建时间', name: 'CreateDate', width: 130, align: "left" },
+                    { label: '姓名', name: 'RealName', width: 100, align: "left" },
+                    { label: '手机号码', name: 'Mobile', width: 100, align: "left" },
+                    {
+                        label: '是否退学', name: 'IsDropOut', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">是</span>" : "<span class=\"label label-warning\">否</span>";
+                        }
+                    },
+                    { label: '身份证号', name: 'CertNum', width: 100, align: "left" },
+                    {
+                        label: '性别', name: 'SexId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'usersex',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '出生日期', name: 'BirthDate', width: 100, align: "left" },
+                    {
+                        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',
+                                key: value,
+                                keyId: 'nationalityno',
+                                callback: function (_data) {
+                                    callback(_data['nationality']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        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',
+                                key: value,
+                                keyId: 'partyfaceno',
+                                callback: function (_data) {
+                                    callback(_data['partyface']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '现户籍所在地', name: 'OriginAddress', width: 100, align: "left" },
+                    {
+                        label: '户口性质', name: 'OriginId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ResidenceNo',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '在籍年份', name: 'SchoolDate', width: 100, align: "left" },
+                    { label: '详细地址', name: 'DetailedAddress', width: 100, align: "left" },
+                    { label: '邮政编码', name: 'ZipCode', width: 100, align: "left" },
+                    {
+                        label: '学习形式', name: 'YearFormId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StudyModality',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '招生季度', name: 'QuarterId', width: 100, align: "left" },
+                    { label: '毕业学校', name: 'GraduateSchool', width: 100, align: "left" },
+                    { label: '爱好特长', name: 'Hobbies', width: 100, align: "left" },
+                    {
+                        label: '文化程度', name: 'CultureId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree',
+                                key: value,
+                                keyId: 'culturedegreeno',
+                                callback: function (_data) {
+                                    callback(_data['culturedegree']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '银行卡号', name: 'BankNumber', width: 100, align: "left" },
+                    {
+                        label: '学制', name: 'LearnLength', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EduSystem',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '家庭联系人', name: 'FamilyLinkman', width: 100, align: "left" },
+                    { label: '家庭联系电话', name: 'FamilyPhone', width: 100, align: "left" },
+                    { label: '家庭年总收入', name: 'FamilyIncome', width: 100, align: "left" },
+                    { label: '家庭人均收入', name: 'FamilyFenIncome', width: 100, align: "left" },
+                    {
+                        label: '是否十万以下民族', name: 'IsTenId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '是否家庭困难', name: 'IsHardId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '是否低保', name: 'IsBasicId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '收入来源', name: 'IncomeSourceId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'IncomeSource',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '报考校区', name: 'SchoolId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                key: value,
+                                keyId: 'f_companyid',
+                                callback: function (_data) {
+                                    callback(_data['f_fullname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '报考专业', name: 'MajorId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '推荐老师', name: 'UserTeacherId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '缴费额度', name: 'PaymentQuota', width: 100, align: "left" },
+                    { label: '报名时间', name: 'EnrollDate', width: 100, align: "left" },
+                    {
+                        label: '报名方式', name: 'EnrollMode', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EnrollMode',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+
+                ],
+                mainId: 'Id',
+                isPage: true,
+                isMultiselect: true,
+                sord: 'desc',
+                sidx: 'CreateDate'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

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

@@ -0,0 +1,66 @@
+@{
+    ViewBag.Title = "缴费信息";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout" id="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-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="RealName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">手机号</div>
+                                    <input id="Mobile" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">性别</div>
+                                    <div id="SexId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否缴费</div>
+                                    <div id="IsPaymentId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">缴费方式</div>
+                                    <div id="PaymentMode"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">报名方式</div>
+                                    <div id="EnrollMode"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">推荐老师</div>
+                                    <div id="UserTeacherId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="AppStatus"></div>
+                                </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_Pay" class="btn btn-default"><i class="fa fa-dollar"></i>&nbsp;缴费</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js")

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

@@ -0,0 +1,324 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-04-17 15:45
+ * 描  述：缴费信息
+ */
+var selectedRow;
+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);
+            }, 250, 400);
+            $("#SexId").lrDataItemSelect({ code: 'usersex' });
+            $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+            $('#UserTeacherId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+                param: { strWhere: "1=1 " },
+                value: "empid",
+                text: "empname"
+            });
+            $("#IsPaymentId").lrDataItemSelect({ code: 'YesOrNoInt' });
+            $("#PaymentMode").lrDataItemSelect({ code: 'PaymentMode' });
+            $("#EnrollMode").lrDataItemSelect({ code: 'EnrollMode' });
+            $("#AppStatus").lrDataItemSelect({ code: 'AdmissionsAppStatus' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //缴费
+            $('#lr_Pay').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'PaymentForm',
+                        title: '缴费',
+                        url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/PaymentForm?keyValue=' + keyValue,
+                        width: 700,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/GetPageListOfRegistrate',
+                headData: [
+                    {
+                        label: '审核状态', name: 'AppStatus', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'AdmissionsAppStatus',
+                                callback: function (_data) {
+                                    //callback(_data.text);
+                                    if (_data.text) {
+                                        if (_data.text == "通过") {
+                                            callback('<span class=\"label label-success\">' + _data.text + '</span>');
+                                        } else if (_data.text == "未通过") {
+                                            callback('<span class=\"label label-danger\">' + _data.text + '</span>');
+                                        } else {
+                                            callback('<span class=\"label label-default\">' + _data.text + '</span>');
+                                        }
+                                    }
+                                }
+                            });
+                        }
+                    },
+                    { label: '创建时间', name: 'CreateDate', width: 130, align: "left" },
+                    { label: '姓名', name: 'RealName', width: 100, align: "left" },
+                    { label: '手机号码', name: 'Mobile', width: 100, align: "left" },
+                    {
+                        label: '是否缴费', name: 'IsPaymentId', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">是</span>" : "<span class=\"label label-warning\">否</span>";
+                        }
+                    },
+                    { label: '缴费时间', name: 'PaymentDate', width: 100, align: "left" },
+                    {
+                        label: '缴费方式', name: 'PaymentMode', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'PaymentMode',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '身份证号', name: 'CertNum', width: 100, align: "left" },
+                    {
+                        label: '性别', name: 'SexId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'usersex',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '出生日期', name: 'BirthDate', width: 100, align: "left" },
+                    {
+                        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',
+                                key: value,
+                                keyId: 'nationalityno',
+                                callback: function (_data) {
+                                    callback(_data['nationality']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        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',
+                                key: value,
+                                keyId: 'partyfaceno',
+                                callback: function (_data) {
+                                    callback(_data['partyface']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '现户籍所在地', name: 'OriginAddress', width: 100, align: "left" },
+                    {
+                        label: '户口性质', name: 'OriginId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ResidenceNo',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '在籍年份', name: 'SchoolDate', width: 100, align: "left" },
+                    { label: '详细地址', name: 'DetailedAddress', width: 100, align: "left" },
+                    { label: '邮政编码', name: 'ZipCode', width: 100, align: "left" },
+                    {
+                        label: '学习形式', name: 'YearFormId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StudyModality',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '招生季度', name: 'QuarterId', width: 100, align: "left" },
+                    { label: '毕业学校', name: 'GraduateSchool', width: 100, align: "left" },
+                    { label: '爱好特长', name: 'Hobbies', width: 100, align: "left" },
+                    {
+                        label: '文化程度', name: 'CultureId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree',
+                                key: value,
+                                keyId: 'culturedegreeno',
+                                callback: function (_data) {
+                                    callback(_data['culturedegree']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '银行卡号', name: 'BankNumber', width: 100, align: "left" },
+                    {
+                        label: '学制', name: 'LearnLength', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EduSystem',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '家庭联系人', name: 'FamilyLinkman', width: 100, align: "left" },
+                    { label: '家庭联系电话', name: 'FamilyPhone', width: 100, align: "left" },
+                    { label: '家庭年总收入', name: 'FamilyIncome', width: 100, align: "left" },
+                    { label: '家庭人均收入', name: 'FamilyFenIncome', width: 100, align: "left" },
+                    {
+                        label: '是否十万以下民族', name: 'IsTenId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '是否家庭困难', name: 'IsHardId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '是否低保', name: 'IsBasicId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '收入来源', name: 'IncomeSourceId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'IncomeSource',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '报考校区', name: 'SchoolId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                key: value,
+                                keyId: 'f_companyid',
+                                callback: function (_data) {
+                                    callback(_data['f_fullname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '报考专业', name: 'MajorId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '推荐老师', name: 'UserTeacherId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '缴费额度', name: 'PaymentQuota', width: 100, align: "left" },
+                    { label: '报名时间', name: 'EnrollDate', width: 100, align: "left" },
+                    {
+                        label: '报名方式', name: 'EnrollMode', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EnrollMode',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+
+                ],
+                mainId: 'Id',
+                isPage: true,
+                isMultiselect: true,
+                sord: 'desc',
+                sidx: 'CreateDate'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

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

@@ -65,9 +65,6 @@
                         <a id="lr_checkYes" class="btn btn-default"><i class="fa fa-check"></i>&nbsp;审核通过</a>
                         <a id="lr_checkNo" class="btn btn-default"><i class="fa fa-close"></i>&nbsp;审核不通过</a>
                         <a id="lr_bindTeacher" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;关联教师</a>
-                        <a id="lr_Pay" class="btn btn-default"><i class="fa fa-dollar"></i>&nbsp;缴费</a>
-                        <a id="lr_Report" class="btn btn-default"><i class="fa fa-clock-o"></i>&nbsp;报到</a>
-                        <a id="lr_Drop" class="btn btn-default"><i class="fa fa-trash"></i>&nbsp;退学</a>
                     </div>
                 </div>
             </div>

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

@@ -142,58 +142,6 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            //缴费
-            $('#lr_Pay').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                selectedRow = $('#gridtable').jfGridGet('rowdata');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerForm({
-                        id: 'PaymentForm',
-                        title: '缴费',
-                        url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/PaymentForm?keyValue=' + keyValue,
-                        width: 700,
-                        height: 400,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        }
-                    });
-                }
-            });
-            //报到
-            $('#lr_Report').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                selectedRow = $('#gridtable').jfGridGet('rowdata');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerForm({
-                        id: 'ReportForm',
-                        title: '报到',
-                        url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/ReportForm?keyValue=' + keyValue,
-                        width: 700,
-                        height: 400,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        }
-                    });
-                }
-            });
-            //退学
-            $('#lr_Drop').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    var IsDropOut = $('#gridtable').jfGridValue('IsDropOut');
-                    if (IsDropOut.indexOf('1') != -1) {
-                        learun.alert.warning("选中记录中包含已退学项目！");
-                        return;
-                    }
-                    learun.layerConfirm('是否确认退学该项！', function (res) {
-                        if (res) {
-                            learun.postForm(top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/DoDropOut', { keyValue: keyValue }, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
 
         },
         initGird: function () {
@@ -207,7 +155,16 @@ var bootstrap = function ($, learun) {
                                 key: value,
                                 code: 'AdmissionsAppStatus',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    //callback(_data.text);
+                                    if (_data.text) {
+                                        if (_data.text == "通过") {
+                                            callback('<span class=\"label label-success\">' + _data.text + '</span>');
+                                        } else if (_data.text == "未通过") {
+                                            callback('<span class=\"label label-danger\">' + _data.text + '</span>');
+                                        } else {
+                                            callback('<span class=\"label label-default\">' + _data.text + '</span>');
+                                        }
+                                    }
                                 }
                             });
                         }
@@ -405,15 +362,8 @@ var bootstrap = function ($, learun) {
                     },
                     { label: '缴费额度', name: 'PaymentQuota', width: 100, align: "left" },
                     {
-                        label: '是否缴费', name: 'IsPaymentId', width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'YesOrNoInt',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
+                        label: '是否缴费', name: 'IsPaymentId', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">是</span>" : "<span class=\"label label-warning\">否</span>";
                         }
                     },
                     { label: '缴费时间', name: 'PaymentDate', width: 100, align: "left" },
@@ -436,7 +386,16 @@ var bootstrap = function ($, learun) {
                                 key: value,
                                 code: 'IsReport',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    //callback(_data.text);
+                                    if (_data.text) {
+                                        if (_data.text == "正常报到") {
+                                            callback('<span class=\"label label-success\">' + _data.text + '</span>');
+                                        } else if (_data.text == "异常报到") {
+                                            callback('<span class=\"label label-danger\">' + _data.text + '</span>');
+                                        } else {
+                                            callback('<span class=\"label label-default\">' + _data.text + '</span>');
+                                        }
+                                    }
                                 }
                             });
                         }
@@ -455,15 +414,8 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '是否退学', name: 'IsDropOut', width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'YesOrNoInt',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
+                        label: '是否退学', name: 'IsDropOut', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">是</span>" : "<span class=\"label label-warning\">否</span>";
                         }
                     },
 

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

@@ -0,0 +1,62 @@
+@{
+    ViewBag.Title = "报到信息";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout" id="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-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="RealName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">手机号</div>
+                                    <input id="Mobile" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">性别</div>
+                                    <div id="SexId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否报到</div>
+                                    <div id="IsReportId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">报名方式</div>
+                                    <div id="EnrollMode"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">推荐老师</div>
+                                    <div id="UserTeacherId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="AppStatus"></div>
+                                </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_Report" class="btn btn-default"><i class="fa fa-clock-o"></i>&nbsp;报到</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js")

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

@@ -0,0 +1,326 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-04-17 15:45
+ * 描  述：报到信息
+ */
+var selectedRow;
+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);
+            }, 250, 400);
+            $("#SexId").lrDataItemSelect({ code: 'usersex' });
+            $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+            $('#UserTeacherId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+                param: { strWhere: "1=1 " },
+                value: "empid",
+                text: "empname"
+            });
+            $("#IsReportId").lrDataItemSelect({ code: 'IsReport' });
+            $("#EnrollMode").lrDataItemSelect({ code: 'EnrollMode' });
+            $("#AppStatus").lrDataItemSelect({ code: 'AdmissionsAppStatus' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //报到
+            $('#lr_Report').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'ReportForm',
+                        title: '报到',
+                        url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/ReportForm?keyValue=' + keyValue,
+                        width: 700,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/GetPageListOfRegistrate',
+                headData: [
+                    {
+                        label: '审核状态', name: 'AppStatus', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'AdmissionsAppStatus',
+                                callback: function (_data) {
+                                    //callback(_data.text);
+                                    if (_data.text) {
+                                        if (_data.text == "通过") {
+                                            callback('<span class=\"label label-success\">' + _data.text + '</span>');
+                                        } else if (_data.text == "未通过") {
+                                            callback('<span class=\"label label-danger\">' + _data.text + '</span>');
+                                        } else {
+                                            callback('<span class=\"label label-default\">' + _data.text + '</span>');
+                                        }
+                                    }
+                                }
+                            });
+                        }
+                    },
+                    { label: '创建时间', name: 'CreateDate', width: 130, align: "left" },
+                    { label: '姓名', name: 'RealName', width: 100, align: "left" },
+                    { label: '手机号码', name: 'Mobile', width: 100, align: "left" },
+                    {
+                        label: '是否报到', name: 'IsReportId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'IsReport',
+                                callback: function (_data) {
+                                    //callback(_data.text);
+                                    if (_data.text) {
+                                        if (_data.text == "正常报到") {
+                                            callback('<span class=\"label label-success\">' + _data.text + '</span>');
+                                        } else if (_data.text == "异常报到") {
+                                            callback('<span class=\"label label-danger\">' + _data.text + '</span>');
+                                        } else {
+                                            callback('<span class=\"label label-default\">' + _data.text + '</span>');
+                                        }
+                                    }
+                                }
+                            });
+                        }
+                    },
+                    { label: '身份证号', name: 'CertNum', width: 100, align: "left" },
+                    {
+                        label: '性别', name: 'SexId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'usersex',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '出生日期', name: 'BirthDate', width: 100, align: "left" },
+                    {
+                        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',
+                                key: value,
+                                keyId: 'nationalityno',
+                                callback: function (_data) {
+                                    callback(_data['nationality']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        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',
+                                key: value,
+                                keyId: 'partyfaceno',
+                                callback: function (_data) {
+                                    callback(_data['partyface']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '现户籍所在地', name: 'OriginAddress', width: 100, align: "left" },
+                    {
+                        label: '户口性质', name: 'OriginId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ResidenceNo',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '在籍年份', name: 'SchoolDate', width: 100, align: "left" },
+                    { label: '详细地址', name: 'DetailedAddress', width: 100, align: "left" },
+                    { label: '邮政编码', name: 'ZipCode', width: 100, align: "left" },
+                    {
+                        label: '学习形式', name: 'YearFormId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StudyModality',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '招生季度', name: 'QuarterId', width: 100, align: "left" },
+                    { label: '毕业学校', name: 'GraduateSchool', width: 100, align: "left" },
+                    { label: '爱好特长', name: 'Hobbies', width: 100, align: "left" },
+                    {
+                        label: '文化程度', name: 'CultureId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree',
+                                key: value,
+                                keyId: 'culturedegreeno',
+                                callback: function (_data) {
+                                    callback(_data['culturedegree']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '银行卡号', name: 'BankNumber', width: 100, align: "left" },
+                    {
+                        label: '学制', name: 'LearnLength', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EduSystem',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '家庭联系人', name: 'FamilyLinkman', width: 100, align: "left" },
+                    { label: '家庭联系电话', name: 'FamilyPhone', width: 100, align: "left" },
+                    { label: '家庭年总收入', name: 'FamilyIncome', width: 100, align: "left" },
+                    { label: '家庭人均收入', name: 'FamilyFenIncome', width: 100, align: "left" },
+                    {
+                        label: '是否十万以下民族', name: 'IsTenId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '是否家庭困难', name: 'IsHardId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '是否低保', name: 'IsBasicId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '收入来源', name: 'IncomeSourceId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'IncomeSource',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '报考校区', name: 'SchoolId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                key: value,
+                                keyId: 'f_companyid',
+                                callback: function (_data) {
+                                    callback(_data['f_fullname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '报考专业', name: 'MajorId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '推荐老师', name: 'UserTeacherId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '缴费额度', name: 'PaymentQuota', width: 100, align: "left" },
+                    { label: '报名时间', name: 'EnrollDate', width: 100, align: "left" },
+                    {
+                        label: '报名方式', name: 'EnrollMode', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EnrollMode',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+
+                ],
+                mainId: 'Id',
+                isPage: true,
+                isMultiselect: true,
+                sord: 'desc',
+                sidx: 'CreateDate'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Form.cshtml

@@ -1,187 +0,0 @@
-@{
-    ViewBag.Title = "招生学生信息";
-    Layout = "~/Views/Shared/_Form.cshtml";
-}
-<div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">学生ID<font face="宋体">*</font></div>
-        <input id="Id" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">人员ID<font face="宋体">*</font></div>
-        <input id="UserId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">学员编号<font face="宋体">*</font></div>
-        <input id="StudentNumber" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">报考类别（字典）<font face="宋体">*</font></div>
-        <input id="ExamineTypeId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">考生类别（字典）<font face="宋体">*</font></div>
-        <input id="ExamineeTypeId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">考生情况（字典）<font face="宋体">*</font></div>
-        <input id="ExamineeConditionId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">家庭出生(字典):农民、工人、干部<font face="宋体">*</font></div>
-        <input id="FamilyBirthId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">本人成分（字典）<font face="宋体">*</font></div>
-        <input id="OneselfComponent" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">文化程度（字典）<font face="宋体">*</font></div>
-        <input id="CultureId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">婚否（字典）<font face="宋体">*</font></div>
-        <input id="MarriageId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">属何种照顾对象<font face="宋体">*</font></div>
-        <input id="WhichCareObject" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">爱好特长<font face="宋体">*</font></div>
-        <input id="Hobbies" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">是否城镇户口<font face="宋体">*</font></div>
-        <input id="IsTownId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">现学习或工作单位<font face="宋体">*</font></div>
-        <input id="WorkUnit" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">任何职务<font face="宋体">*</font></div>
-        <input id="PostDuties" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">工种（字典）<font face="宋体">*</font></div>
-        <input id="WorkTypeId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">证书编号<font face="宋体">*</font></div>
-        <input id="CertificateNumber" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">何时何地受过何种奖励或处分<font face="宋体">*</font></div>
-        <input id="RewardOrPunish" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">招生季度（字典）<font face="宋体">*</font></div>
-        <input id="QuarterId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">学习形式（字典）:全日制<font face="宋体">*</font></div>
-        <input id="YearFormId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">毕业学校<font face="宋体">*</font></div>
-        <input id="GraduateSchool" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
-        <input id="Class" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">银行卡号<font face="宋体">*</font></div>
-        <input id="BankNumber" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">学制（字典）<font face="宋体">*</font></div>
-        <input id="LearnLength" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">家庭联系人<font face="宋体">*</font></div>
-        <input id="FamilyLinkman" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">家庭联系电话<font face="宋体">*</font></div>
-        <input id="FamilyPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">家庭年总收入<font face="宋体">*</font></div>
-        <input id="FamilyIncome" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">家庭人均收入<font face="宋体">*</font></div>
-        <input id="FamilyFenIncome" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">是否十万以下民族（字典）:是、否<font face="宋体">*</font></div>
-        <input id="IsTenId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">是否家庭困难（字典）<font face="宋体">*</font></div>
-        <input id="IsHardId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">是否低保（字典）<font face="宋体">*</font></div>
-        <input id="IsBasicId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">收入来源（字典）:务农、工人、职员、教师<font face="宋体">*</font></div>
-        <input id="IncomeSourceId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">备注<font face="宋体">*</font></div>
-        <input id="Remarks" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">报考校区（字典）<font face="宋体">*</font></div>
-        <input id="SchoolId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">关联老师ID<font face="宋体">*</font></div>
-        <input id="UserTeacherId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">是否缴费（字典）<font face="宋体">*</font></div>
-        <input id="IsPaymentId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">缴费额度<font face="宋体">*</font></div>
-        <input id="PaymentQuota" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">缴费时间<font face="宋体">*</font></div>
-        <input id="PaymentDate" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">缴费方式（字典）:1现金交费、0网上交费<font face="宋体">*</font></div>
-        <input id="PaymentMode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">是否报到（字典）:1正常报到，0未报到，2异常报到<font face="宋体">*</font></div>
-        <input id="IsReportId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">报名时间<font face="宋体">*</font></div>
-        <input id="EnrollDate" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">报名方式（字典）:1现场报名、0网上报名<font face="宋体">*</font></div>
-        <input id="EnrollMode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">创建时间<font face="宋体">*</font></div>
-        <input id="CreateDate" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">身体状况:问卷调查<font face="宋体">*</font></div>
-        <input id="BodyRemarks" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">异常报到原因<font face="宋体">*</font></div>
-        <input id="ReportReason" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-</div>
-@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Form.js

@@ -1,38 +0,0 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
- * Copyright (c) 2013-2018 北京泉江科技有限公司 
- * 创建人：超级管理员
- * 日  期：2020-04-17 15:56
- * 描  述：招生学生信息
- */
-var acceptClick;
-var keyValue = request('keyValue');
-var bootstrap = function ($, learun) {
-    "use strict";
-    var selectedRow =learun.frameTab.currentIframe().selectedRow;
-    var page = {
-        init: function () {
-            page.initData();
-        },
-        bind: function () {
-        },
-        initData: function () {
-            if (!!selectedRow) {
-                $('#form').lrSetFormData(selectedRow);
-            }
-        }
-    };
-    // 保存数据
-    acceptClick = function (callBack) {
-        if (!$('#form').lrValidform()) {
-            return false;
-        }
-        var postData = $('#form').lrGetFormData();
-        $.lrSaveForm(top.$.rootUrl + '/AdmissionsPlatform/OnlineStudentInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
-            // 保存成功后才回调
-            if (!!callBack) {
-                callBack();
-            }
-        });
-    };
-    page.init();
-}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Index.cshtml

@@ -1,39 +0,0 @@
-@{
-    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">树形目录</div>
-            <div id="tree" class="lr-layout-body"></div>
-        </div>
-    </div>
-    <div class="lr-layout-center">
-        <div class="lr-layout-wrap">
-            <div class="lr-layout-title">标题</div>
-            <div class="lr-layout-tool">
-                <div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
-                    </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>
-                    </div>
-                </div>
-            </div>
-            <div class="lr-layout-body" id="gridtable"></div>
-        </div>
-    </div>
-</div>
-@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Index.js

@@ -1,134 +0,0 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
- * Copyright (c) 2013-2018 北京泉江科技有限公司 
- * 创建人：超级管理员
- * 日  期：2020-04-17 15:56
- * 描  述：招生学生信息
- */
-var selectedRow;
-var refreshGirdData;
-var bootstrap = function ($, learun) {
-    "use strict";
-    var page = {
-        init: function () {
-            page.initGird();
-            page.bind();
-        },
-        bind: function () {
-            // 查询
-            $('#btn_Search').on('click', function () {
-                var keyword = $('#txt_Keyword').val();
-                page.search({ keyword: keyword });
-            });
-            // 刷新
-            $('#lr_refresh').on('click', function () {
-                location.reload();
-            });
-            // 新增
-            $('#lr_add').on('click', function () {
-                selectedRow = null;
-                learun.layerForm({
-                    id: 'form',
-                    title: '新增',
-                    url: top.$.rootUrl + '/AdmissionsPlatform/OnlineStudentInfo/Form',
-                    width: 700,
-                    height: 400,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
-                    }
-                });
-            });
-            // 编辑
-            $('#lr_edit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                selectedRow = $('#gridtable').jfGridGet('rowdata');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerForm({
-                        id: 'form',
-                        title: '编辑',
-                        url: top.$.rootUrl + '/AdmissionsPlatform/OnlineStudentInfo/Form?keyValue=' + keyValue,
-                        width: 700,
-                        height: 400,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        }
-                    });
-                }
-            });
-            // 删除
-            $('#lr_delete').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerConfirm('是否确认删除该项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/AdmissionsPlatform/OnlineStudentInfo/DeleteForm', { keyValue: keyValue}, function () {
-                            });
-                        }
-                    });
-                }
-            });
-        },
-        initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/AdmissionsPlatform/OnlineStudentInfo/GetPageList',
-                headData: [
-                        { label: '学生ID', name: 'Id', width: 200, align: "left" },
-                        { label: '人员ID', name: 'UserId', width: 200, align: "left" },
-                        { label: '学员编号', name: 'StudentNumber', width: 200, align: "left" },
-                        { label: '报考类别（字典）', name: 'ExamineTypeId', width: 200, align: "left" },
-                        { label: '考生类别（字典）', name: 'ExamineeTypeId', width: 200, align: "left" },
-                        { label: '考生情况（字典）', name: 'ExamineeConditionId', width: 200, align: "left" },
-                        { label: '家庭出生(字典):农民、工人、干部', name: 'FamilyBirthId', width: 200, align: "left" },
-                        { label: '本人成分（字典）', name: 'OneselfComponent', width: 200, align: "left" },
-                        { label: '文化程度（字典）', name: 'CultureId', width: 200, align: "left" },
-                        { label: '婚否（字典）', name: 'MarriageId', width: 200, align: "left" },
-                        { label: '属何种照顾对象', name: 'WhichCareObject', width: 200, align: "left" },
-                        { label: '爱好特长', name: 'Hobbies', width: 200, align: "left" },
-                        { label: '是否城镇户口', name: 'IsTownId', width: 200, align: "left" },
-                        { label: '现学习或工作单位', name: 'WorkUnit', width: 200, align: "left" },
-                        { label: '任何职务', name: 'PostDuties', width: 200, align: "left" },
-                        { label: '工种（字典）', name: 'WorkTypeId', width: 200, align: "left" },
-                        { label: '证书编号', name: 'CertificateNumber', width: 200, align: "left" },
-                        { label: '何时何地受过何种奖励或处分', name: 'RewardOrPunish', width: 200, align: "left" },
-                        { label: '招生季度（字典）', name: 'QuarterId', width: 200, align: "left" },
-                        { label: '学习形式（字典）:全日制', name: 'YearFormId', width: 200, align: "left" },
-                        { label: '毕业学校', name: 'GraduateSchool', width: 200, align: "left" },
-                        { label: '班级', name: 'Class', width: 200, align: "left" },
-                        { label: '银行卡号', name: 'BankNumber', width: 200, align: "left" },
-                        { label: '学制（字典）', name: 'LearnLength', width: 200, align: "left" },
-                        { label: '家庭联系人', name: 'FamilyLinkman', width: 200, align: "left" },
-                        { label: '家庭联系电话', name: 'FamilyPhone', width: 200, align: "left" },
-                        { label: '家庭年总收入', name: 'FamilyIncome', width: 200, align: "left" },
-                        { label: '家庭人均收入', name: 'FamilyFenIncome', width: 200, align: "left" },
-                        { label: '是否十万以下民族（字典）:是、否', name: 'IsTenId', width: 200, align: "left" },
-                        { label: '是否家庭困难（字典）', name: 'IsHardId', width: 200, align: "left" },
-                        { label: '是否低保（字典）', name: 'IsBasicId', width: 200, align: "left" },
-                        { label: '收入来源（字典）:务农、工人、职员、教师', name: 'IncomeSourceId', width: 200, align: "left" },
-                        { label: '备注', name: 'Remarks', width: 200, align: "left" },
-                        { label: '报考校区（字典）', name: 'SchoolId', width: 200, align: "left" },
-                        { label: '关联老师ID', name: 'UserTeacherId', width: 200, align: "left" },
-                        { label: '是否缴费（字典）', name: 'IsPaymentId', width: 200, align: "left" },
-                        { label: '缴费额度', name: 'PaymentQuota', width: 200, align: "left" },
-                        { label: '缴费时间', name: 'PaymentDate', width: 200, align: "left" },
-                        { label: '缴费方式（字典）:1现金交费、0网上交费', name: 'PaymentMode', width: 200, align: "left" },
-                        { label: '是否报到（字典）:1正常报到，0未报到，2异常报到', name: 'IsReportId', width: 200, align: "left" },
-                        { label: '报名时间', name: 'EnrollDate', width: 200, align: "left" },
-                        { label: '报名方式（字典）:1现场报名、0网上报名', name: 'EnrollMode', width: 200, align: "left" },
-                        { label: '创建时间', name: 'CreateDate', width: 200, align: "left" },
-                        { label: '身体状况:问卷调查', name: 'BodyRemarks', width: 200, align: "left" },
-                        { label: '异常报到原因', name: 'ReportReason', width: 200, align: "left" },
-                ],
-                mainId:'Id',
-                isPage: true
-            });
-            page.search();
-        },
-        search: function (param) {
-            param = param || {};
-            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
-        }
-    };
-    refreshGirdData = function () {
-        page.search();
-    };
-    page.init();
-}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Form.cshtml

@@ -1,127 +0,0 @@
-@{
-    ViewBag.Title = "招生人员信息";
-    Layout = "~/Views/Shared/_Form.cshtml";
-}
-<div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">人员ID<font face="宋体">*</font></div>
-        <input id="Id" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">手机号码<font face="宋体">*</font></div>
-        <input id="Mobile" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">密码<font face="宋体">*</font></div>
-        <input id="Password" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">人员类型（字典）（1学生、2老师、3下乡老师）<font face="宋体">*</font></div>
-        <input id="TypeId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
-        <input id="RealName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">性别(字典)<font face="宋体">*</font></div>
-        <input id="SexId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">年龄<font face="宋体">*</font></div>
-        <input id="Age" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">民族<font face="宋体">*</font></div>
-        <input id="Nation" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">出生日期<font face="宋体">*</font></div>
-        <input id="BirthDate" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
-        <input id="CertNum" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">联系电话<font face="宋体">*</font></div>
-        <input id="Phone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">头像<font face="宋体">*</font></div>
-        <input id="PhotoUrl" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">邮箱<font face="宋体">*</font></div>
-        <input id="MailBox" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">省份<font face="宋体">*</font></div>
-        <input id="Province" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">市<font face="宋体">*</font></div>
-        <input id="City" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">县市、区<font face="宋体">*</font></div>
-        <input id="Country" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">政治面貌（字典）<font face="宋体">*</font></div>
-        <input id="PoliticsFace" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">邮政编码<font face="宋体">*</font></div>
-        <input id="ZipCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">籍贯<font face="宋体">*</font></div>
-        <input id="Origin" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">户口性质（字典）<font face="宋体">*</font></div>
-        <input id="OriginId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">现户籍所在地<font face="宋体">*</font></div>
-        <input id="OriginAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">详细地址<font face="宋体">*</font></div>
-        <input id="DetailedAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">在籍年份<font face="宋体">*</font></div>
-        <input id="SchoolDate" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">状态（字典）（启用、锁定）<font face="宋体">*</font></div>
-        <input id="StatusId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">创建时间<font face="宋体">*</font></div>
-        <input id="CreateDate" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">排序串<font face="宋体">*</font></div>
-        <input id="LayOrder" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">微信号<font face="宋体">*</font></div>
-        <input id="WXNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">审核状态1通过，2未审核，3未通过<font face="宋体">*</font></div>
-        <input id="AppStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">校区ID<font face="宋体">*</font></div>
-        <input id="CampusId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">数据来源（0、电脑1、安卓2、学生扫老师）<font face="宋体">*</font></div>
-        <input id="DataSource" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-</div>
-@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Form.js

@@ -1,38 +0,0 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
- * Copyright (c) 2013-2018 北京泉江科技有限公司 
- * 创建人：超级管理员
- * 日  期：2020-04-17 15:45
- * 描  述：招生人员信息
- */
-var acceptClick;
-var keyValue = request('keyValue');
-var bootstrap = function ($, learun) {
-    "use strict";
-    var selectedRow =learun.frameTab.currentIframe().selectedRow;
-    var page = {
-        init: function () {
-            page.initData();
-        },
-        bind: function () {
-        },
-        initData: function () {
-            if (!!selectedRow) {
-                $('#form').lrSetFormData(selectedRow);
-            }
-        }
-    };
-    // 保存数据
-    acceptClick = function (callBack) {
-        if (!$('#form').lrValidform()) {
-            return false;
-        }
-        var postData = $('#form').lrGetFormData();
-        $.lrSaveForm(top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
-            // 保存成功后才回调
-            if (!!callBack) {
-                callBack();
-            }
-        });
-    };
-    page.init();
-}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Index.cshtml

@@ -1,39 +0,0 @@
-@{
-    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">树形目录</div>
-            <div id="tree" class="lr-layout-body"></div>
-        </div>
-    </div>
-    <div class="lr-layout-center">
-        <div class="lr-layout-wrap">
-            <div class="lr-layout-title">标题</div>
-            <div class="lr-layout-tool">
-                <div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
-                    </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>
-                    </div>
-                </div>
-            </div>
-            <div class="lr-layout-body" id="gridtable"></div>
-        </div>
-    </div>
-</div>
-@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Index.js

@@ -1,119 +0,0 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
- * Copyright (c) 2013-2018 北京泉江科技有限公司 
- * 创建人：超级管理员
- * 日  期：2020-04-17 15:45
- * 描  述：招生人员信息
- */
-var selectedRow;
-var refreshGirdData;
-var bootstrap = function ($, learun) {
-    "use strict";
-    var page = {
-        init: function () {
-            page.initGird();
-            page.bind();
-        },
-        bind: function () {
-            // 查询
-            $('#btn_Search').on('click', function () {
-                var keyword = $('#txt_Keyword').val();
-                page.search({ keyword: keyword });
-            });
-            // 刷新
-            $('#lr_refresh').on('click', function () {
-                location.reload();
-            });
-            // 新增
-            $('#lr_add').on('click', function () {
-                selectedRow = null;
-                learun.layerForm({
-                    id: 'form',
-                    title: '新增',
-                    url: top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/Form',
-                    width: 700,
-                    height: 400,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
-                    }
-                });
-            });
-            // 编辑
-            $('#lr_edit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                selectedRow = $('#gridtable').jfGridGet('rowdata');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerForm({
-                        id: 'form',
-                        title: '编辑',
-                        url: top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/Form?keyValue=' + keyValue,
-                        width: 700,
-                        height: 400,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        }
-                    });
-                }
-            });
-            // 删除
-            $('#lr_delete').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerConfirm('是否确认删除该项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/DeleteForm', { keyValue: keyValue}, function () {
-                            });
-                        }
-                    });
-                }
-            });
-        },
-        initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/GetPageList',
-                headData: [
-                        { label: '人员ID', name: 'Id', width: 200, align: "left" },
-                        { label: '手机号码', name: 'Mobile', width: 200, align: "left" },
-                        { label: '密码', name: 'Password', width: 200, align: "left" },
-                        { label: '人员类型（字典）（1学生、2老师、3下乡老师）', name: 'TypeId', width: 200, align: "left" },
-                        { label: '姓名', name: 'RealName', width: 200, align: "left" },
-                        { label: '性别(字典)', name: 'SexId', width: 200, align: "left" },
-                        { label: '年龄', name: 'Age', width: 200, align: "left" },
-                        { label: '民族', name: 'Nation', width: 200, align: "left" },
-                        { label: '出生日期', name: 'BirthDate', width: 200, align: "left" },
-                        { label: '身份证号', name: 'CertNum', width: 200, align: "left" },
-                        { label: '联系电话', name: 'Phone', width: 200, align: "left" },
-                        { label: '头像', name: 'PhotoUrl', width: 200, align: "left" },
-                        { label: '邮箱', name: 'MailBox', width: 200, align: "left" },
-                        { label: '省份', name: 'Province', width: 200, align: "left" },
-                        { label: '市', name: 'City', width: 200, align: "left" },
-                        { label: '县市、区', name: 'Country', width: 200, align: "left" },
-                        { label: '政治面貌（字典）', name: 'PoliticsFace', width: 200, align: "left" },
-                        { label: '邮政编码', name: 'ZipCode', width: 200, align: "left" },
-                        { label: '籍贯', name: 'Origin', width: 200, align: "left" },
-                        { label: '户口性质（字典）', name: 'OriginId', width: 200, align: "left" },
-                        { label: '现户籍所在地', name: 'OriginAddress', width: 200, align: "left" },
-                        { label: '详细地址', name: 'DetailedAddress', width: 200, align: "left" },
-                        { label: '在籍年份', name: 'SchoolDate', width: 200, align: "left" },
-                        { label: '状态（字典）（启用、锁定）', name: 'StatusId', width: 200, align: "left" },
-                        { label: '创建时间', name: 'CreateDate', width: 200, align: "left" },
-                        { label: '排序串', name: 'LayOrder', width: 200, align: "left" },
-                        { label: '微信号', name: 'WXNo', width: 200, align: "left" },
-                        { label: '审核状态1通过，2未审核，3未通过', name: 'AppStatus', width: 200, align: "left" },
-                        { label: '校区ID', name: 'CampusId', width: 200, align: "left" },
-                        { label: '数据来源（0、电脑1、安卓2、学生扫老师）', name: 'DataSource', width: 200, align: "left" },
-                ],
-                mainId:'Id',
-                isPage: true
-            });
-            page.search();
-        },
-        search: function (param) {
-            param = param || {};
-            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
-        }
-    };
-    refreshGirdData = function () {
-        page.search();
-    };
-    page.init();
-}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/RegistrateIndex.cshtml

@@ -1,36 +0,0 @@
-@{
-    ViewBag.Title = "报名信息";
-    Layout = "~/Views/Shared/_Index.cshtml";
-}
-<div class="lr-layout" id="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">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
-                    </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_checkYes" class="btn btn-default"><i class="fa fa-check"></i>&nbsp;审核通过</a>
-                        <a id="lr_checkNo" class="btn btn-default"><i class="fa fa-close"></i>&nbsp;审核不通过</a>
-                        <a id="lr_bindTeacher" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;关联教师</a>
-                        <a id="lr_Pay" class="btn btn-default"><i class="fa fa-dollar"></i>&nbsp;缴费</a>
-                    </div>
-                </div>
-            </div>
-            <div class="lr-layout-body" id="gridtable"></div>
-        </div>
-    </div>
-</div>
-@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/OnlineUserInfo/RegistrateIndex.js")

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

@@ -1,174 +0,0 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
- * Copyright (c) 2013-2018 北京泉江科技有限公司 
- * 创建人：超级管理员
- * 日  期：2020-04-17 15:45
- * 描  述：报名信息
- */
-var selectedRow;
-var refreshGirdData;
-var bootstrap = function ($, learun) {
-    "use strict";
-    var page = {
-        init: function () {
-            page.initGird();
-            page.bind();
-        },
-        bind: function () {
-            // 查询
-            $('#btn_Search').on('click', function () {
-                var keyword = $('#txt_Keyword').val();
-                page.search({ keyword: keyword });
-            });
-            // 刷新
-            $('#lr_refresh').on('click', function () {
-                location.reload();
-            });
-            // 新增
-            $('#lr_add').on('click', function () {
-                selectedRow = null;
-                learun.layerForm({
-                    id: 'form',
-                    title: '新增',
-                    url: top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/Form',
-                    width: 700,
-                    height: 400,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
-                    }
-                });
-            });
-            // 编辑
-            $('#lr_edit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                selectedRow = $('#gridtable').jfGridGet('rowdata');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerForm({
-                        id: 'form',
-                        title: '编辑',
-                        url: top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/Form?keyValue=' + keyValue,
-                        width: 700,
-                        height: 400,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        }
-                    });
-                }
-            });
-            // 删除
-            $('#lr_delete').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerConfirm('是否确认删除该项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/DeleteForm', { keyValue: keyValue }, function () {
-                            });
-                        }
-                    });
-                }
-            });
-        },
-        initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/GetPageListOfRegistrate',
-                headData: [
-                    {
-                        label: '审核状态', name: 'AppStatus', width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'AdmissionsAppStatus',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    { label: '创建时间', name: 'CreateDate', width: 100, align: "left" },
-                    { label: '姓名', name: 'RealName', width: 100, align: "left" },
-                    { label: '身份证号', name: 'CertNum', width: 100, align: "left" },
-                    {
-                        label: '性别', name: 'SexId', width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'usersexbit',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    { label: '出生日期', name: 'BirthDate', width: 100, align: "left" },
-                    { label: '民族', name: 'Nation', width: 100, align: "left" },
-                    { label: '手机号码', name: 'Mobile', width: 100, align: "left" },
-                    { label: '政治面貌（字典）', name: 'PoliticsFace', width: 100, align: "left" },
-                    { label: '现户籍所在地', name: 'OriginAddress', width: 100, align: "left" },
-                    { label: '户口性质（字典）', name: 'OriginId', width: 100, align: "left" },
-                    { label: '在籍年份', name: 'SchoolDate', width: 100, align: "left" },
-                    { label: '详细地址', name: 'DetailedAddress', width: 100, align: "left" },
-                    { label: '邮政编码', name: 'ZipCode', width: 100, align: "left" },
-                    //专业级别？
-                    { label: '学习形式（字典）:全日制', name: 'YearFormId', width: 100, align: "left" },
-                    { label: '招生季度（字典）', name: 'QuarterId', width: 100, align: "left" },
-                    { label: '毕业学校', name: 'GraduateSchool', width: 100, align: "left" },
-                    { label: '班级', name: 'Class', width: 100, align: "left" },
-                    { label: '工种（字典）', name: 'WorkTypeId', width: 100, align: "left" },
-                    { label: '爱好特长', name: 'Hobbies', width: 100, align: "left" },
-                    { label: '文化程度（字典）', name: 'CultureId', width: 100, align: "left" },
-                    { label: '银行卡号', name: 'BankNumber', width: 100, align: "left" },
-                    { label: '学制（字典）', name: 'LearnLength', width: 100, align: "left" },
-                    { label: '家庭联系人', name: 'FamilyLinkman', width: 100, align: "left" },
-                    { label: '家庭联系电话', name: 'FamilyPhone', width: 100, align: "left" },
-                    { label: '家庭年总收入', name: 'FamilyIncome', width: 100, align: "left" },
-                    { label: '家庭人均收入', name: 'FamilyFenIncome', width: 100, align: "left" },
-                    { label: '是否十万以下民族（字典）:是、否', name: 'IsTenId', width: 100, align: "left" },
-                    { label: '是否家庭困难（字典）', name: 'IsHardId', width: 100, align: "left" },
-                    { label: '是否低保（字典）', name: 'IsBasicId', width: 100, align: "left" },
-                    { label: '收入来源（字典）:务农、工人、职员、教师', name: 'IncomeSourceId', width: 100, align: "left" },
-                    {
-                        label: '报考校区', name: 'SchoolId', width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
-                                key: value,
-                                keyId: 'f_companyid',
-                                callback: function (_data) {
-                                    callback(_data['f_fullname']);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: '报考专业', name: 'MajorId', width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
-                                key: value,
-                                keyId: 'majorno',
-                                callback: function (_data) {
-                                    callback(_data['majorname']);
-                                }
-                            });
-                        }
-                    },
-                    { label: '关联老师ID', name: 'UserTeacherId', width: 100, align: "left" },
-                    { label: '缴费额度', name: 'PaymentQuota', width: 100, align: "left" },
-
-                ],
-                mainId: 'Id',
-                isPage: true,
-                sord: 'desc',
-                sidx: 'CreateDate'
-            });
-            page.search();
-        },
-        search: function (param) {
-            param = param || {};
-            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
-        }
-    };
-    refreshGirdData = function () {
-        page.search();
-    };
-    page.init();
-}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJY.js

@@ -146,18 +146,18 @@ var bootstrap = function ($, learun) {
             $('#lr_viewcg').on('click', function () {
                 var PId = $('#gridtable').jfGridValue('PId');
                 //if (learun.checkrow(PId)) {
-                    if (PId == null || PId === undefined || PId === "") {
-                        learun.alert.warning("当前项目不含采购单！");
-                        return;
-                    }
-                    learun.layerForm({
-                        id: 'formAss_Purchase',
-                        title: '查看采购单',
-                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_Purchase/FormViewJY?keyValue=' + PId,
-                        width: 1000,
-                        height: 600,
-                        btn: null
-                    });
+                if (PId == null || PId === undefined || PId === "") {
+                    learun.alert.warning("当前项目不含采购单！");
+                    return;
+                }
+                learun.layerForm({
+                    id: 'formAss_Purchase',
+                    title: '查看采购单',
+                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_Purchase/FormViewJY?keyValue=' + PId,
+                    width: 1000,
+                    height: 600,
+                    btn: null
+                });
                 //}
             });
             // 删除
@@ -233,8 +233,8 @@ var bootstrap = function ($, learun) {
                                 }
                             });
                         }
-                    }, 
-                                       {
+                    },
+                    {
                         label: "审批状态", name: "AAStatus", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
                             if (cellvalue === 1) {
@@ -258,13 +258,15 @@ var bootstrap = function ($, learun) {
             param.StartTime = startTime;
             param.EndTime = endTime;
             param.AssType = '1';//普通 低值
+            var loginInfo = top.learun.clientdata.get(['userinfo']);
+            param.AACreateUserId = loginInfo.userId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function (res, postData) {
         if (res && res.code && res.code == 200) {
             // 发起流程
-            
+
             var postData = {
                 schemeCode: 'Ass_PurchaseApply',// 填写流程对应模板编号 
                 processId: processId,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJYHC.js

@@ -214,10 +214,12 @@ var bootstrap = function ($, learun) {
                     {
                         label: "申请人", name: "AACreateUserId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('user', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
                                 key: value,
+                                keyId: 'f_account',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
@@ -258,6 +260,8 @@ var bootstrap = function ($, learun) {
             param.StartTime = startTime;
             param.EndTime = endTime;
             param.AssType = '2';//耗材
+            var loginInfo = top.learun.clientdata.get(['userinfo']);
+            param.AACreateUserId = loginInfo.userId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs

@@ -167,6 +167,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 助学贷款表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult LoanForm()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 现场缴费表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult OnsitePayForm()
+        {
+            return View();
+        }
 
         /// <summary>
         /// 主页面【学子在线-新生信息完善】
@@ -409,6 +427,21 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("保存成功！");
         }
 
+        /// <summary> 
+        /// 保存实体数据（新增、修改） 
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveLoanForm(string keyValue, string strEntity)
+        {
+            StuInfoFreshEntity entity = strEntity.ToObject<StuInfoFreshEntity>();
+            stuInfoFreshIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
         #endregion
 
         #region 扩展数据
@@ -489,7 +522,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("操作成功");
         }
         /// <summary>
-        ///领取用品
+        ///领取钥匙
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -500,6 +533,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("操作成功");
         }
         /// <summary>
+        ///领取校园卡
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult IsGetCard(string keyValue, string status)
+        {
+            stuInfoFreshIBLL.IsGetCard(keyValue, status);
+            return Success("操作成功");
+        }
+        /// <summary>
         ///缴费
         /// </summary>
         /// <returns></returns>
@@ -510,6 +554,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             stuInfoFreshIBLL.IsPayFee(keyValue, status);
             return Success("操作成功");
         }
+
+        /// <summary>
+        ///其他费用缴费
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult IsOtherPayFee(string keyValue, string status)
+        {
+            stuInfoFreshIBLL.IsOtherPayFee(keyValue, status);
+            return Success("操作成功");
+        }
         /// <summary> 
         /// 获取新生缴费明细 
         /// <summary> 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs

@@ -79,6 +79,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
         /// <summary>
+        /// 个人成绩查看
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StuScoreQueryIndex()
+        {
+            var logininfo = LoginUserInfo.Get();
+            ViewBag.StuNo = logininfo.account;
+            return View();
+        }
+        /// <summary>
         /// 毕业证资格审核(班主任)
         /// <summary>
         /// <returns></returns>
@@ -597,6 +608,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success(data);
         }
 
+        /// <summary>
+        /// 根据StuNo查询班级课程
+        /// </summary>
+        /// <param name="academicYearNo"></param>
+        /// <param name="semester"></param>
+        /// <param name="StuNo"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetLessonNoDataFromStuNo(string academicYearNo, string semester, string StuNo)
+        {
+            var data = stuScoreIBLL.GetLessonNoDataFromStuNo(academicYearNo, semester, StuNo).OrderBy(x => x.value);
+
+            return Success(data);
+        }
+
         /// <summary>
         /// 获取班级成绩列表
         /// <summary>
@@ -638,6 +665,43 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success(result);
         }
 
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreListByStuNo(string queryJson)
+        {
+            var data = stuScoreIBLL.GetScoreListByStuNo(queryJson);
+            var stuData = stuInfoBasicIBLL.GetAllList();
+
+            var aa = data.GroupBy(x => new { x.StuNo, x.StuName, x.StuId }).Select(x => new
+            {
+                StuId = x.Key.StuId,
+                StuNo = x.Key.StuNo,
+                StuName = x.Key.StuName,
+                FinishSchoolMark = stuData.FirstOrDefault(a => a.StuNo == x.Key.StuNo)?.FinishSchoolMark,
+                TotalScore = x.Where(m=>m.LessonSortNo=="1").Select(y => y.Score).Sum(),
+                LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score }).OrderBy(y => y.LessonNo)
+            }).OrderByDescending(x => x.TotalScore);
+
+            var result = new List<Dictionary<string, string>>();
+            foreach (var item in aa)
+            {
+                var aaa = new Dictionary<string, string>();
+                aaa.Add("StuId", item.StuId);
+                aaa.Add("StuNo", item.StuNo);
+                aaa.Add("StuName", item.StuName);
+                aaa.Add("FinishSchoolMark", item.FinishSchoolMark);
+                aaa.Add("TotalScore", item.TotalScore.ToString());
+                foreach (var lessonInfoItem in item.LessonInfo)
+                {
+                    aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.Score.ToString());
+                }
+
+                result.Add(aaa);
+            }
+
+            return Success(result);
+        }
+
         public ActionResult GetScoreCharts(string AcademicYearNo, string Semester, string ClassNo, string LessonNo)
         {
             var data = stuScoreIBLL.GetScoreCharts(AcademicYearNo, Semester, ClassNo, LessonNo);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs

@@ -44,6 +44,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
         /// <summary>
+        /// 指定接收人表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult SpecifyReceiverForm()
+        {
+            return View();
+        }
+        /// <summary>
         /// 主页面【党政公文查阅】
         /// </summary>
         /// <returns></returns>
@@ -211,6 +220,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             sys_ReceiveFileIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
+
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult Issue(string strEntity)
+        {
+            Sys_IssueEntity entity = strEntity.ToObject<Sys_IssueEntity>();
+            sys_ReceiveFileIBLL.Issue(entity);
+            return Success("保存成功！");
+        }
         /// <summary>
         /// 查看实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_SendFileController.cs

@@ -30,12 +30,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         [HttpGet]
         public ActionResult IndexDocument()
         {
-             return View();
+            return View();
+        }
+
+        /// <summary>
+        /// 公文下发表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IssueForm()
+        {
+            return View();
         }
         /// <summary>
         /// 主页面【党政公文下发】
@@ -49,7 +59,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult FormDocument()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -58,7 +68,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页【党政公文下发】
@@ -73,13 +83,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult FormView()
         {
-             return View();
+            return View();
         }
 
         [HttpGet]
         public ActionResult FormDocumentView()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 【党政公文下发】
@@ -93,7 +103,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult ReadList()
         {
-             return View();
+            return View();
         }
 
         [HttpGet]
@@ -124,7 +134,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetPageList(string pagination, string queryJson)
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = sys_SendFileIBLL.GetPageList(paginationobj, queryJson).Where(m=>m.STypeId==1);
+            var data = sys_SendFileIBLL.GetPageList(paginationobj, queryJson).Where(m => m.STypeId == 1);
             var jsonData = new
             {
                 rows = data,
@@ -172,9 +182,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var Sys_SendFileData = sys_SendFileIBLL.GetSys_SendFileEntity( keyValue );
+            var Sys_SendFileData = sys_SendFileIBLL.GetSys_SendFileEntity(keyValue);
             Sys_SendFileData.Contents = HttpUtility.HtmlDecode(Sys_SendFileData.Contents);
-            var jsonData = new {
+            var jsonData = new
+            {
                 Sys_SendFile = Sys_SendFileData,
             };
             return Success(jsonData);
@@ -199,8 +210,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormDataByProcessId(string processId)
         {
-            var Sys_SendFileData = sys_SendFileIBLL.GetEntityByProcessId( processId );
-            var jsonData = new {
+            var Sys_SendFileData = sys_SendFileIBLL.GetEntityByProcessId(processId);
+            var jsonData = new
+            {
                 Sys_SendFile = Sys_SendFileData,
             };
             return Success(jsonData);
@@ -233,12 +245,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             Sys_SendFileEntity entity = strEntity.ToObject<Sys_SendFileEntity>();
-            entity.DelFlag = false;
-            entity.SendFlag = 0;
-            entity.SenderId = LoginUserInfo.Get().userId;
-            entity.Sender = LoginUserInfo.Get().realName;
-            entity.STypeId = 1;
-            sys_SendFileIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.STypeId = 1;
+            }
+            sys_SendFileIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
 
@@ -249,12 +260,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult SaveFormDocument(string keyValue, string strEntity)
         {
             Sys_SendFileEntity entity = strEntity.ToObject<Sys_SendFileEntity>();
-            entity.DelFlag = false;
-            entity.SendFlag = 0;
-            entity.SenderId = LoginUserInfo.Get().userId;
-            entity.Sender = LoginUserInfo.Get().realName;
-            entity.STypeId = 2;
-            sys_SendFileIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.STypeId = 2;
+            }
+            sys_SendFileIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
 
@@ -265,11 +275,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult SaveFormParty(string keyValue, string strEntity)
         {
             Sys_SendFileEntity entity = strEntity.ToObject<Sys_SendFileEntity>();
-            entity.DelFlag = false;
-            entity.SendFlag = 0;
-            entity.SenderId = LoginUserInfo.Get().userId;
-            entity.Sender = LoginUserInfo.Get().realName;
-            entity.STypeId = 3;
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.STypeId = 3;
+            }
             sys_SendFileIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
@@ -291,9 +300,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             string guid = Guid.NewGuid().ToString();
             sys_SendFileIBLL.ChangeStatusById(keyValue, 2, guid);
-            sys_SendFileIBLL.ChangeStatusByProcessId(guid,2);
+            sys_SendFileIBLL.ChangeStatusByProcessId(guid, 2);
             return Success("操作成功！");
         }
+        /// <summary>
+        /// 结束下发
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult OverIssue(string keyValue)
+        {
+            string guid = Guid.NewGuid().ToString();
+            sys_SendFileIBLL.OverIssue(keyValue);
+            return Success("下发成功！");
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml

@@ -125,6 +125,10 @@
         <div class="lr-form-item-title">家庭地址  <font face="宋体">*</font></div>
         <input id="FamilyAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
+        <div class="lr-form-item-title">精准贫困户</div>
+        <div id="IsPoor"></div>
+    </div>
 
 
     <div class="col-xs-12" id="photoBox">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js

@@ -24,6 +24,7 @@ var bootstrap = function ($, learun) {
             $("#HighTestSortNo").lrDataItemSelect({ code: 'GraduateCategory' });
             $("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' });
             $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
+            $('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' });
 
             $('#StuInfoFreshFamily').jfGrid({
                 headData: [

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.cshtml

@@ -145,6 +145,10 @@
         <div class="lr-form-item-title">家庭地址  <font face="宋体">*</font></div>
         <input id="FamilyAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
+        <div class="lr-form-item-title">精准贫困户</div>
+        <div id="IsPoor"></div>
+    </div>
 
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js

@@ -24,6 +24,8 @@ var bootstrap = function ($, learun) {
             $("#HighTestSortNo").lrDataItemSelect({ code: 'GraduateCategory' });
             $("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' });
             $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
+            $('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' });
+
 
             $('#StuInfoFreshFamily').jfGrid({
                 headData: [

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.cshtml

@@ -37,8 +37,10 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
-                        <a id="lr_get" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;领取饭卡钥匙</a>
-                        <a id="lr_cancelGet" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置未领取</a>
+                        <a id="lr_get" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;领取钥匙</a>
+                        <a id="lr_cancelGet" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置未领取钥匙</a>
+                        <a id="lr_getCard" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;领取校园卡</a>
+                        <a id="lr_cancelGetCard" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置未领取校园卡</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_deleteBed" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除宿舍信息</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js

@@ -50,16 +50,16 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 领取饭卡钥匙
+            // 领取钥匙
             $('#lr_get').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.GetKeyStatus == "1") {
-                        learun.alert.warning("当前新生已领取饭卡钥匙！");
+                        learun.alert.warning("当前新生已领取钥匙！");
                         return;
                     }
-                    learun.layerConfirm('是否确认领取饭卡钥匙！', function (res) {
+                    learun.layerConfirm('是否确认领取钥匙！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetKey', { keyValue: keyValue, status: 1 }, function () {
                                 refreshGirdData();
@@ -68,16 +68,16 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 设置未领取
+            // 设置未领取钥匙
             $('#lr_cancelGet').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.GetKeyStatus != "1") {
-                        learun.alert.warning("当前新生暂未领取饭卡钥匙！");
+                        learun.alert.warning("当前新生暂未领取钥匙！");
                         return;
                     }
-                    learun.layerConfirm('是否设置新生未领取饭卡钥匙！', function (res) {
+                    learun.layerConfirm('是否设置新生未领取钥匙！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetKey', { keyValue: keyValue, status: 0 }, function () {
                                 refreshGirdData();
@@ -86,6 +86,43 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+
+            // 领取校园卡
+            $('#lr_getCard').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.GetCardStatus == "1") {
+                        learun.alert.warning("当前新生已领取校园卡！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认领取校园卡！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetCard', { keyValue: keyValue, status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 设置未领取校园卡
+            $('#lr_cancelGetCard').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.GetCardStatus != "1") {
+                        learun.alert.warning("当前新生暂未领取校园卡！");
+                        return;
+                    }
+                    learun.layerConfirm('是否设置新生未领取校园卡！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetCard', { keyValue: keyValue, status: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
             // 删除宿舍信息
             $('#lr_deleteBed').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
@@ -100,7 +137,11 @@ var bootstrap = function ($, learun) {
                         return;
                     }
                     if (selectedRow.GetKeyStatus == "1") {
-                        learun.alert.warning("当前新生已领取饭卡钥匙，无法删除宿舍信息！");
+                        learun.alert.warning("当前新生已领取钥匙，无法删除宿舍信息！");
+                        return;
+                    }
+                    if (selectedRow.GetCardStatus == "1") {
+                        learun.alert.warning("当前新生已领取校园卡，无法删除宿舍信息！");
                         return;
                     }
                     learun.layerConfirm('是否确认删除宿舍信息！', function (res) {
@@ -146,22 +187,28 @@ var bootstrap = function ($, learun) {
                     },
                     { label: '报到时间', name: 'ArriveDate', width: 130, align: "left" },
                     {
-                        label: '缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) {
+                        label: '线上缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) {
                             return value == 1 ? "<span class=\"label label-success\">已缴费</span>" : "<span class=\"label label-warning\">未缴费</span>";
                         }
                     },
-                    { label: '缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
+                    { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
                     {
                         label: '宿舍信息', name: 'DormitoryName', width: 180, align: "left", formatter: function (value, row) {
                             return "<span>" + (row.Build ? row.Build : '') + (row.Room ? row.Room : '') + (row.Bed ? row.Bed : '') + "</span>";
                         }
                     },
                     {
-                        label: '领取状态', name: 'GetKeyStatus', width: 100, align: "left", formatter: function (value) {
+                        label: '领取钥匙状态', name: 'GetKeyStatus', width: 100, align: "left", formatter: function (value) {
+                            return value == 1 ? "<span class=\"label label-success\">已领取</span>" : "<span class=\"label label-warning\">未领取</span>";
+                        }
+                    },
+                    { label: '领取钥匙时间', name: 'GetKeyDate', width: 130, align: "left" },
+                    {
+                        label: '领取校园卡状态', name: 'GetCardStatus', width: 100, align: "left", formatter: function (value) {
                             return value == 1 ? "<span class=\"label label-success\">已领取</span>" : "<span class=\"label label-warning\">未领取</span>";
                         }
                     },
-                    { label: '领取时间', name: 'GetKeyDate', width: 130, align: "left" },
+                    { label: '领取校园卡时间', name: 'GetCardDate', width: 130, align: "left" },
                     {
                         label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.cshtml

@@ -0,0 +1,13 @@
+@{
+    ViewBag.Title = "助学贷款";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoFresh">
+        <div class="lr-form-item-title">贷款回执码</div>
+        <input id="StudentLoan" type="text" class="form-control" />
+    </div>
+
+
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js

@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-08-08 17:21
+ * 描  述：助学贷款
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (id == "StuInfoFresh") {
+                            if (!!data[id].length && data[id].length > 0) {
+                                $('#' + id).jfGridSet('refreshdata', data[id]);
+                            }
+                            else {
+                                $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                            }
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+
+        var postData = {};
+        postData.strEntity = JSON.stringify($('[data-table="StuInfoFresh"]').lrGetFormData());
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SaveLoanForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调 
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/OnsitePayForm.cshtml

@@ -0,0 +1,13 @@
+@{
+    ViewBag.Title = "现场缴费";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoFresh">
+        <div class="lr-form-item-title">缴费状态<font face="宋体">*</font></div>
+        <div id="OnsitePayFeeStatus" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+
+
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/OnsitePayForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/OnsitePayForm.js

@@ -0,0 +1,53 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-08-08 17:21
+ * 描  述：现场缴费
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#OnsitePayFeeStatus').lrDataItemSelect({ code: 'OnsitePayStatus' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (id == "StuInfoFresh") {
+                            if (!!data[id].length && data[id].length > 0) {
+                                $('#' + id).jfGridSet('refreshdata', data[id]);
+                            }
+                            else {
+                                $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                            }
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+
+        var postData = {};
+        postData.strEntity = JSON.stringify($('[data-table="StuInfoFresh"]').lrGetFormData());
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SaveLoanForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调 
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml

@@ -1,4 +1,6 @@
 @{
+    /**/
+
     ViewBag.Title = "新生缴费管理";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
@@ -19,8 +21,14 @@
                         <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-pencil-square-o"></i>&nbsp;查看</a>
-                        <a id="lr_payFee"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;缴费</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
+                        @*<a id="lr_payFee" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;缴费</a>*@
+                        <a id="lr_pay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;线上缴费</a>
+                        <a id="lr_cancelPay" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;取消线上缴费</a>
+                        <a id="lr_loan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;填写贷款回执码</a>
+                        <a id="lr_onsitePay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;现场缴费</a>
+                        <a id="lr_otherPay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;其他费用缴费</a>
+                        <a id="lr_cancelOtherPay" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;取消其他费用缴费</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js

@@ -53,6 +53,113 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 线上缴费
+            $('#lr_pay').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.PayFeeStatus == "1") {
+                        learun.alert.warning("当前新生已线上缴费！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认线上缴费！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsPayFee', { keyValue: keyValue, status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 取消线上缴费
+            $('#lr_cancelPay').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.PayFeeStatus != "1") {
+                        learun.alert.warning("当前新生未线上缴费！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认取消线上缴费！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsPayFee', { keyValue: keyValue, status: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 助学贷款
+            $('#lr_loan').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'loanForm',
+                        title: '助学贷款',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/LoanForm?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 现场缴费
+            $('#lr_onsitePay').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'onsitePayForm',
+                        title: '现场缴费',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/OnsitePayForm?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 其他费用缴费
+            $('#lr_otherPay').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.OtherPayFeeStatus == "1") {
+                        learun.alert.warning("当前新生其他费用已缴费！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认其他费用缴费！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsOtherPayFee', { keyValue: keyValue, status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 取消其他费用缴费
+            $('#lr_cancelOtherPay').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.OtherPayFeeStatus != "1") {
+                        learun.alert.warning("当前新生其他费用未缴费！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认取消其他费用缴费！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsOtherPayFee', { keyValue: keyValue, status: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+
         },
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
@@ -63,11 +170,38 @@ var bootstrap = function ($, learun) {
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
                     { label: '姓名', name: 'StuName', width: 100, align: "left" },
                     {
-                        label: '缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) {
+                        label: '线上缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) {
+                            return value == 1 ? "<span class=\"label label-success\">已缴费</span>" : "<span class=\"label label-warning\">未缴费</span>";
+                        }
+                    },
+                    { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
+                    { label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" },
+                    {
+                        label: '现场缴费状态', name: 'OnsitePayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'OnsitePayStatus',
+                                callback: function (_data) {
+                                    //callback(_data.text);
+                                    if (_data.text) {
+                                        if (_data.text == "已缴费") {
+                                            callback('<span class=\"label label-success\">' + _data.text + '</span>');
+                                        } else {
+                                            callback('<span class=\"label label-warning\">' + _data.text + '</span>');
+                                        }
+                                    } else {
+                                        callback('<span class=\"label label-warning\">未缴费</span>');
+                                    }
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '其他费用缴费状态', name: 'OtherPayFeeStatus', width: 100, align: "left", formatter: function (value) {
                             return value == 1 ? "<span class=\"label label-success\">已缴费</span>" : "<span class=\"label label-warning\">未缴费</span>";
                         }
                     },
-                    { label: '缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
+                    { label: '其他费用缴费时间', name: 'OtherPayFeeDate', width: 130, align: "left" },
                     {
                         label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/StuScoreQueryIndex.cshtml

@@ -0,0 +1,202 @@
+@{ ViewBag.Title = "个人成绩查看"; Layout = "~/Views/Shared/_Index.cshtml"; }
+<style>
+    .lr-select {
+        width: 150px;
+    }
+</style>
+<style id="style1" media="print">
+    body,
+    html {
+        font-size: 13px;
+        font-family: "微软雅黑";
+        color: #333;
+        overflow-x: hidden;
+        letter-spacing: 0;
+    }
+
+    ul {
+        margin: 0px;
+        padding: 0px;
+        list-style: none;
+    }
+
+    li {
+        list-style: none;
+    }
+
+    table {
+        border-collapse: collapse;
+    }
+
+    .title ul {
+        overflow: hidden;
+    }
+
+    .title li {
+        width: 33.333333%;
+        float: left;
+        line-height: 24px
+    }
+
+    .tableBox {
+        height: 661px;
+        width: 33%;
+        float: left;
+        margin-left: 0.2%;
+        border: 1px solid #000;
+        box-sizing: border-box;
+    }
+
+        .tableBox:first-child {
+            margin-left: 0
+        }
+
+    .table {
+        padding: 0;
+        width: 100%;
+    }
+
+        .table td {
+            border-top: 1px solid #000;
+            line-height: 21px;
+            letter-spacing: 2px;
+        }
+
+        .table tr:first-child {
+            border-top: 0
+        }
+
+        .table th,
+        .table td {
+            padding: 0px 1px;
+            border-left: 1px solid #000;
+            font-size: 13px;
+        }
+
+            .table th:first-child,
+            .table td:first-child {
+                border-left: 0px solid #000;
+            }
+
+    .print {
+        overflow: hidden;
+        margin-top: 10px;
+    }
+</style>
+<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="AcademicYearNo" type="lrselect" class="lr-select"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="Semester" type="lrselect" class="lr-select"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </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>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/StuScoreQueryIndex.js")
+<script src="~/Content/static/js/LodopFuncs.js"></script>
+<script>
+    var StuNo = "@ViewBag.StuNo";
+    var num = 0,
+        tableNum = 1,
+        html = '';
+
+    function prints(data, flag) {
+        //初始化数据
+        data.list.push({
+            seal: "（单位盖章）",
+            blank: '以 &nbsp;&nbsp; 下 &nbsp;&nbsp; 空 &nbsp;&nbsp; 白'
+        })
+        num = 0, tableNum = 1, html = '';
+        var htmlHead = '<div class="title"><ul><li>学院：' + data.school + '</li><li>专业：' + data.major + '</li><li>班级：' + data.className + '</li></ul><ul><li>学号：' + data.number + '</li><li>姓名：' + data.student + '</li><li>层次：' + data.arrangement + '</li></ul></div><div class="print">',
+            tableHtml = '<div class="tableBox"><table class="table" cellspacing="0" cellpadding="0"><tr><th style="width:20%">课程类别</th><th style="width:70%">课程名称</th><th style="width:10%">成绩</th></tr>';
+
+        html += htmlHead;
+        var len = data.list.length - 1;
+
+        //数据处理
+        $.each(data.list, function (i, n) { //data 循环
+            if (num == 0 && i == 0) {
+                html += tableHtml;
+            }
+            $.each(n, function (j, k) { // 学期数据循环
+                if (j == 'title') {
+                    html += '<tr><td colspan="3" style="text-align:center"><b>' + k + '</b></td></tr>'
+                } else if (j == 'list') {
+                    $.each(k, function (m, b) { //具体数据显示
+                        html += '<tr><td>' + b.type + '</td><td>' + b.className + '</td><td style="text-align:center">' + b.achievement + '</td></tr>';
+                        numJudge(htmlHead, tableHtml)
+                    })
+                } else if (j == 'seal') {
+                    html += '<tr><td colspan="3" style="text-align: right;padding-right:20px">' + k + '</td></tr>';
+                } else {
+                    html += '<tr><td colspan="3" style="text-align:center">以 &nbsp;&nbsp; 下 &nbsp;&nbsp; 空 &nbsp;&nbsp; 白</td></tr></table></div>';
+                }
+                numJudge(htmlHead, tableHtml)
+            })
+
+        })
+        for (var i = tableNum; i < 3; i++) {
+            html += '<div class="tableBox"><table class="table" cellspacing="0" cellpadding="0"></table></div>';
+        }
+
+        AddPrintContent(html, flag);
+    };
+
+    function AddPrintContent(html, flag) {
+        var myHtml = myHtml = html;
+        var strBodyStyle = "<style>" + document.getElementById("style1").innerHTML + "</style>";
+        var strFormHtml = strBodyStyle + "<body>" + myHtml + "</body>";
+
+        LODOP = getLodop();
+        LODOP.PRINT_INIT("个人授课表");
+        LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "A4");
+
+        LODOP.SET_PRINT_MODE("PRINT_DUPLEX", 2);
+        LODOP.SET_PRINT_MODE("PRINT_DEFAULTSOURCE", 7);
+
+        LODOP.ADD_PRINT_HTM(10, 10, '284mm', '196mm', strFormHtml);
+
+        if (flag == "preview") {
+            //打印预览
+            LODOP.SET_SHOW_MODE("LANDSCAPE_DEFROTATED", 1);
+            var TaskID1 = LODOP.PREVIEW();
+        } else if (flag == "print") {
+            // 直接打印
+            var TaskID1 = LODOP.PRINT();
+        }
+        //打印设计
+        //		var TaskID1 = LODOP.PRINT_DESIGN();
+
+    };
+
+    function numJudge(htmlHead, tableHtml) {
+        num++;
+        if (num > 29) {
+            num = 0;
+            if (tableNum >= 3) {
+                tableNum = 1;
+                html += '</table></div></div>' + htmlHead + tableHtml
+            } else {
+                html += '</table></div>' + tableHtml;
+                tableNum++
+            }
+        };
+
+    };
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/StuScoreQueryIndex.js

@@ -0,0 +1,104 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-14 11:02
+ * 描  述：个人成绩查看
+ */
+var selectedRow;
+var refreshGirdData;
+//课程列
+var LessonTemp = [];
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            //page.initGird();
+            page.bind();
+            page.bindSelect();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var p = {};
+                p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
+                p.Semester = $('#Semester').lrselectGet();
+                p.StuNo = StuNo;
+                if (p.AcademicYearNo == null || p.AcademicYearNo == "") {
+                    learun.alert.warning("请选择学年！");
+                    return;
+                }
+                if (p.Semester == null || p.Semester == "") {
+                    learun.alert.warning("请选择学期！");
+                    return;
+                }
+                $.lrSetFormWithParam(top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoDataFromStuNo', p,
+                    function (data) {
+                        var temparr = [];
+                        for (var i = 0; i < data.length; i++) {
+                            var item = {};
+                            item.label = data[i].text;
+                            item.name = data[i].value;
+                            item.width = 150;
+                            item.align = "left";
+                            temparr.push(item);
+                        }
+                        LessonTemp = temparr;
+
+                        page.initGird();
+                        page.search(p);
+                    });
+
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+        },
+        bindSelect: function () {
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetAcademicYearNoData',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学期",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        initGird: function () {
+            var headData = [
+                { label: '学号', name: 'StuNo', width: 100, align: "left" },
+                { label: '姓名', name: 'StuName', width: 100, align: "left" },
+                { label: '总分', name: 'TotalScore', width: 100, align: "left" },
+            ];
+            var headDatas = headData.concat(LessonTemp);
+
+            $("#gridtable")[0].dfop = undefined;
+            $('#gridtable').lrAuthorizeJfGridLei({
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByStuNo',
+                headData: headDatas,
+                mainId: 'StuNo',
+                isPage: false,
+                sidx: 'TotalScore',
+                sord: 'desc'
+            });
+
+            //page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.cshtml

@@ -25,8 +25,9 @@
                     <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">
+                    <div class=" btn-group btn-group-sm">
                         <a id="lr_Read"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查阅</a>
+                        <a id="lr_SpecifyReceiver"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;指定接收人</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.js

@@ -79,6 +79,22 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 指定接收人
+            $('#lr_SpecifyReceiver').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('RFileId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formSys_ReceiveFile',
+                        title: '指定接收人',
+                        url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/SpecifyReceiverForm?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
             // 删除
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('RFileId');
@@ -152,6 +168,30 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "指定接收人", name: "SpecifyReceiver", width: 150, align: "left", formatterAsync:
+                            function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('user',
+                                    {
+                                        key: value,
+                                        callback: function (_data) {
+                                            if (_data.length > 0) {
+                                                var text = '';
+                                                $.each(_data,
+                                                    function (i, item) {
+                                                        if (item) {
+                                                            text += item.name + ',';
+                                                        }
+                                                    });
+                                                text = text.substring(0, text.lastIndexOf(','));
+                                                callback(text);
+                                            } else {
+                                                callback(_data.name);
+                                            }
+                                        }
+                                    });
+                            }
+                    },
                     {
                         label: "状态", name: "ReadFlag", width: 100, align: "left",
                         formatter: function (cellvalue, row) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/SpecifyReceiverForm.cshtml

@@ -0,0 +1,11 @@
+@{
+    ViewBag.Title = "公文收发";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
+        <div class="lr-form-item-title">发送人</div>
+        <div id="SpecifyReceiver" class="form-control"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveFile/SpecifyReceiverForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/SpecifyReceiverForm.js

@@ -0,0 +1,54 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-04-11 10:08
+ * 描  述：公文收发
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow;
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#SpecifyReceiver').lrUserSelect({ type: '1' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/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]);
+                            $('#Contents').html(data[id].Contents);
+                        }
+                    }
+                    $("#lrUploader_uploadBtn_Url").hide();
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.cshtml

@@ -7,26 +7,14 @@
         <div class="lr-form-item-title">主题<font face="宋体">*</font></div>
         <input id="Title" type="text" class="form-control"   isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" >
-        <div class="lr-form-item-title">接收对象<font face="宋体">*</font></div>
-        <div id="SendType" isvalid="yes" checkexpession="NotNull" ></div>
+    @*<div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"   id="ReceiverIddiv">
+        <div class="lr-form-item-title">已接收人<font face="宋体">*</font></div>
+        <div id="ReceiverId"  ></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"   id="ReceiverIddiv">
-        <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
-        <div id="ReceiverUserId"  ></div>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"  id="DeptIddiv">
-        <div class="lr-form-item-title">接收部门<font face="宋体">*</font></div>
-        <div id="DeptId"  ></div>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"  id="PostIddiv">
-        <div class="lr-form-item-title">接收岗位<font face="宋体">*</font></div>
-        <div id="PostId"  ></div>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"  id="CompanyIddiv">
-        <div class="lr-form-item-title">接收校区<font face="宋体">*</font></div>
-        <div id="CompanyId"  ></div>
-    </div>
+        <div class="lr-form-item-title">未接收人<font face="宋体">*</font></div>
+        <div id="NoReceiver"  ></div>
+    </div>*@
     <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" >
         <div class="lr-form-item-title">文件</div>
         <div id="Url"  ></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js

@@ -26,70 +26,8 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#CompanyId').lrCompanySelect({ type: 'multiple' });
-            $('#DeptId').lrDepartmentSelect({ type: 'treemultiple' });
-            $('#PostId').lrPostSelect({ type: 'treemultiple' });
-            $('#ReceiverUserId').lrUserSelect({ type: '1' });
-            $('#SendType').lrDataItemSelect({
-                code: 'FileSendType', select: function (item) {
-                    if (item != null && item != undefined) {
-                        if (item.id === 1 || item.id === "1") {
-                            $("#CompanyIddiv").show();
-                            $("#CompanyId").attr("isvalid", "yes");
-                            $("#CompanyId").attr("checkexpession", "NotNull");
-                            $("#DeptIddiv").hide();
-                            $("#DeptId").removeAttr("isvalid");
-                            $("#DeptId").removeAttr("NotNull");
-                            $("#ReceiverIddiv").hide();
-                            $("#ReceiverUserId").removeAttr("isvalid");
-                            $("#ReceiverUserId").removeAttr("NotNull");
-                            $("#PostIddiv").hide();
-                            $("#PostId").removeAttr("isvalid");
-                            $("#PostId").removeAttr("NotNull");
-                        } else if (item.id === 2 || item.id === "2") {
-                            $("#CompanyIddiv").hide();
-                            $("#CompanyId").removeAttr("isvalid");
-                            $("#CompanyId").removeAttr("NotNull");
-                            $("#DeptIddiv").show();
-                            $("#DeptId").attr("isvalid", "yes");
-                            $("#DeptId").attr("checkexpession", "NotNull");
-                            $("#ReceiverIddiv").hide();
-                            $("#ReceiverUserId").removeAttr("isvalid");
-                            $("#ReceiverUserId").removeAttr("NotNull");
-                            $("#PostIddiv").hide();
-                            $("#PostId").removeAttr("isvalid");
-                            $("#PostId").removeAttr("NotNull");
-                        } else if (item.id === 3 || item.id === "3") {
-                            $("#CompanyIddiv").hide();
-                            $("#CompanyId").removeAttr("isvalid");
-                            $("#CompanyId").removeAttr("NotNull");
-                            $("#DeptIddiv").hide();
-                            $("#DeptId").removeAttr("isvalid");
-                            $("#DeptId").removeAttr("NotNull");
-                            $("#ReceiverIddiv").hide();
-                            $("#ReceiverUserId").removeAttr("isvalid");
-                            $("#ReceiverUserId").removeAttr("NotNull");
-                            $("#PostIddiv").show();
-                            $("#PostId").attr("isvalid", "yes");
-                            $("#PostId").attr("checkexpession", "NotNull");
-                        } else {
-                            $("#CompanyIddiv").hide();
-                            $("#CompanyId").removeAttr("isvalid");
-                            $("#CompanyId").removeAttr("NotNull");
-                            $("#DeptIddiv").hide();
-                            $("#DeptId").removeAttr("isvalid");
-                            $("#DeptId").removeAttr("NotNull");
-                            $("#ReceiverIddiv").show();
-                            $("#ReceiverUserId").attr("isvalid", "yes");
-                            $("#ReceiverUserId").attr("checkexpession", "NotNull");
-                            $("#PostIddiv").hide();
-                            $("#PostId").removeAttr("isvalid");
-                            $("#PostId").removeAttr("NotNull");
-                        }
-                    }
-                }
-            });
-            $('#SendType').lrselectSet("1");
+            //$('#ReceiverId').lrUserSelect({ type: '1' });
+            //$('#NoReceiver').lrUserSelect({ type: '1' });
             $('#Url').lrUploader();
             var ContentsUE = UE.getEditor('Contents');
             $('#Contents')[0].ue = ContentsUE;
@@ -103,63 +41,6 @@ var bootstrap = function ($, learun) {
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
-                            if (data[id].SendType === 1 || data[id].SendType == "1") {
-                                $("#CompanyIddiv").show();
-                                $("#CompanyId").attr("isvalid", "yes");
-                                $("#CompanyId").attr("checkexpession", "NotNull");
-                                $("#DeptIddiv").hide();
-                                $("#DeptId").removeAttr("isvalid");
-                                $("#DeptId").removeAttr("NotNull");
-                                $("#ReceiverIddiv").hide();
-                                $("#ReceiverUserId").removeAttr("isvalid");
-                                $("#ReceiverUserId").removeAttr("NotNull");
-                                $("#PostIddiv").hide();
-                                $("#PostId").removeAttr("isvalid");
-                                $("#PostId").removeAttr("NotNull");
-                                $("#CompanyId").lrselectSet(data[id].ReceiverId);
-                            } else if (data[id].SendType === 2 || data[id].SendType == "2") {
-                                $("#CompanyIddiv").hide();
-                                $("#CompanyId").removeAttr("isvalid");
-                                $("#CompanyId").removeAttr("NotNull");
-                                $("#DeptIddiv").show();
-                                $("#DeptId").attr("isvalid", "yes");
-                                $("#DeptId").attr("checkexpession", "NotNull");
-                                $("#ReceiverIddiv").hide();
-                                $("#ReceiverUserId").removeAttr("isvalid");
-                                $("#ReceiverUserId").removeAttr("NotNull");
-                                $("#PostIddiv").hide();
-                                $("#PostId").removeAttr("isvalid");
-                                $("#PostId").removeAttr("NotNull");
-                                $("#DeptId").lrselectSet(data[id].ReceiverId);
-                            } else if (data[id].SendType === 3 || data[id].SendType === "3") {
-                                $("#CompanyIddiv").hide();
-                                $("#CompanyId").removeAttr("isvalid");
-                                $("#CompanyId").removeAttr("NotNull");
-                                $("#DeptIddiv").hide();
-                                $("#DeptId").removeAttr("isvalid");
-                                $("#DeptId").removeAttr("NotNull");
-                                $("#ReceiverIddiv").hide();
-                                $("#ReceiverUserId").removeAttr("isvalid");
-                                $("#ReceiverUserId").removeAttr("NotNull");
-                                $("#PostIddiv").show();
-                                $("#PostId").attr("isvalid", "yes");
-                                $("#PostId").attr("checkexpession", "NotNull");
-                                $("#PostId").lrselectSet(data[id].ReceiverId);
-                            } else {
-                                $("#CompanyIddiv").hide();
-                                $("#CompanyId").removeAttr("isvalid");
-                                $("#CompanyId").removeAttr("NotNull");
-                                $("#DeptIddiv").hide();
-                                $("#DeptId").removeAttr("isvalid");
-                                $("#DeptId").removeAttr("NotNull");
-                                $("#ReceiverIddiv").show();
-                                $("#ReceiverUserId").attr("isvalid", "yes");
-                                $("#ReceiverUserId").attr("checkexpession", "NotNull");
-                                $("#PostIddiv").hide();
-                                $("#PostId").removeAttr("isvalid");
-                                $("#PostId").removeAttr("NotNull");
-                                $("#ReceiverUserId").lrformselectSet(data[id].ReceiverId);
-                            }
                         }
                     }
 
@@ -180,63 +61,6 @@ var bootstrap = function ($, learun) {
                             keyValue = data[id].SFileId;
                         }
                         $('[data-table="' + id + '"]').lrSetFormData(data[id]);
-                        if (data[id].SendType === 1 || data[id].SendType == "1") {
-                            $("#CompanyIddiv").show();
-                            $("#CompanyId").attr("isvalid", "yes");
-                            $("#CompanyId").attr("checkexpession", "NotNull");
-                            $("#DeptIddiv").hide();
-                            $("#DeptId").removeAttr("isvalid");
-                            $("#DeptId").removeAttr("NotNull");
-                            $("#ReceiverIddiv").hide();
-                            $("#ReceiverUserId").removeAttr("isvalid");
-                            $("#ReceiverUserId").removeAttr("NotNull");
-                            $("#PostIddiv").hide();
-                            $("#PostId").removeAttr("isvalid");
-                            $("#PostId").removeAttr("NotNull");
-                            $("#CompanyId").lrselectSet(data[id].ReceiverId);
-                        } else if (data[id].SendType === 2 || data[id].SendType == "2") {
-                            $("#CompanyIddiv").hide();
-                            $("#CompanyId").removeAttr("isvalid");
-                            $("#CompanyId").removeAttr("NotNull");
-                            $("#DeptIddiv").show();
-                            $("#DeptId").attr("isvalid", "yes");
-                            $("#DeptId").attr("checkexpession", "NotNull");
-                            $("#ReceiverIddiv").hide();
-                            $("#ReceiverUserId").removeAttr("isvalid");
-                            $("#ReceiverUserId").removeAttr("NotNull");
-                            $("#PostIddiv").hide();
-                            $("#PostId").removeAttr("isvalid");
-                            $("#PostId").removeAttr("NotNull");
-                            $("#DeptId").lrselectSet(data[id].ReceiverId);
-                        } else if (data[id].SendType === 3 || data[id].SendType === "3") {
-                            $("#CompanyIddiv").hide();
-                            $("#CompanyId").removeAttr("isvalid");
-                            $("#CompanyId").removeAttr("NotNull");
-                            $("#DeptIddiv").hide();
-                            $("#DeptId").removeAttr("isvalid");
-                            $("#DeptId").removeAttr("NotNull");
-                            $("#ReceiverIddiv").hide();
-                            $("#ReceiverUserId").removeAttr("isvalid");
-                            $("#ReceiverUserId").removeAttr("NotNull");
-                            $("#PostIddiv").show();
-                            $("#PostId").attr("isvalid", "yes");
-                            $("#PostId").attr("checkexpession", "NotNull");
-                            $("#PostId").lrselectSet(data[id].ReceiverId);
-                        } else {
-                            $("#CompanyIddiv").hide();
-                            $("#CompanyId").removeAttr("isvalid");
-                            $("#CompanyId").removeAttr("NotNull");
-                            $("#DeptIddiv").hide();
-                            $("#DeptId").removeAttr("isvalid");
-                            $("#DeptId").removeAttr("NotNull");
-                            $("#ReceiverIddiv").show();
-                            $("#ReceiverUserId").attr("isvalid", "yes");
-                            $("#ReceiverUserId").attr("checkexpession", "NotNull");
-                            $("#PostIddiv").hide();
-                            $("#PostId").removeAttr("isvalid");
-                            $("#PostId").removeAttr("NotNull");
-                            $("#ReceiverUserId").lrformselectSet(data[id].ReceiverId);
-                        }
                     }
                 }
             });
@@ -252,20 +76,6 @@ var bootstrap = function ($, learun) {
     // 保存数据
     save = function (processId, callBack, i) {
         var formData = $('body').lrGetFormData();
-        var sendtype = $('#SendType').lrselectGet();
-        if (sendtype == "1") {
-            formData.ReceiverId = $("#CompanyId").lrselectGet();
-            formData.Receiver = $("#CompanyId").find(".lr-select-placeholder").text();
-        } else if (sendtype == "2") {
-            formData.ReceiverId = $("#DeptId").lrselectGet();
-            formData.Receiver = $("#DeptId").find(".lr-select-placeholder").text();
-        } else if (sendtype == "3") {
-            formData.ReceiverId = $("#PostId").lrselectGet();
-            formData.Receiver = $("#PostId").find(".lr-select-placeholder").text();
-        } else {
-            formData.ReceiverId = $("#ReceiverUserId").lrformselectGet();
-            formData.Receiver = $("#ReceiverUserId").find("span").text();
-        }
         if (!!processId) {
             formData.SProcessId = processId;
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml

@@ -3,23 +3,15 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" >
+    <div class="col-xs-12 lr-form-item" data-table="Sys_SendFile">
         <div class="lr-form-item-title">主题<font face="宋体">*</font></div>
-        <input id="Title" type="text" class="form-control"   isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+        <input id="Title" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" >
-        <div class="lr-form-item-title">接收对象<font face="宋体">*</font></div>
-        <div id="SendType" isvalid="yes" checkexpession="NotNull"  readonly="readonly" ></div>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"   id="ReceiverIddiv">
-        <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
-        <input id="Receiver"  type="text" class="form-control" readonly="readonly" />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" >
+    <div class="col-xs-12 lr-form-item" data-table="Sys_SendFile">
         <div class="lr-form-item-title">文件</div>
-        <div id="Url"   readonly="readonly" style="padding-right: 60px;"></div>
+        <div id="Url" readonly="readonly" style="padding-right: 60px;"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" >
+    <div class="col-xs-12 lr-form-item" data-table="Sys_SendFile">
         <div class="lr-form-item-title">正文</div>
         <div id="Contents" style="height:300px; margin-top: 6px;"></div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js

@@ -27,9 +27,6 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#SendType').lrDataItemSelect({
-                code: 'FileSendType'
-            });
             $('#Url').lrUploader();
             var ContentsUE = UE.getEditor('Contents');
             $('#Contents')[0].ue = ContentsUE;
@@ -44,7 +41,7 @@ var bootstrap = function ($, learun) {
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
                             $("#lrUploader_uploadBtn_Url").hide();
-                          // $('#Contents').html(data[id].Contents);
+                            // $('#Contents').html(data[id].Contents);
                         }
                     }
                 });
@@ -52,7 +49,7 @@ var bootstrap = function ($, learun) {
         }
     };
     // 设置表单数据
-    setFormData = function (processId,param,callback) {
+    setFormData = function (processId, param, callback) {
         if (!!processId) {
             $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetFormDataByProcessId?processId=' + processId, function (data) {
                 for (var id in data) {
@@ -70,7 +67,7 @@ var bootstrap = function ($, learun) {
                 }
             });
         }
-        callback && callback(); 
+        callback && callback();
     }
     // 验证数据是否填写完整
     validForm = function () {
@@ -81,13 +78,21 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     save = function (processId, callBack, i) {
-        var formData = {};
-        var res = {};
-        res.code = 200;
-        if (!!processId) {
-            formData.SProcessId = processId;
-        }
-        callBack(res, i);
+
+        var formData = $('body').lrGetFormData();
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+
+
+
+
     };
     page.init();
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml

@@ -30,6 +30,8 @@
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 提交</a>
                         <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp; 查看</a>
+                        <a id="lr_IssueSpecifyReceiver" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;下发审批指定接收人</a>
+                        <a id="lr_OverIssue" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;结束下发</a>
                         <a id="lr_read" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp; 查阅情况</a>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js

@@ -138,6 +138,51 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+
+            // 下发审批指定接收人
+            $('#lr_IssueSpecifyReceiver').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('SFileId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '下发审批指定接收人',
+                        url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue,
+                        width: 800,
+                        height: 200,
+                        callBack: function (id) {
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save('', function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
+                        }
+                    });
+                }
+            });
+            // 结束
+            $('#lr_OverIssue').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('SFileId');
+                if (learun.checkrow(keyValue)) {
+                    var SendFlag = $('#gridtable').jfGridValue('SendFlag');
+                    if (SendFlag !== 2) {
+                        learun.alert.warning("当前公文未审批通过，请耐心等待审批！");
+                        return;
+                    }
+                    learun.layerConfirm('是否结束下发！', function (res) {
+                        if (res) {
+                            processId = learun.newGuid();
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/OverIssue', { keyValue: keyValue, }, function (res) {
+                                refreshGirdData(res, {});
+                            });
+                        }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -145,34 +190,21 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetPageList',
                 headData: [
                     { label: "主题", name: "Title", width: 300, align: "left" },
-                    {
-                        label: "接收对象", name: "SendType", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'FileSendType',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "接收人", name: "Receiver", width: 300, align: "left"
-                    },
-                    {
-                        label: "下发人", name: "Sender", width: 100, align: "left"
-                    },
-                    {
-                        label: "下发时间", name: "SendTime", width: 150, align: "left"
-                    },
+                    { label: "已接收", name: "Receiver", width: 300, align: "left" },
+                    { label: "审批意见", name: "SpecifyReceiver", width: 300, align: "left" },
+                    { label: "下发人", name: "Sender", width: 100, align: "left" },
+                    { label: "下发时间", name: "SendTime", width: 150, align: "left" },
                     {
                         label: "状态", name: "SendFlag", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
                             if (cellvalue === 1) {
                                 return '<span class=\"label label-warning\">审批中</span>';
                             } else if (cellvalue === 2) {
-                                return '<span class=\"label label-success\">已下发</span>';
+                                return '<span class=\"label label-info\">审批通过</span>';
+                            } else if (cellvalue === 3) {
+                                return '<span class=\"label label-danger\" >审批失败</span>';
+                            } else if (cellvalue === 4) {
+                                return '<span class=\"label label-success\" >下发完毕</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.cshtml

@@ -0,0 +1,11 @@
+@{
+    ViewBag.Title = "公文发送";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"   id="ReceiverIddiv">
+        <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
+        <div id="SpecifyReceiver"  isvalid="yes" checkexpession="NotNull"  ></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.js

@@ -0,0 +1,96 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-04-11 10:31
+ * 描  述：公文发送
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var rFileId = request('rFileId');
+var specifyReceiver = request('specifyReceiver');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#SpecifyReceiver').lrUserSelect({ type: '1' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            if (rFileId) {
+                                $('#SpecifyReceiver').lrformselectSet(specifyReceiver);
+                            } else {
+
+                                $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                            }
+
+                        }
+                    }
+
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'Sys_SendFile') {
+                            keyValue = data[id].SFileId;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        formData.RFileId = rFileId;
+        formData.SFileId = keyValue;
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/Issue', postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, formData, i);
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml

@@ -17,6 +17,7 @@
                 <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>
+                        <a id="lr_Issue" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;下发</a>
                     </div>
 
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js

@@ -24,6 +24,40 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+
+            $('#lr_Issue').on('click',
+                function () {
+                    var keyValue = $('#gridtable').jfGridValue('SFileId');
+                    var rFileId = $('#gridtable').jfGridValue('RFileId');
+                    var specifyReceiver = $('#gridtable').jfGridValue('SpecifyReceiver');
+                    if (learun.checkrow(rFileId)) {
+                        var SendStatus = $('#gridtable').jfGridValue('SendStatus');
+                        if (SendStatus) {
+                            learun.alert.warning("已下发！");
+                            return;
+                        }
+                        learun.layerForm({
+                            id: 'formIssue',
+                            title: '下发',
+                            url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue + '&rFileId=' + rFileId + '&specifyReceiver=' + specifyReceiver,
+                            width: 500,
+                            height: 500,
+                            callBack: function (id) {
+                                var res = false;
+                                // 验证数据
+                                res = top[id].validForm();
+                                // 保存数据
+                                if (res) {
+                                    res = top[id].save('', function () {
+                                        page.search();
+                                    });
+                                }
+                                return res;
+                            }
+                        });
+                    }
+
+                });
         },
         // 初始化列表
         initGird: function () {
@@ -36,6 +70,30 @@ var bootstrap = function ($, learun) {
                     {
                         label: "查阅时间", name: "ReadTime", width: 150, align: "left"
                     },
+                    {
+                        label: "指定接收人", name: "SpecifyReceiver", width: 150, align: "left", formatterAsync:
+                            function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('user',
+                                    {
+                                        key: value,
+                                        callback: function (_data) {
+                                            if (_data.length > 0) {
+                                                var text = '';
+                                                $.each(_data,
+                                                    function (i, item) {
+                                                        if (item) {
+                                                            text += item.name + ',';
+                                                        }
+                                                    });
+                                                text = text.substring(0, text.lastIndexOf(','));
+                                                callback(text);
+                                            } else {
+                                                callback(_data.name);
+                                            }
+                                        }
+                                    });
+                            }
+                    },
                     {
                         label: "状态", name: "ReadFlag", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
@@ -45,6 +103,16 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\">未读</span>';
                             }
                         }
+                    },
+                    {
+                        label: "下发状态", name: "SendStatus", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue === true) {
+                                return '<span class=\"label label-success\">已下发</span>';
+                            } else {
+                                return '<span class=\"label label-warning\">未下发</span>';
+                            }
+                        }
                     }
                 ],
                 mainId: 'RFileId',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/FormRelationController.cs

@@ -66,7 +66,7 @@ namespace Learun.Application.Web.Areas.LR_FormModule.Controllers
         public ActionResult PreviewIndex(string id)
         {
             string currentUrl = (string)WebHelper.GetHttpItems("currentUrl");
-            currentUrl = currentUrl + "?id=" + id;
+            //currentUrl = currentUrl + "?id=" + id;
             WebHelper.UpdateHttpItem("currentUrl", currentUrl);
 
             return View();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js

@@ -294,7 +294,7 @@ var bootstrap = function ($, learun) {
                 girdurl = top.$.rootUrl + '/LR_FormModule/FormRelation/GetPreviewList?keyValue=' + id;
             }
 
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: girdurl,
                 headData: headData,
                 reloadSelected: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs

@@ -1,6 +1,7 @@
 using Learun.Application.WorkFlow;
 using Learun.Util;
 using System.Collections.Generic;
+using System.Linq;
 using System.Web.Mvc;
 using Learun.Application.Organization;
 using Learun.Application.Base.AuthorizeModule;
@@ -20,6 +21,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
 
         private NWFSchemeIBLL nWFSchemeIBLL = new NWFSchemeBLL();
         private NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL();
+
         private UserIBLL userIbll = new UserBLL();
         private UserRelationIBLL userRelationIBLL = new UserRelationBLL();
 
@@ -97,6 +99,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
         {
             return View();
         }
+
         /// <summary>
         /// 合同打印
         /// </summary>
@@ -105,22 +108,36 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
         public ActionResult htPrint(string keyValue)
         {
 
+            //获取校长的签名盖章
+            var listTaskLog = nWFTaskIBLL.GetLogList(keyValue);
+            var nwfTaskLogEntity = listTaskLog.FirstOrDefault(a => a.F_TaskUserName == "关亮");
+            if (nwfTaskLogEntity != null)
+            {
+                ViewBag.StampImg = nwfTaskLogEntity.F_StampImg;
+                ViewBag.SignImg = nwfTaskLogEntity.F_SignImg;
+            }
+
+
             var data = nWFProcessIBLL.GetHTInfo(keyValue);
-            var userInfo = userIbll.GetEntityByUserId(data.F_CreateUserName);
-            var beginTime = data.LC_htkssj.ToDate();
-            var endTime = data.LC_htjssj.ToDate();
-            var operationTime = data.OperationTime.ToDate();
+            var userInfo = new UserEntity();
+            if (data != null)
+            {
+                userInfo = userIbll.GetEntityByUserId(data.F_CreateUserName);
+            }
+            var beginTime = data?.LC_htkssj.ToDate();
+            var endTime = data?.LC_htjssj.ToDate();
+            var operationTime = data?.OperationTime.ToDate();
             ViewBag.UserName = userInfo?.F_RealName;
             ViewBag.IDCard = userInfo?.F_IdentityCardNo;
-            ViewBag.BeginYear = beginTime.Year;
-            ViewBag.BeginMonth = beginTime.Month;
-            ViewBag.BeginDay = beginTime.Day;
-            ViewBag.EndYear = endTime.Year;
-            ViewBag.EndMonth = endTime.Month;
-            ViewBag.EndDay = endTime.Day;
-            ViewBag.OperationYear = operationTime.Year;
-            ViewBag.OperationMonth = operationTime.Month;
-            ViewBag.OperationDay = operationTime.Day;
+            ViewBag.BeginYear = beginTime?.Year;
+            ViewBag.BeginMonth = beginTime?.Month;
+            ViewBag.BeginDay = beginTime?.Day;
+            ViewBag.EndYear = endTime?.Year;
+            ViewBag.EndMonth = endTime?.Month;
+            ViewBag.EndDay = endTime?.Day;
+            ViewBag.OperationYear = operationTime?.Year;
+            ViewBag.OperationMonth = operationTime?.Month;
+            ViewBag.OperationDay = operationTime?.Day;
             return View();
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml

@@ -2,7 +2,18 @@
     ViewBag.Title = "流程监控";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div id="lr_layout" class="lr-layout lr-layout-center">
+<div id="lr_layout" class="lr-layout lr-layout-left-center">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle" style="padding-top:10px;">
+            <div class="lr-layout-body">
+                <ul class="lr-left-list" id="lr_left_list">
+                    <li class="active lrlg" data-value="1">未完成</li>
+                    <li data-value="2" class="lrlg">已完成</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle">
             <div class="lr-layout-tool">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js

@@ -177,7 +177,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
-            param.categoryId = '2';
+            param.categoryId = categoryId;
             param.F_Category = '合同类';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.cshtml

@@ -9,7 +9,7 @@
                 <ul class="lr-left-list" id="lr_left_list">
                     <li data-value="2" class="lrlg active">待办任务</li>
                     <li data-value="3" class="lrlg">已办任务</li>
-                    <li class="lrlg" data-value="1">我的流程</li>
+                    <li data-value="1" class="lrlg">我的流程</li>
                 </ul>
             </div>
         </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js

@@ -160,8 +160,9 @@ var bootstrap = function ($, learun) {
 
                             var isaAain = false;
                             if (categoryId == '1') {
-                                if (row.F_IsFinished != 0 && row.F_SchemeCode == 'LC_Contract_') {
-                                    $cell.on('click', '.print', function () {// 催办审核
+                                //如果流程是合同审批 并且校长审批通过的话可以打印
+                                if (row.LeaderIsAgree && row.F_SchemeCode == 'LC_Contract_') {
+                                    $cell.on('click', '.print', function () {
 
                                         learun.layerForm({
                                             id: 'print',
@@ -252,7 +253,7 @@ var bootstrap = function ($, learun) {
                             }
 
 
-                            if (categoryId == '3' && row.F_TaskType == 1 && row.F_IsFinished == 0) {// 已完成任务，添加一个撤销按钮
+                            if (categoryId == '3' && row.F_TaskType == 1 && row.F_IsFinished == 0 && !row.NextNodeIsAudited) {// 已完成任务，添加一个撤销按钮
                                 cellvalue = '<span class="label label-warning revoke2" style="margin-left:5px;margin-right:5px;" title="撤销审核" >撤销审核</span>' + cellvalue;
 
                                 $cell.on('click', '.revoke2', function () {// 删除
@@ -324,12 +325,17 @@ var bootstrap = function ($, learun) {
                                     return "<span class=\"label label-success\">运行中</span>";
                                 } else if (cellvalue == 2) {
                                     return "<span class=\"label label-primary\">草稿</span>";
-                                } else {
+                                }
+                                else {
                                     return "<span class=\"label label-danger\">作废</span>";
                                 }
                             }
                             else {
-                                return "<span class=\"label label-warning\">结束</span>";
+                                if (cellvalue == 4) {
+                                    return "<span class=\"label label-default\">终止</span>";
+                                } else {
+                                    return "<span class=\"label label-warning\">结束</span>";
+                                }
                             }
 
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js

@@ -236,6 +236,8 @@ var bootstrap = function ($, learun) {
             });
             // 打印表单
             $('#print').on('click', function () {
+                //打印checkbox 选中效果打印不出来
+                $("input[type='checkbox']:checked").attr('checked', 'checked');
                 var $iframes = $('#form_list_iframes');
                 var iframeId = $iframes.find('.form-list-iframe.active').attr('id');
                 if (iframeId) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml

@@ -33,11 +33,16 @@
                     委托人：<span>关亮</span>(身份证号码：<span style="width: 237px;">110111196506121035</span>)
                 </div>
                 <div class="entrTxt">
-                    (签字) 
+                    (签字)
+                    <img id="signImg" hidden="hidden">)
+                    <img id="stampImg" hidden="hidden">
                 </div>
                 <div class="entrTime">
+
                     @ViewBag.OperationYear 年<span></span>@ViewBag.OperationMonth 月<span></span>@ViewBag.OperationDay 日
                 </div>
+
+
             </div>
         </div>
 
@@ -46,10 +51,28 @@
     <script src="~/Content/jquery/plugin/fullcalendar/js/jquery-1.7.2.min.js"></script>
     <script src="~/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js"></script>
 
-    <script>
-        $('.btn').click(function () {
-            $('.tableBox').jqprint();
-        })
-    </script>
+
+
 </body>
 </html>
+<script>
+    //盖章图片
+    var stampUrl = '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=00324dc8-e0db-457f-b078-ebd1aac46463';// + @ViewBag.StampImg;
+    var signUrl = '/LR_SystemModule/Img/GetImg?keyValue=90ddf143-ba5a-4900-b9c5-96fb3336d4a7';// + @ViewBag.SignImg;
+    $('#signImg').attr('src', signUrl);
+    $('#stampImg').attr('src', stampUrl);
+
+    var signImg = new Image();
+    var stampImg = new Image();
+    signImg.src = $('#signImg')[0].src;
+    stampImg.src = $('#stampImg')[0].src;
+    signImg.onload=function() {
+        $('#signImg').show();
+    }
+    stampImg.onload=function() {
+        $('#stampImg').show();
+    }
+        $('.btn').click(function () {
+        $('.tableBox').jqprint();
+    });
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.css

@@ -84,6 +84,7 @@ table {
     text-indent: 32px;
     font-size: 14px;
     line-height: 30px;
+    position: relative;
 }
 
 .entrTxt span {
@@ -97,13 +98,24 @@ table {
     text-indent: 0;
     text-align: center
 }
-
+#signImg {
+    position: absolute;
+    width: 250px;
+    top: 40px;
+    left: 100px;
+}
 .entrTime {
     text-align: right;
     padding-right: 80px;
     margin-top: 120px;
+    position: relative;
+}
+#stampImg {
+    position: absolute;
+    width: 140px;
+    top: 60px;
+    left: 170px;
 }
-
 .entrTime span {
     display: inline-block;
     width: 50px;

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/SelectForm.js

@@ -7,6 +7,9 @@
  */
 var dfopid = request('dfopid');
 var selectValue = request('selectValue');
+if (selectValue == "null") {
+    selectValue = null;
+}
 
 var acceptClick;
 var bootstrap = function ($, learun) {
@@ -45,7 +48,7 @@ var bootstrap = function ($, learun) {
             $warp.append($cardbox);
             learun.clientdata.getAsync('department', {
                 key: item.F_DepartmentId,
-                callback: function (_data,op) {
+                callback: function (_data, op) {
                     $warp.find('[data-id="' + op.key + '"]').text(_data.name);
                 }
             });
@@ -82,8 +85,7 @@ var bootstrap = function ($, learun) {
                 $('#user_list').find('[data-value="' + userid + '"]').removeClass('active');
             }
         });
-        if (!!selectValue)
-        {
+        if (!!selectValue) {
             learun.httpAsync('GET', top.$.rootUrl + '/LR_OrganizationModule/User/GetEntityListByUserIds', { keyValue: selectValue }, function (data) {
                 if (!!data) {
                     $.each(data, function (id, item) {
@@ -100,13 +102,13 @@ var bootstrap = function ($, learun) {
                         $warp.append($(_html));
                         learun.clientdata.getAsync('department', {
                             key: item.F_DepartmentId,
-                            callback: function (_data,op) {
+                            callback: function (_data, op) {
                                 $warp.find('[data-id="' + op.key + '"]').text(_data.name);
                             }
                         });
                         learun.clientdata.getAsync('company', {
                             key: item.F_CompanyId,
-                            callback: function (_data,op) {
+                            callback: function (_data, op) {
                                 $warp.find('[data-id="' + op.key + '"]').text(_data.name);
                             }
                         });
@@ -114,7 +116,7 @@ var bootstrap = function ($, learun) {
                 }
             });
         }
-        
+
     };
     function addUser(useritem) {
         var $warp = $('#selected_user_list');
@@ -126,13 +128,13 @@ var bootstrap = function ($, learun) {
         $warp.append(_html);
         learun.clientdata.getAsync('department', {
             key: useritem.F_DepartmentId,
-            callback: function (_data,op) {
+            callback: function (_data, op) {
                 $warp.find('[data-id="' + op.key + '"]').text(_data.name);
             }
         });
         learun.clientdata.getAsync('company', {
             key: useritem.F_CompanyId,
-            callback: function (_data,op) {
+            callback: function (_data, op) {
                 $warp.find('[data-id="' + op.key + '"]').text(_data.name);
             }
         });
@@ -172,7 +174,7 @@ var bootstrap = function ($, learun) {
                 $('#department_tree').lrtreeSet('refresh', {
                     url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                     // 访问数据接口参数
-                    param: { companyId: companyId},
+                    param: { companyId: companyId },
                 });
             });
 
@@ -198,7 +200,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             })
-            
+
 
             // 滚动条
             $('#user_list_warp').lrscroll();
@@ -229,7 +231,11 @@ var bootstrap = function ($, learun) {
             if (postitem.text != "") {
                 postitem.text += ",";
             }
-            postitem.text += userlistselectedobj[userlistselected[i]].F_RealName;
+            if (userlistselected[i] != 'null') {
+                if (userlistselectedobj[userlistselected[i]]) {
+                    postitem.text += userlistselectedobj[userlistselected[i]].F_RealName;
+                }
+            }
         }
         callBack(postitem, dfopid);
         return true;

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ADR_RecordController.cs

@@ -62,6 +62,16 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         {
             return View();
         }
+
+        /// <summary>
+        /// 明细统计主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StatisticDetailIndex()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据
@@ -123,7 +133,6 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         [AjaxOnly]
         public ActionResult GetStatisticList(string pagination, string queryJson)
         {
-            Pagination paginationobj = pagination.ToObject<Pagination>();
             var data = aDR_RecordIBLL.GetStatisticList(null, queryJson).GroupBy(x => new { x.UserNo, x.UserName })
                 .Select(x => new ADR_RecordEntity()
                 {
@@ -134,10 +143,30 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
                     ZaoTuiNum = x.Where(y => y.ClockStatus == "3").Count().ToString()
                 }).OrderBy(x => x.UserNo);
 
-
             return Success(data);
         }
 
+        /// <summary>
+        /// 考勤明细统计
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetStatisticDetailList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = aDR_RecordIBLL.GetStatisticDetailList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/AttendanceReportByWeek.cshtml

@@ -2,7 +2,6 @@
     ViewBag.Title = "考勤记录";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-@using Stimulsoft.Report.Mvc
 <div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.cshtml

@@ -13,11 +13,11 @@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="ADR_Record" >
         <div class="lr-form-item-title">考勤时间</div>
-        <input id="ADTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ADTime').trigger('change'); } })"   />
+        <input id="ADTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#ADTime').trigger('change'); } })"   />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="ADR_Record" >
         <div class="lr-form-item-title">打卡时间</div>
-        <input id="ClockTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ClockTime').trigger('change'); } })"   />
+        <input id="ClockTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#ClockTime').trigger('change'); } })"   />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="ADR_Record" >
         <div class="lr-form-item-title">打卡状态</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js

@@ -21,7 +21,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                 param: {} 
             });
-
+            $('#ADType').lrDataItemSelect({ code: 'ADType' });
             $('#UserNo').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' });
         },
         initData: function () {
@@ -34,6 +34,8 @@ var bootstrap = function ($, learun) {
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
                         }
+                        $("#ADTime").val(data[id].ADTime);
+                        $("#ClockTime").val(data[id].ClockTime);
                     }
                 });
             }