diff --git a/cyx-admin/src/main/resources/templates/base/affairs/add.html b/cyx-admin/src/main/resources/templates/base/affairs/add.html index 4c7440a..5a2c2d7 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/add.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/add.html @@ -241,7 +241,7 @@ target[0].innerHTML = '考核内容:' demand[0].innerHTML = '考核目标:' detailed[0].innerHTML = '工作任务:' - score[0].innerHTML = '分值:' + score[0].innerHTML = '达标分:' break; case "季度考核指标": $("#dw").hide() @@ -249,7 +249,7 @@ target[0].innerHTML = '考核内容:' demand[0].innerHTML = '考核目标:' detailed[0].innerHTML = '评分办法:' - score[0].innerHTML = '分值:' + score[0].innerHTML = '达标分:' break; } }); diff --git a/cyx-admin/src/main/resources/templates/base/affairs/edit.html b/cyx-admin/src/main/resources/templates/base/affairs/edit.html index d792356..b14c3cc 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/edit.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/edit.html @@ -214,7 +214,7 @@ target[0].innerHTML = '考核内容:' demand[0].innerHTML = '考核目标:' detailed[0].innerHTML = '工作任务:' - score[0].innerHTML = '分值:' + score[0].innerHTML = '达标分:' break; case "季度考核指标": $("#dw").hide() @@ -222,7 +222,7 @@ target[0].innerHTML = '考核内容:' demand[0].innerHTML = '考核目标:' detailed[0].innerHTML = '评分办法:' - score[0].innerHTML = '分值:' + score[0].innerHTML = '达标分:' break; } }); diff --git a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html index a1d81a8..36257ef 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html @@ -96,6 +96,8 @@ removeUrl: prefix + "/remove", exportUrl: prefix + "/export", modalName: "党务", + showFooter: false, + footerStyle: footerStyle, columns: [{ checkbox: true }, @@ -131,7 +133,14 @@ }, { field: 'score', - title: '总分值' + title: '达标分', + footerFormatter:function (value) { + var sumBalance = 0; + for (var i in value) { + sumBalance += parseFloat(value[i].score); + } + return "总分值:" + sumBalance; + } }, { field: 'nowScore', @@ -191,6 +200,14 @@ }; $.table.init(options); }); + + function footerStyle(column) { + return { + userBalance: { + css: { color: 'red', 'font-weight': 'normal' } + } + }[column.field] + } \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/affairs/warn.html b/cyx-admin/src/main/resources/templates/base/affairs/warn.html index d55a2a1..d203af6 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/warn.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/warn.html @@ -127,6 +127,35 @@ return $.table.tooltip(value); } }, + + { + field: 'demand', + title: '目标要求/考核目标', + width:180, + align: 'center', + formatter: function(value, row, index) { + return $.table.tooltip(value); + } + }, + { + field: 'method', + title: '标准要求', + width:180, + align: 'center', + formatter: function(value, row, index) { + return $.table.tooltip(value); + } + }, + { + field: 'detailed', + title: '工作任务', + width:180, + align: 'center', + formatter: function(value, row, index) { + return $.table.tooltip(value); + } + }, + { field: 'commitTime', title: '提交时间', diff --git a/cyx-admin/src/main/resources/templates/base/affairs/year.html b/cyx-admin/src/main/resources/templates/base/affairs/year.html index 9172cdd..6ee0939 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/year.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html @@ -200,7 +200,7 @@ }, { field: 'score', - title: '分值' + title: '达标分' }, { field: 'nowScore', diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml index e326056..7016332 100644 --- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml +++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml @@ -342,10 +342,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"