diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs
index 49d6f0709..17b7be6a9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs
@@ -141,5 +141,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
}
#endregion
+ #region 扩展数据
+ ///
+ /// 隐藏/撤下
+ ///
+ ///
+ ///
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult HideList(string keyValue,string strEntity)
+ {
+ FillinFromEntity entity = strEntity.ToObject();
+ entity.State = 0;
+ fillinFromIBLL.SaveEntity(keyValue, entity);
+ return Success("保存成功!");
+ }
+
+ #endregion
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js
index 5d8695d6a..6ac76ab54 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js
@@ -78,14 +78,14 @@ var bootstrap = function ($, learun) {
$('#lr_cancel').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
- var RStatus = $('#gridtable').jfGridValue('State');
- if (RStatus == 1) {
+ var State = $('#gridtable').jfGridValue('State');
+ if (State !== 1 && State !== 2 && State !== 0) {
learun.alert.warning("已提交!");
return false;
}
- learun.layerConfirm('是否确认提交该项!', function (res) {
+ learun.layerConfirm('是否确认撤回该项!', function (res) {
if (res) {
- learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Repair/DoSubmit', { keyValue: keyValue }, function () {
+ learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/DoCancel', { keyValue: keyValue }, function () {
refreshGirdData();
});
}
@@ -135,16 +135,12 @@ var bootstrap = function ($, learun) {
$('#lr_hide').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
- var RStatus = $('#gridtable').jfGridValue('State');
- if (RStatus == 1) {
- learun.alert.warning("已提交!");
- return false;
- }
- learun.layerConfirm('是否确认提交该项!', function (res) {
+ learun.layerConfirm('是否确认隐藏该项!', function (res) {
if (res) {
- learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Repair/DoSubmit', { keyValue: keyValue }, function () {
- refreshGirdData();
- });
+ param = param || {},
+ learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/HideLis', { keyValue: keyValue, queryJson: JSON.stringify(param) }, function () {
+ refreshGirdData();
+ });
}
});
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs
index b55082d8c..fda1b8ef7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs
@@ -38,7 +38,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// 公式
///
[Column("FORMULA")]
- public string Formul { get; set; }
+ public string FORMULA { get; set; }
///
/// 结果
///