From 8525d7296057c6f0ae0aa651d78287f1adf5fe61 Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 7 Apr 2023 16:07:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8-=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=92=8C=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuTransferInfoController.cs | 9 - .../Views/StuTransferInfo/Index.cshtml | 1 - .../Views/StuTransferInfo/Index.js | 36 +- .../Views/StuTransferInfo/IndexQuery.cshtml | 54 --- .../Views/StuTransferInfo/IndexQuery.js | 323 ------------------ .../StuTransferInfo/QueryBasicInfo.cshtml | 6 +- .../Views/StuTransferInfo/QueryBasicInfo.js | 5 +- .../Learun.Application.Web.csproj | 2 - 8 files changed, 26 insertions(+), 410 deletions(-) delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs index 22841f4fa..2cdcfaf5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs @@ -104,15 +104,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return View(); } /// - /// 综合查询 - /// - /// - [HttpGet] - public ActionResult IndexQuery() - { - return View(); - } - /// /// 综合查询-基本信息 /// /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml index 7e8714d42..fbd2225df 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml @@ -94,7 +94,6 @@  删除
-  查看  综合查询
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js index ec13ca669..f3fdd9a27 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js @@ -131,24 +131,24 @@ var bootstrap = function ($, learun) { $('#lr_refresh').on('click', function () { location.reload(); }); - // 查看 - $('#lr_view').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('ID'); - if (learun.checkrow(keyValue)) { - if (keyValue.indexOf(',') != -1) { - learun.alert.warning("只能选择一条记录进行查看！"); - return; - } - learun.layerForm({ - id: 'formview', - title: '查看', - url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/FormView?keyValue=' + keyValue, - width: 1000, - height: 600, - btn: null - }); - } - }); + //// 查看 + //$('#lr_view').on('click', function () { + // var keyValue = $('#gridtable').jfGridValue('ID'); + // if (learun.checkrow(keyValue)) { + // if (keyValue.indexOf(',') != -1) { + // learun.alert.warning("只能选择一条记录进行查看！"); + // return; + // } + // learun.layerForm({ + // id: 'formview', + // title: '查看', + // url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/FormView?keyValue=' + keyValue, + // width: 1000, + // height: 600, + // btn: null + // }); + // } + //}); // 综合查询 $('#lr_compoundQuery').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.cshtml deleted file mode 100644 index 76125b66e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.cshtml +++ /dev/null @@ -1,54 +0,0 @@ -@{ - ViewBag.Title = "学籍异动列表"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
-
-
-
-
-
-
-
-
-
异动类型
-
-
-
-
姓名
- -
-
-
班级
-
-
-
-
申请人
-
-
-
-
审核人
-
-
-
-
保留学籍
-
-
-
-
-
-
-
-
- -
-
-  查看 -
-
-
-
-
-
-
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.js deleted file mode 100644 index 1a55138bd..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.js +++ /dev/null @@ -1,323 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2023-01-04 15:03 - * 描 述：学籍异动列表 - */ -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); - }, 290, 400); - $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); - $('#ClassNo').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, - value: "classno", - text: "classname" - }); - $('#CheckUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' }); - $('#CreateUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' }); - $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 查看 - $('#lr_views').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('ID'); - if (learun.checkrow(keyValue)) { - if (keyValue.indexOf(',') != -1) { - learun.alert.warning("只能选择一条记录进行查看！"); - return; - } - learun.layerForm({ - id: 'formview', - title: '查看', - url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/FormView?keyValue=' + keyValue, - width: 1000, - height: 600, - btn: null - }); - } - }); - }, - initGird: function () { - $('#gridtable').lrAuthorizeJfGridLei({ - url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/GetPageList', - headData: [ - { label: '姓名', name: 'StuName', width: 100, align: "left" }, - { label: '学号', name: 'StuNo', width: 160, align: "left" }, - { - label: "性别", name: "GenderNo", width: 80, align: "left", - formatter: function (cellvalue) { - return cellvalue == true ? "男" : "女"; - } - }, - { label: '身份证号', name: 'IdentityCardNo', width: 200, align: "left" }, - { - label: '原班级', name: 'ClassNo', width: 150, 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: 'MajorNo', width: 150, 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: '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: 'Grade', width: 100, align: "left" }, - { - label: '学制', name: 'EduSystem', width: 200, 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: 'LeaveDate', width: 100, align: "left", - // formatter: function (cellvalue) { - // return learun.formatDate(cellvalue, 'yyyy-MM-dd'); - // } - //}, - //{ - // label: '离班日期', name: 'EnteDate', width: 100, align: "left", - // formatter: function (cellvalue) { - // return learun.formatDate(cellvalue, 'yyyy-MM-dd'); - // } - //}, - //{ - // label: '现班级', name: 'NewClassNo', 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: 'NewMajorNo', 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: 'NewDeptNo', 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: 'NewGrade', width: 60, align: "left" }, - //{ - // label: '创建时间', name: 'CreateTime', width: 100, align: "left", - // formatter: function (cellvalue) { - // return learun.formatDate(cellvalue, 'yyyy-MM-dd'); - // } - //}, - //{ - // label: '创建用户', name: 'CreateUserId', width: 200, align: "left", - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('custmerData', { - // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', - // key: value, - // keyId: 'f_userid', - // callback: function (_data) { - // callback(_data['f_realname']); - // } - // }); - // } - //}, - //{ - // label: '审核时间', name: 'CheckTime', width: 200, align: "left", - // formatter: function (cellvalue) { - // return learun.formatDate(cellvalue, 'yyyy-MM-dd'); - // } - //}, - //{ - // label: '审核用户', name: 'CheckUserId', width: 200, align: "left", - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('custmerData', { - // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', - // key: value, - // keyId: 'f_userid', - // callback: function (_data) { - // callback(_data['f_realname']); - // } - // }); - // } - //}, - { - label: '审核状态', name: 'F_EnabledMark', width: 200, align: "left", - formatter: function (cellvalue) { - return cellvalue == "1" ? "已生效" : "未生效"; - } - }, - { - label: '异动类型', name: 'AnomalousType', width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'StuChangeType', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - //{ label: '异动原因', name: 'ChangeReason', width: 300, align: "left" }, - //{ - // label: '是否保留学籍', name: 'StuStatus', width: 80, 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: 'F_WriteMark', width: 80, 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: 'RecoverStuStatus', width: 80, 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: 'RecoverWriteMark', width: 80, 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: 'SuspensionPeriod', width: 200, align: "left" }, - //{ - // label: '休学开始时间', name: 'SuspensionBeginTime', width: 100, align: "left", - // formatter: function (cellvalue) { - // return learun.formatDate(cellvalue, 'yyyy-MM-dd'); - // } - //}, - //{ - // label: '休学结束时间', name: 'SuspensionEndTime', width: 100, align: "left", - // formatter: function (cellvalue) { - // return learun.formatDate(cellvalue, 'yyyy-MM-dd'); - // } - //}, - //{ label: '转学前学校', name: 'TransferSchool', width: 150, align: "left" }, - //{ label: '转学前学号', name: 'TransferStuNo', width: 100, align: "left" }, - //{ - // label: '出身日期', name: 'Birthday', width: 100, align: "left", - // formatter: function (cellvalue) { - // return learun.formatDate(cellvalue, 'yyyy-MM-dd'); - // } - //}, - //{ label: '民族', name: 'NationalityNo', width: 80, align: "left" }, - //{ label: '省', name: 'Province', width: 100, align: "left" }, - //{ label: '市', name: 'City', width: 100, align: "left" }, - //{ label: '县/区', name: 'County', width: 100, align: "left" }, - //{ label: '联系电话', name: 'Mobile', width: 100, align: "left" }, - //{ label: '家庭地址', name: 'MailAddress', width: 200, align: "left" }, - //{ label: '转出学校', name: 'OutSchool', width: 100, align: "left" }, - //{ label: '备注', name: 'Remark', width: 500, align: "left" }, - ], - mainId: 'ID', - isPage: true, - rows: 100, - }); - page.search(); - }, - search: function (param) { - param = param || {}; - param.SqlParameter = ' and F_EnabledMark = 1 '; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } - }; - refreshGirdData = function () { - $('#gridtable').jfGridSet('reload'); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.cshtml index 36bee8c8e..f3b1515da 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.cshtml @@ -18,6 +18,7 @@
+
+ +
- +
@*
基本信息
*@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.js index 43dfa77da..4428fa468 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.js @@ -16,6 +16,7 @@ var bootstrap = function ($, learun) { }, bind: function () { //选项卡 + $("#FormView").attr("src", "/EducationalAdministration/StuTransferInfo/FormView?keyValue=" + keyValue); $("#QueryScoreIndex").attr("src", "/EducationalAdministration/StuTransferInfo/QueryScoreIndex?keyValue=" + keyValue + '&StuNo=' + StuNo); $("#QueryScholarshipIndex").attr("src", "/EducationalAdministration/StuTransferInfo/QueryScholarshipIndex?keyValue=" + keyValue + '&StuNo=' + StuNo); $("#QueryAPStuHealthIndex").attr("src", "/EducationalAdministration/StuTransferInfo/QueryAPStuHealthIndex?keyValue=" + keyValue + '&StuNo=' + StuNo); @@ -27,13 +28,13 @@ var bootstrap = function ($, learun) { }, initData: function () { if (!!keyValue) { - + } } }; // 保存数据 acceptClick = function (callBack) { - + }; 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 a6dead558..760f571d9 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 @@ -1379,7 +1379,6 @@ - @@ -8084,7 +8083,6 @@ -