Skip to content

platform
platform
Commit 64cbb5b0 authored by 王飞龙's avatar 王飞龙
Browse files
Options

Merge remote-tracking branch 'origin/test' into test

parents 640ec3c4 0074b6ff
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 30 deletions
src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
View file @ 64cbb5b0
......@@ -102,12 +102,12 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
//查询结果为一条数据，并且状态都是通过，更新列表状态为3
if(reviewList.size() == 1 && reviewList.get(0).getApprovalStatus() == 1 && reviews.containsAll(list) && list.containsAll(reviews)){
record.setProcessStatus(3);
}else if(reviewList.size() == 1 && reviewList.get(0).getApprovalStatus() == 0){
//查询结果为一条数据，并且状态都是驳回，更新列表状态为2
}else if(reviewList.size() > 1 ){
//既有通过和驳回，更新列表状态为2-驳回
record.setProcessStatus(2);
}else{
//列表状态为待审批
record.setProcessStatus(2);
record.setProcessStatus(record.getProcessStatus());
}
}
}
......
src/main/webapp/WEB-INF/page/education/questionnaire_Information_list.jsp
View file @ 64cbb5b0
......@@ -96,47 +96,47 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
<form>
<h5>基础指标</h5>
<div>
<span style="line-height: 14px">基础指标1<input name="index" type="radio" value="1"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标2<input name="index" type="radio" value="2"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标3<input name="index" type="radio" value="3"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标4<input name="index" type="radio" value="4"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标5<input name="index" type="radio" value="5"></span>
<span style="line-height: 14px"><input name="index" type="radio" value="1">基础指标1</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="2">基础指标2</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="3">基础指标3</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="4">基础指标4</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="5">基础指标5</span>
</div>
<div>
<span style="line-height: 14px">基础指标6<input name="index" type="radio" value="6"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标7<input name="index" type="radio" value="7"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标8<input name="index" type="radio" value="8"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标9<input name="index" type="radio" value="9"></span>
<span style="line-height: 14px"><input name="index" type="radio" value="6">基础指标6</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="7">基础指标7</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="8">基础指标8</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="9">基础指标9</span>
</div>
<br>
<h5>引导指标</h5>
<div>
<span style="line-height: 14px">引导指标1<input name="index" type="radio" value="10"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标2<input name="index" type="radio" value="11"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标3<input name="index" type="radio" value="12"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标4<input name="index" type="radio" value="13"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标5<input name="index" type="radio" value="14"></span>
<span style="line-height: 14px"><input name="index" type="radio" value="10">引导指标1</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="11">引导指标2</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="12">引导指标3</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="13">引导指标4</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="14">引导指标5</span>
</div>
<div>
<span style="line-height: 14px">引导指标6<input name="index" type="radio" value="15"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标7<input name="index" type="radio" value="16"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标8<input name="index" type="radio" value="17"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标9<input name="index" type="radio" value="18"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标10<input name="index" type="radio" value="19"></span>
<span style="line-height: 14px"><input name="index" type="radio" value="15">引导指标6</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="16">引导指标7</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="17">引导指标8</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="18">引导指标9</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="19">引导指标10</span>
</div>
<div>
<span style="line-height: 14px">引导指标11<input name="index" type="radio" value="20"></span>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;
<span style="line-height: 14px">引导指标12<input name="index" type="radio" value="21"></span>&emsp;&emsp;&emsp;&emsp;&nbsp;
<span style="line-height: 14px">引导指标13<input name="index" type="radio" value="22"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="20">引导指标11</span>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;
<span style="line-height: 14px"><input name="index" type="radio" value="21">引导指标12</span>&emsp;&emsp;&emsp;&emsp;&nbsp;
<span style="line-height: 14px"><input name="index" type="radio" value="22">引导指标13</span>&emsp;&emsp;&emsp;&emsp;&emsp;
</div>
<br>
<h5>奖励指标</h5>
<div>
<span style="line-height: 14px">奖励指标1<input name="index" type="radio" value="23"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">奖励指标2<input name="index" type="radio" value="24"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">奖励指标3<input name="index" type="radio" value="25"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">奖励指标4<input name="index" type="radio" value="26"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">奖励指标5<input name="index" type="radio" value="27"></span>
<span style="line-height: 14px"><input name="index" type="radio" value="23">奖励指标1</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="24">奖励指标2</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="25">奖励指标3</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="26">奖励指标4</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="27">奖励指标5</span>
</div>
<br>
<div class="ibox-content">
......
src/main/webapp/res/js/education/questionnaire_Information.js
View file @ 64cbb5b0
......@@ -63,6 +63,7 @@ function StatusCheck() {
$('#reject_btn').hide()
//$('textarea[name*="question_"]').prop('readonly', true)
for (let i = 1; i < 28; i++) {
$(`#submit${i} a`).hide()
$(`#submit${i} input[type='number']`).val(()=>{
try {
if(data.reviews.length>0){
......@@ -607,6 +608,8 @@ function saveQuestionnaire(isAuto){
} else {
swal("成功！", '暂存成功', "success");
}
}else {
swal("成功！", '没有要暂存的备注', "success");
}
}
});
......@@ -852,6 +855,11 @@ function synchronizeUpperAndLowerFormContents() {
})
text7.attr("disabled","disabled")
$("#guidingindicators7 #submit16").prepend(text7)
$("#guidingindicators7 table tr").each((index,element)=>{
if ($($(element).children()[12]).children().attr('title')=="否"||$($(element).children()[16]).children().attr('title')=="否") {
$(element).remove()
}
})
//引导指标8
var guidingindicators8=$("#basicindicators7 #content-basic-7").clone(false)
......@@ -922,6 +930,7 @@ function submitForReview(questionNum) {
if(result.result==true){
swal("成功！", '审核成功', "success");
$(`#submit${questionNum} a`).attr('disabled',"true")
$(`#submit${questionNum} a`).removeAttr('onclick')
}else{
swal("失败！", result.msg, "error");
}
......@@ -1210,6 +1219,7 @@ function scoreSubmission(questionNum) {
if(result.result==true){
swal("成功！", '审核成功', "success");
$(`#submit${questionNum} a`).attr('disabled',"true")
$(`#submit${questionNum} a`).removeAttr('onclick')
}else{
swal("失败！", result.msg, "error");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment