diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Index.js index 2bb080fe3..d5fa88da1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Index.js @@ -340,7 +340,7 @@ var bootstrap = function ($, learun) { { label: '年级认定意见', name: 'GradeIdentifyOpinion', width: 100, align: "left" }, { label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) { - return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "归档" : "草稿"; + return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "已归档" : "草稿"; } }, { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfStudent.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfStudent.js index 0dae4c694..6a2b7d618 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfStudent.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfStudent.js @@ -69,60 +69,6 @@ var bootstrap = function ($, learun) { $('#lr_refresh').on('click', function () { location.reload(); }); - // 归档 - $('#lr_submit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - var Status = $('#gridtable').jfGridValue('Status'); - if (Status != "2") { - learun.alert.warning("当前项不属于学工部审核状态,无法提交归档!"); - return false; - } - learun.layerConfirm('是否确认归档该项!', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/StudentWork/FamilyEconomy/DoSubmit', { keyValue: keyValue, status: '3', step: '3' }, function () { - refreshGirdData(); - }); - } - }); - } - }); - // 退回辅导员 - $('#lr_back').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - var Status = $('#gridtable').jfGridValue('Status'); - if (Status != "2") { - learun.alert.warning("当前项不属于学工部审核状态,无法退回辅导员!"); - return false; - } - learun.layerConfirm('是否确认退回该项!', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/StudentWork/FamilyEconomy/DoBack', { keyValue: keyValue, status: '0', step: '3' }, function () { - refreshGirdData(); - }); - } - }); - } - }); - // 退回二级学院 - $('#lr_backTwo').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - var Status = $('#gridtable').jfGridValue('Status'); - if (Status != "2") { - learun.alert.warning("当前项不属于学工部审核状态,无法退回二级学院!"); - return false; - } - learun.layerConfirm('是否确认退回该项!', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/StudentWork/FamilyEconomy/DoBack', { keyValue: keyValue, status: '1', step: '3' }, function () { - refreshGirdData(); - }); - } - }); - } - }); }, initGird: function () { $('#gridtable').jfGrid({ @@ -322,7 +268,7 @@ var bootstrap = function ($, learun) { { label: '年级认定意见', name: 'GradeIdentifyOpinion', width: 100, align: "left" }, { label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) { - return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "归档" : "草稿"; + return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "已归档" : "草稿"; } }, { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfThree.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfThree.js index deb264221..17b2438b9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfThree.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfThree.js @@ -322,7 +322,7 @@ var bootstrap = function ($, learun) { { label: '年级认定意见', name: 'GradeIdentifyOpinion', width: 100, align: "left" }, { label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) { - return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "归档" : "草稿"; + return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "已归档" : "草稿"; } }, { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfTwo.js index 1738c8cdc..5c7c43bcc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfTwo.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfTwo.js @@ -326,7 +326,7 @@ var bootstrap = function ($, learun) { { label: '年级认定意见', name: 'GradeIdentifyOpinion', width: 100, align: "left" }, { label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) { - return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "归档" : "草稿"; + return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "已归档" : "草稿"; } }, {