Merge branch 'test' into 'master'

解决填报页面样式问题，审核页面暂存按钮问题

See merge request !35

src/main/webapp/WEB-INF/page/education/questionnaire_information.jsp

@@ -2748,7 +2748,7 @@
                                     <div class="col-sm-4 col-sm-offset-2">
 <%--                                        <a class="btn btn-primary" id="goback_btn" onclick="gobcak()">返回</a>--%>
                                         <a class="btn btn-primary" id="tempSave_btn"
-                                           onclick="saveQuestionnaire()">暂存备注</a>
+                                           onclick="saveQuestionnaire()">暂存返回</a>
                                         <a class="btn btn-primary" id="pass_btn" onclick="gobcak()">审核结束</a>
 <%--                                        <a class="btn btn-primary" id="reject_btn"--%>
 <%--                                           onclick="rejectQuestionnaire()">驳回</a>--%>

src/main/webapp/res/js/education/questionnaire_Information.js

@@ -607,6 +607,7 @@ function saveQuestionnaire(isAuto){
 					layer.msg('已自动暂存');
 				} else {
 					swal("成功！", '暂存成功', "success");
+					history.go(-1);
 				}
 			}else {
 				swal("成功！", '没有要暂存的备注', "success");

src/main/webapp/res/js/space/questionnaire_Information.js

@@ -1045,6 +1045,7 @@ $(function () {
         $("#guidingindicators1 input").attr("disabled", "disabled")
         $("#guidingindicators1 select").attr("disabled", "disabled")
         $("#guidingindicators1 #rejectMessage1").hide()
+        $("#guidingindicators1").removeAttr('class','ibox-content')
 
 
         //引导指标2
@@ -1058,6 +1059,7 @@ $(function () {
         $("#guidingindicators2 input").attr("disabled", "disabled")
         $("#guidingindicators2 select").attr("disabled", "disabled")
         $("#guidingindicators2 #rejectMessage1").hide()
+        $("#guidingindicators2").removeAttr('class','ibox-content')
 
         //引导指标3
         var guidingindicators3 = $("#basicindicators3").clone(false)
@@ -1079,9 +1081,9 @@ $(function () {
         $("#guidingindicators3 input").attr("disabled", "disabled")
         $("#guidingindicators3 select").attr("disabled", "disabled")
         $("#guidingindicators3 #rejectMessage3").hide()
+        $("#guidingindicators3").removeAttr('class','ibox-content')
 
         //引导指标4
-
         var guidingindicators4 = $("#basicindicators3").clone(false)
         $("#guidingindicators4").empty()
         $("#guidingindicators4").append(guidingindicators4)
@@ -1111,6 +1113,7 @@ $(function () {
                 $(element).remove()
             }
         })
+        $("#guidingindicators4").removeAttr('class','ibox-content')
 
 
         //引导指标5
@@ -1131,6 +1134,7 @@ $(function () {
         $("#guidingindicators5 input").attr("disabled", "disabled")
         $("#guidingindicators5 select").attr("disabled", "disabled")
         $("#guidingindicators5 #rejectMessage4").hide()
+        $("#guidingindicators5").removeAttr('class','ibox-content')
 
         //引导指标7
         var guidingindicators7 = $("#basicindicators6").clone(false)
@@ -1158,6 +1162,7 @@ $(function () {
             }
 
         })
+        $("#guidingindicators7").removeAttr('class','ibox-content')
 
         //引导指标8
         var guidingindicators8 = $("#basicindicators7").clone(false)
@@ -1177,6 +1182,7 @@ $(function () {
         $("#guidingindicators8 input").attr("disabled", "disabled")
         $("#guidingindicators8 select").attr("disabled", "disabled")
         $("#guidingindicators8 #rejectMessage7").hide()
+        $("#guidingindicators8").removeAttr('class','ibox-content')
 
     })
 })
\ No newline at end of file