From 0503f39c3131a8dcab9413cfae5aa93dd06d4ee8 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Wed, 8 Sep 2021 15:11:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=9B=AE=E6=A0=87=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E6=9B=B4=E6=94=B9=E5=A1=AB=E6=8A=A5=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/FillinFromController.cs | 2 +-
.../Views/FillinFrom/FormIndex.js | 35 +++++--------------
.../Views/FillinFrom/Index.js | 2 +-
3 files changed, 11 insertions(+), 28 deletions(-)
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 c9ed1c26d..8e9555c6c 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
@@ -168,7 +168,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
entity.State = 2;
}
#endregion
- qualityReportMainIBLL.EditProjectByFId(keyValue);
+ //qualityReportMainIBLL.EditProjectByFId(keyValue);
}
#region 处理填报日期
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormIndex.js
index 4d2f7aa7d..bc2251e9e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormIndex.js
@@ -96,11 +96,11 @@ var bootstrap = function ($, learun) {
$('#lr_people').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;
- }
+ //var RStatus = $('#gridtable').jfGridValue('State');
+ //if (RStatus !== 1) {
+ // learun.alert.warning("当前项不能设置填报人！");
+ // return false;
+ //}
learun.layerForm({
id: 'form',
title: '设置填报人',
@@ -113,24 +113,6 @@ 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) {
- // if (res) {
- // learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Repair/DoSubmit', { keyValue: keyValue }, function () {
- // refreshGirdData();
- // });
- // }
- // });
- // }
- //});
},
// 初始化列表
initGird: function () {
@@ -198,8 +180,9 @@ var bootstrap = function ($, learun) {
} else if (cellvalue === 0) {
return '草稿';
} else if (cellvalue === 1) {
- return '待设置填报人';
- } else if (cellvalue === 2) {
+ return '已提交';
+ }
+ else if (cellvalue === 2) {
return '待填报';
} else if (cellvalue === 3) {
return '已完成';
@@ -218,7 +201,7 @@ var bootstrap = function ($, learun) {
param.IsFlag = 0;
param.isSystem = isSystem;
param.departmentId = departmentId;
- param.SqlParameter = ' and t.State=1';
+ param.SqlParameter = ' and t.State>0 ';
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
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 27e079008..2bafe2a0d 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
@@ -293,7 +293,7 @@ var bootstrap = function ($, learun) {
} else if (cellvalue === 0) {
return '草稿';
} else if (cellvalue === 1) {
- return '待设置填报人';
+ return '已提交';
} else if (cellvalue === 2) {
return '待填报';
} else if (cellvalue === 3) {