A类项目审核完成后生成报告号前端页面

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -261,12 +261,18 @@
                         // $("#emergencyProject").parent().parent().parent().hide();
                         //A级均为非紧急项目
                         $("#emergencyProjectFlag").val("0");
+                        document.getElementById('reportSwitch').checked = false;
+                        document.getElementById('reportSwitch').disabled = true;
+
                         // $("#emergencyProject").prop("checked",false);
                         layui.form.render();
                     }else if(span==1){
                         // $("#emergencyProject").parent().parent().parent().show();
                         //B级默认紧急项目
                         $("#emergencyProjectFlag").val("1");
+                        document.getElementById('reportSwitch').checked = true;
+                        document.getElementById('reportSwitch').disabled = false;
+                        layui.form.render();
                     }
                 });
                 // form.on('switch(emergencyProject)',function(data){
@@ -287,10 +293,14 @@
                 var emergencyProject="${ruralProjectRecords.emergencyProject}"
                 if (emergencyProject=="1"){
                     $("#emergencyProjectFlag").val("1");
+                    document.getElementById('reportSwitch').checked = true;
+                    document.getElementById('reportSwitch').disabled = false;
                     // $("#emergencyProject").prop("checked",true);
                     layui.form.render();
                 }else{
                     $("#emergencyProjectFlag").val("0");
+                    document.getElementById('reportSwitch').checked = false;
+                    document.getElementById('reportSwitch').disabled = true;
                     // $("#emergencyProject").prop("checked",false);
                     layui.form.render();
                 }
@@ -1131,6 +1141,7 @@
                             <div style="margin-right: 30px;">
                                 <input type="checkbox" id="reportSwitch" <c:if test="${ruralProjectRecords.createReportFlag}">checked</c:if> lay-filter="reportSwitch" lay-skin="switch" lay-text="是|否">
                             </div>
+                            <p style="color: red;font-size: 12px;">A类项目，报告号将在质量复核后生成</p>
                         </div>
                     </div>
                 </c:if>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -753,10 +753,10 @@
                     ,"deleteAdmin":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     ,"modifyRecords":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '2' != projectRecords.projectReportStatus && '5' != projectRecords.projectReportStatus && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     <c:if test="${'1' == projectRecords.flagAdmin}">
-                        ,"reportDataFlag":<c:choose><c:when test="${'0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+                        ,"reportDataFlag":<c:choose><c:when test="${'0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5 && '2'!=projectRecords.submitMoney}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     </c:if>
                     <c:if test="${'0' == projectRecords.flagAdmin}">
-                        ,"reportDataFlag":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+                        ,"reportDataFlag":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5 && '2'!=projectRecords.submitMoney}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     </c:if>
                     </c:when>
                     <c:otherwise>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -243,12 +243,18 @@
                         // $("#emergencyProject").parent().parent().parent().hide();
                         //A级均为非紧急项目
                         $("#emergencyProjectFlag").val("0");
+                        document.getElementById('reportSwitch').checked = false;
+                        document.getElementById('reportSwitch').disabled = true;
+
                         // $("#emergencyProject").prop("checked",false);
                         layui.form.render();
                     }else if(span==1){
                         // $("#emergencyProject").parent().parent().parent().show();
-                        //B级默认非紧急项目
+                        //B级默认紧急项目
                         $("#emergencyProjectFlag").val("1");
+                        document.getElementById('reportSwitch').checked = true;
+                        document.getElementById('reportSwitch').disabled = false;
+                        layui.form.render();
                     }
                 });
                 // form.on('switch(emergencyProject)',function(data){
@@ -269,10 +275,14 @@
                 var emergencyProject="${ruralProjectRecords.emergencyProject}"
                 if (emergencyProject=="1"){
                     $("#emergencyProjectFlag").val("1");
+                    document.getElementById('reportSwitch').checked = true;
+                    document.getElementById('reportSwitch').disabled = false;
                     // $("#emergencyProject").prop("checked",true);
                     layui.form.render();
                 }else{
                     $("#emergencyProjectFlag").val("0");
+                    document.getElementById('reportSwitch').checked = false;
+                    document.getElementById('reportSwitch').disabled = true;
                     // $("#emergencyProject").prop("checked",false);
                     layui.form.render();
                 }
@@ -1121,6 +1131,7 @@
                             <div style="margin-right: 30px;">
                                 <input type="checkbox" id="reportSwitch" <c:if test="${ruralProjectRecords.createReportFlag}">checked</c:if> lay-filter="reportSwitch" lay-skin="switch" lay-text="是|否">
                             </div>
+                            <p style="color: red;font-size: 12px;">A类项目，报告号将在质量复核后生成</p>
                         </div>
                     </div>
                 </c:if>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -618,10 +618,10 @@
                     ,"deleteAdmin":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					,"modifyRecords":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '2' != projectRecords.projectReportStatus && '5' != projectRecords.projectReportStatus && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					<c:if test="${'1' == projectRecords.flagAdmin}">
-						,"reportDataFlag":<c:choose><c:when test="${'0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+						,"reportDataFlag":<c:choose><c:when test="${'0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5 && '2'!=projectRecords.submitMoney}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</c:if>
 					<c:if test="${'0' == projectRecords.flagAdmin}">
-						,"reportDataFlag":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+						,"reportDataFlag":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5 && '2'!=projectRecords.submitMoney}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</c:if>
 					</c:when>
                     <c:otherwise>