From 5cb6e935241d6ca537201ca1f06047652f4ba560 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Fri, 24 Mar 2023 16:27:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=AE=B6?=
=?UTF-8?q?=E5=BA=AD=E7=BB=8F=E6=B5=8E=E4=BF=A1=E6=81=AF=EF=BC=9A=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E7=8A=B6=E6=80=81=E4=BC=98=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../StudentWork/Views/FamilyEconomy/Index.js | 2 +-
.../Views/FamilyEconomy/IndexOfStudent.js | 56 +------------------
.../Views/FamilyEconomy/IndexOfThree.js | 2 +-
.../Views/FamilyEconomy/IndexOfTwo.js | 2 +-
4 files changed, 4 insertions(+), 58 deletions(-)
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" ? "已归档" : "草稿";
}
},
{