diff --git a/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml b/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml index 78c316a..3703871 100644 --- a/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml +++ b/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml @@ -78,7 +78,7 @@ left join pj_evaluate_details ped on ped.evaluate_id = per.evaluate_id left join pj_template_config pt on pt.config_id = per.template_id and pt.is_active = 1 left join pm_org_info poi on per.dept_id = poi.id and poi.status = 1 -# left join pm_org_info poi1 on poi1.id = r.pro_id + left join pm_org_info poi1 on poi1.id = r.pro_id where per.is_active = 1 diff --git a/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryForm.html b/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryForm.html index 9e11e1b..637c554 100644 --- a/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryForm.html +++ b/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryForm.html @@ -453,6 +453,11 @@ subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2); } else if (twoLevelCountType === '最低分') { subTotals = Math.min(...subArr).toFixed(2); + } else if (twoLevelCountType === '累加') { + subTotals = subArr.reduce((a, b) => a + b, 0).toFixed(2); + } else if (twoLevelCountType === '累减') { + const sumOfDifferences = subArr.reduce((sum, value) => sum + (10 - value), 0); + subTotals = (10 - sumOfDifferences).toFixed(2); } } else { subTotals = "0.00"; diff --git a/src/main/resources/static/pages/evaluate/responsibleApproval/summaryAuditView.html b/src/main/resources/static/pages/evaluate/responsibleApproval/summaryAuditView.html index ce82656..52784a9 100644 --- a/src/main/resources/static/pages/evaluate/responsibleApproval/summaryAuditView.html +++ b/src/main/resources/static/pages/evaluate/responsibleApproval/summaryAuditView.html @@ -252,6 +252,11 @@ subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2); } else if (twoLevelCountType === '最低分') { subTotals = Math.min(...subArr).toFixed(2); + } else if (twoLevelCountType === '累加') { + subTotals = subArr.reduce((a, b) => a + b, 0).toFixed(2); + } else if (twoLevelCountType === '累减') { + const sumOfDifferences = subArr.reduce((sum, value) => sum + (10 - value), 0); + subTotals = (10 - sumOfDifferences).toFixed(2); } } else { subTotals = "0.00"; diff --git a/src/main/resources/static/pages/evaluate/subEvaluate/InitiateEvaluationList.html b/src/main/resources/static/pages/evaluate/subEvaluate/InitiateEvaluationList.html index 0166dc4..6845e0e 100644 --- a/src/main/resources/static/pages/evaluate/subEvaluate/InitiateEvaluationList.html +++ b/src/main/resources/static/pages/evaluate/subEvaluate/InitiateEvaluationList.html @@ -155,7 +155,7 @@ text += '查看'; - if (d.status === '未评价'){ + if (d.status === '待评价'){ text += '编辑'; diff --git a/src/main/resources/static/pages/evaluate/summaryAudit/summaryAuditView.html b/src/main/resources/static/pages/evaluate/summaryAudit/summaryAuditView.html index d1b0d70..fb1b650 100644 --- a/src/main/resources/static/pages/evaluate/summaryAudit/summaryAuditView.html +++ b/src/main/resources/static/pages/evaluate/summaryAudit/summaryAuditView.html @@ -4,161 +4,161 @@ 汇总审核查看审批 - + -
-
-
-
+
+
- - - - - - - - + + + + + + + + const layerIndex = layer.open({ + type: 2, + title: name + "评价审批", + shade: 0.3, + area: ['98%', '98%'], + scrollbar: true, + move: true, + anim: 2, + shadeClose: false, + content: url, + }); + } + + + function getHide(id) { + let isHide = false; + $.ajax({ + url: ctxPath + '/outsourcer/isCheckOneIsAudit', + type: 'get', + async: false, + data: { + templateId: getUrlParam('templateId'), + evaluateId: getUrlParam('evaluateId'), + deptId: id, + evaluateType: '3', + type: 'auditAll', + }, + success: function (res) { + if (res.res == '1') { + isHide = true + $.ajax({ + url: ctxPath + '/outsourcer/isCheckThreeIsAudit', + type: 'get', + async: false, + data: { + templateId: getUrlParam('templateId'), + evaluateId: getUrlParam('evaluateId'), + deptId: id, + evaluateType: '3', + type: 'auditAll', + }, + success: function (res) { + if (res.res == '1') { + isHide = false; + } else { + isHide = true; + } + } + }) + } else { + isHide = false; + } + } + }) + return isHide; + } + diff --git a/src/main/resources/static/pages/evaluate/template/evaluateTemplateFrom.html b/src/main/resources/static/pages/evaluate/template/evaluateTemplateFrom.html index 2ceb3cb..2620794 100644 --- a/src/main/resources/static/pages/evaluate/template/evaluateTemplateFrom.html +++ b/src/main/resources/static/pages/evaluate/template/evaluateTemplateFrom.html @@ -136,6 +136,8 @@ + +