diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs
index a798f7167..0abf80489 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs
@@ -57,6 +57,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
return View();
}
[HttpGet]
+ public ActionResult StatusView()
+ {
+ return View();
+ }
+ [HttpGet]
public ActionResult PrintSignFlow(string Id)
{
if (!string.IsNullOrEmpty(Id))
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.cshtml
new file mode 100644
index 000000000..e16d5cc59
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.cshtml
@@ -0,0 +1,31 @@
+@{
+ ViewBag.Title = "新生信息状态查看";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js
new file mode 100644
index 000000000..f0c3ae422
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js
@@ -0,0 +1,277 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
+ * Copyright (c) 2013-2018 北京泉江科技有限公司
+ * 创建人：超级管理员
+ * 日 期：2019-08-08 17:21
+ * 描 述：新生信息管理
+ */
+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();
+ var Grade = $('#Grade').val();
+ page.search({ keyword: keyword, Grade: Grade });
+ });
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ // 查看
+ $('#lr_view').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ selectedRow = $('#gridtable').jfGridGet('rowdata');
+ if (learun.checkrow(keyValue)) {
+ learun.layerForm({
+ id: 'form',
+ title: '查看',
+ url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/FormView?keyValue=' + keyValue,
+ width: 1200,
+ height: 700,
+ btn: null
+ });
+ }
+ });
+
+ },
+ initGird: function () {
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetPageList',
+ headData: [
+ { label: '考生号', name: 'ksh', width: 150, align: "left" },
+ { label: '准考证号', name: 'zkzh', width: 150, align: "left" },
+ { label: '学号', name: 'StuNo', width: 100, align: "left" },
+ { label: '年级', name: 'Grade', width: 100, align: "left" },
+ { label: '姓名', name: 'StuName', width: 100, align: "left" },
+ {
+ label: '是否完善信息', name: 'ID', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DirectRelatives',
+ key: row.ID,
+ keyId: 'stuinfofreshid',
+ callback: function (_data) {
+ var a = _data['id'];
+ if (a == undefined) {
+ callback("未完善");
+ } else {
+ callback("已完善");
+ }
+ }
+ });
+ }
+ },
+ {
+ label: '是否生成学籍', name: 'IsInBasic', width: 100, align: "left", formatter: function (cellvalue) {
+ return cellvalue == true ? "是" : "否";
+ }
+ },
+ {
+ label: '线上缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) {
+ return value == 1 ? "已缴费" : "未缴费";
+ }
+ },
+ { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
+ {
+ label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) {
+ return value == 1 ? "已审核" : "未审核";
+ }
+ },
+ {
+ 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('' + _data.text + '');
+ } else {
+ callback('' + _data.text + '');
+ }
+ } else {
+ callback('未缴费');
+ }
+ }
+ });
+ }
+ },
+ {
+ label: '其他费用缴费状态', name: 'OtherPayFeeStatus', width: 100, align: "left", formatter: function (value) {
+ return value == 1 ? "已缴费" : "未缴费";
+ }
+ },
+ { label: '其他费用缴费时间', name: 'OtherPayFeeDate', width: 130, align: "left" },
+ {
+ label: '报到状态', name: 'RegisterStatus', width: 100, align: "left", formatter: function (value) {
+ return value == 1 ? "已报到" : "未报到";
+ }
+ },
+ { label: '报到时间', name: 'ArriveDate', width: 130, align: "left" },
+ {
+ label: '收取档案状态', name: 'CollectFileStatus', width: 100, align: "left", formatter: function (value) {
+ return value == 1 ? "已收取" : "未收取";
+ }
+ },
+ { label: '收取档案时间', name: 'CollectFileDate', width: 130, align: "left" },
+ {
+ label: '领取钥匙状态', name: 'GetKeyStatus', width: 100, align: "left", formatter: function (value) {
+ return value == 1 ? "已领取" : "未领取";
+ }
+ },
+ { label: '领取钥匙时间', name: 'GetKeyDate', width: 130, align: "left" },
+ {
+ label: '领取校园卡状态', name: 'GetCardStatus', width: 100, align: "left", formatter: function (value) {
+ return value == 1 ? "已领取" : "未领取";
+ }
+ },
+ { 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', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+ key: value,
+ keyId: 'deptno',
+ callback: function (_data) {
+ callback(_data['deptname']);
+ }
+ });
+ }
+ },
+ {
+ label: '专业', name: 'MajorNo', 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: 'ClassNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+ key: value,
+ keyId: 'classno',
+ callback: function (_data) {
+ callback(_data['classname']);
+ }
+ });
+ }
+ },
+ {
+ label: '性别', name: 'GenderNo', width: 80, 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: 'IdentityCardNo', width: 150, align: "left" },
+ {
+ label: '民族', name: 'NationalityNo', width: 80, 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: 'FamilyOriginNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'ExamineeCategory',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ {
+ label: '考生类型', name: 'TestStuSortNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'ExamineeType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ {
+ label: '科类', name: 'TestStuSubjectNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'SubjectType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+ { label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
+ {
+ label: '录取专业', name: 'RecruitMajorNo', 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: 'MatriculateSort', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'EnrollStyle',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: '语文', name: 'ChineseScore', width: 100, align: "left" },
+ { label: '数学', name: 'MathScore', width: 100, align: "left" },
+ { label: '英语', name: 'ForeignLangScore', width: 100, align: "left" },
+ { label: '综合', name: 'ComprehensiveScore', width: 100, align: "left" },
+ ],
+ mainId: 'ID',
+ isPage: true,
+ sidx: 'StuNo',
+ sord: 'desc'
+ });
+ page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ page.search();
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 39523b40d..d7d098713 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
@@ -952,6 +952,7 @@
+
@@ -6816,6 +6817,7 @@
+