diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluateTopicZP/PartyevaluateTopicZP.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluateTopicZP/PartyevaluateTopicZP.js index e4703a718..9074486ef 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluateTopicZP/PartyevaluateTopicZP.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluateTopicZP/PartyevaluateTopicZP.js @@ -226,7 +226,7 @@ }; function loadData(data,num){ - console.log("数据",data) + //console.log("数据",data) // valList var titleCon = '' titleCon+='

'+''+num+''+'

'+'
'+data.Assessment+''+'('+data.scorePre+'分)'+''+'
' diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/Index.cshtml index 7169340bf..afb4666e2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/Index.cshtml @@ -41,7 +41,7 @@
@* 提交*@ -  去审 +  去审核  打印
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/Index.js index 4079b9010..a361da002 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/Index.js @@ -84,7 +84,7 @@ var bootstrap = function ($, learun) { //去审 $('#lr_nocheck').on('click', function () { - learun.layerConfirm('是否确认去审!', function (res) { + learun.layerConfirm('是否确认去审核!', function (res) { if (res) { learun.postForm(top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/UpdateStatusForZP', { MainId: MainId, Status: '0' }, function () { refreshGirdData(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.cshtml index 237ff86dc..929702f90 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.cshtml @@ -41,7 +41,7 @@
@* 查看详情*@ -  去审 +  去审核  打印
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.js index 10563da3e..8b861cf17 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.js @@ -25,7 +25,7 @@ var bootstrap = function ($, learun) { //去审 $('#lr_nocheck').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); - learun.layerConfirm('是否确认去审!', function (res) { + learun.layerConfirm('是否确认去审核!', function (res) { if (res) { learun.postForm(top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/UpdateStatusForXZ', { keyValue: keyValue, Status: '0' }, function () { refreshGirdData(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataService.cs index 84921c9be..08351fe2b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataService.cs @@ -150,7 +150,7 @@ e.Assessment as Assessment,e.ConductRequirements as ConductRequirements,e.MaxSco { try { - string sql = @"select t.*, + string sql = @"select t.Id,t.MainId,t.EvaluatingIndicatorId,t.Assessed,isnull(t.Score,0) as Score,t.ScoreType, k.scorePre,'评分标准' as gradetitle,'保留小数点后一位' as gradenum, m.BeAssessed,m.ScoreYear,m.ScoreQuarter,e.Assessment,e.ConductRequirements,e.CRRemark,e.MaxScore,e.ScoringCriteria FROM DT_EvaluationData t join DT_EvaluatingIndicator e on t.EvaluatingIndicatorId=e.Id @@ -437,7 +437,7 @@ join DT_EvaluationDataMain m on t.MainId=m.Id { // 修改主表自评分值 string updSql = $@" update DT_EvaluationDataMain set ScoreZP={list.Select(x => x.Score).Sum()} - where BeAssessed = '{Assessed}'"; + where Id='{entity.MainId}'"; db.ExecuteBySql(updSql); } else if (type == 2)