diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js
index c5e53fbf5..d703314b2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js
@@ -23,25 +23,27 @@ var bootstrap = function ($, learun) {
// 填报
$('#lr_add').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
- var ProjectName = $('#gridtable').jfGridValue('ProjectName');
- learun.httpAsyncGet(top.$.rootUrl + '/LR_Desktop/QualityReport/IsCanReport?keyValue=' + keyValue, function (res) {
- if (res.code == 200) {
- learun.layerForm({
- id: 'form',
- title: ProjectName + '填报',
- url: top.$.rootUrl + '/LR_Desktop/QualityReport/Form?keyValue=' + keyValue + '&ProjectName=' + ProjectName,
- width: 600,
- height: 400,
- callBack: function (id) {
- return top[id].acceptClick(refreshGirdData);
- }
- });
- }
- else {
- learun.alert.error(res.info);
- }
- });
+ if (learun.checkrow(keyValue)) {
+ var ProjectName = $('#gridtable').jfGridValue('ProjectName');
+ learun.httpAsyncGet(top.$.rootUrl + '/LR_Desktop/QualityReport/IsCanReport?keyValue=' + keyValue, function (res) {
+ if (res.code == 200) {
+ learun.layerForm({
+ id: 'form',
+ title: ProjectName + '填报',
+ url: top.$.rootUrl + '/LR_Desktop/QualityReport/Form?keyValue=' + keyValue + '&ProjectName=' + ProjectName,
+ width: 600,
+ height: 400,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ }
+ else {
+ learun.alert.error(res.info);
+ }
+ });
+ }
});
// 删除
$('#lr_delete').on('click', function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildService.cs
index b4a29c245..a73dbcbad 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildService.cs
@@ -292,7 +292,7 @@ where a.Id='{keyValue}' order by b.Sort";
}
///
- ///
+ /// 保存
///
///
///
@@ -351,7 +351,7 @@ where a.Id='{keyValue}' order by b.Sort";
else
{
gs = gs.Replace("(", "(").Replace(")", ")");
- if (gs.Contains("*100%"))
+ if (gs.Contains("%"))
{
gs = gs.Replace("%", "");
var dt = db.FindTable($"select convert(varchar,convert(decimal(18,0),{gs}))+'%' as num ");