diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SW_Ask_Student/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SW_Ask_Student/Index.js
index b6c3c85f7..c4895908d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SW_Ask_Student/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SW_Ask_Student/Index.js
@@ -98,6 +98,19 @@ var bootstrap = function ($, learun) {
});
}
});
+ //提名
+ $('#lr_Nominate').on('click', function () {
+ learun.layerFormForPercent({
+ id: 'formitem',
+ title: '奖学金提名',
+ url: top.$.rootUrl + '/StudentWork/SW_Ask_Student/IndexTwo',
+ width: "60%",
+ height: "70%",
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ });
},
// 初始化列表
initGird: function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SW_Ask_Student/IndexTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SW_Ask_Student/IndexTwo.cshtml
new file mode 100644
index 000000000..323c51160
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SW_Ask_Student/IndexTwo.cshtml
@@ -0,0 +1,46 @@
+@{
+ ViewBag.Title = "奖学金提名";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/StudentWork/Views/SW_Ask_Student/IndexTwo.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SW_Ask_Student/IndexTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SW_Ask_Student/IndexTwo.js
new file mode 100644
index 000000000..73e740063
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SW_Ask_Student/IndexTwo.js
@@ -0,0 +1,198 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
+ * Copyright (c) 2013-2018 北京泉江科技有限公司
+ * 创建人：超级管理员
+ * 日 期：2019-03-29 11:27
+ * 描 述：在册登记明细
+ */
+var refreshGirdData;
+var acceptClick;
+//var AId = request("AId");
+//console.log(AId);
+//var currentUser = request("currentUser");//我的资产需要用到
+//var IsDelete = request("IsDelete");//报废资产需要使用
+var bootstrap = function ($, learun) {
+ "use strict";
+ var page = {
+ init: function () {
+ page.initGird();
+ page.bind();
+ //if (currentUser) {
+ // setTimeout("hiddenButton()", 300);
+ //}
+ },
+ bind: function () {
+ $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+ page.search(queryJson);
+ }, 200, 400);
+ $('#MajorNo').lrDataSourceSelect({
+ code: 'CdDeptInfo',
+ value: 'deptno',
+ text: 'deptname',
+ maxHeight: 200,
+ select: function (item) {
+ var DeptNo = $("#MajorNo").lrselectGet();
+ if (DeptNo != null && DeptNo != "" && DeptNo != undefined) {
+ $('#ClassNo').lrselectRefresh({
+ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+ param: { strWhere: " 1=1 and deptno in (" + DeptNo + ")" },
+ value: "classno",
+ text: "classname",
+ allowSearch: false,
+ maxHeight: 200,
+ //select: function (item) {
+ // var ClassNo = $("#ClassNo").lrselectGet();
+ // if (ClassNo != null && ClassNo != "" && ClassNo != undefined) {
+ // $('#StuNo').lrselectRefresh({
+ // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuList',
+ // param: { strWhere: " 1=1 and classno in (" + ClassNo + ")" },
+ // value: "stuid",
+ // text: "stuname",
+ // maxHeight: 200,
+ // allowSearch: true
+ // });
+ // }
+ //}
+ });
+ } else {
+ $("#ClassNo").lrselect();
+ }
+ }
+ });
+ $("#ClassNo").lrselect();
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
+ headData: [
+ {
+ label: "学生", name: "StuName", width: 150, align: "left",
+ },
+ {
+ label: "所属系", name: "DeptNo", width: 200, 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: 150, align: "left",
+ },
+ {
+ label: "班级", name: "ClassNo", width: 200, 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']);
+ }
+ });
+ }
+ },
+ ],
+ mainId: 'stuId',
+ //mainId: 'AIId',
+ isMultiselect: true,
+ isPage: true,
+ //sidx: 'AICodeNum'
+ });
+ page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ //param.AId = AId;
+ //if (currentUser) {
+ // var userInfo = top.learun.clientdata.get(['userinfo']);
+ // param.userId = userInfo.userId;
+ //}
+ param.AIIsScrap = false;
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ page.search();
+ };
+ // 保存数据
+ acceptClick = function (callBack) {
+ console.log(111,22)
+ var selectedRow = $('#gridtable').jfGridGet('rowdata');
+ callBack(selectedRow);
+ };
+ page.init();
+}
+
+
+Date.prototype.Format = function (fmt) { //author: meizz
+ var o = {
+ "M+": this.getMonth() + 1, //月份
+ "d+": this.getDate(), //日
+ "H+": this.getHours(), //小时
+ "m+": this.getMinutes(), //分
+ "s+": this.getSeconds(), //秒
+ "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+ "S": this.getMilliseconds() //毫秒
+ };
+ if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+ for (var k in o)
+ if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+ return fmt;
+}
+
+
+function datedifference(sDate1, sDate2) { //sDate1和sDate2是2006-12-18格式
+ var dateSpan,
+ tempDate,
+ iDays;
+ sDate1 = Date.parse(sDate1);
+ sDate2 = Date.parse(sDate2);
+ dateSpan = sDate2 - sDate1;
+ dateSpan = Math.abs(dateSpan);
+ iDays = Math.floor(dateSpan / (24 * 3600 * 1000));
+ return iDays;
+};
+
+
+
+function AddPrintContent(html) {
+ var myHtml = myHtml = html;
+ // var strBodyStyle="";
+ // var strFormHtml=strBodyStyle+""+myHtml+"";
+ var strFormHtml = "" + myHtml + "";
+
+ LODOP = getLodop();
+ LODOP.PRINT_INIT("资产编号");
+ LODOP.SET_PRINT_PAGESIZE(2, '40mm', '32.3mm', "");
+
+ LODOP.SET_PRINT_MODE("PRINT_DUPLEX", 2);
+ LODOP.SET_PRINT_MODE("PRINT_DEFAULTSOURCE", 7);
+
+ LODOP.ADD_PRINT_HTM(10, 8, '40mm', '30mm', strFormHtml);
+ //打印预览
+ // LODOP.SET_SHOW_MODE("LANDSCAPE_DEFROTATED",1);
+ // var TaskID1=LODOP.PREVIEW();
+ // 直接打印
+ var TaskID1 = LODOP.PRINT();
+
+};
+//function hiddenButton() {
+
+// $("#lr_add").hide();
+// $("#lr_printBar").hide();
+// $("#lr_edit").hide();
+// $("#lr_delete").hide();
+// $("#lr_detail").hide();
+// $("#lr_import").hide();
+//}
+
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 be983313b..9cefee5a8 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
@@ -1490,6 +1490,8 @@
+
+