Quellcode durchsuchen

空数据默认提示修改,导出未通过生成文件问题

[user3] vor 4 Jahren
Ursprung
Commit
d12e2d01a5

+ 2 - 0
src/main/java/com/jeeplus/modules/sg/financial/settlement/web/ProjectBudgetController.java

@@ -620,6 +620,7 @@ public class ProjectBudgetController extends BaseController {
                         }
                     }
                     if (null != nullMsg && !"".equals(nullMsg)) {
+                        j.setErrorCode("9999");
                         returnMsg.append(nullMsg);
                     }
                     if (null != notMsg && !"".equals(notMsg)) {
@@ -630,6 +631,7 @@ public class ProjectBudgetController extends BaseController {
                     return j;
                 } else {
                     if (null != nullMsg && !"".equals(nullMsg)) {
+                        j.setErrorCode("9999");
                         returnMsg.append(nullMsg);
                     }
                     if (null != notMsg && !"".equals(notMsg)) {

+ 10 - 9
src/main/webapp/webpage/modules/sg/financial/settlement/financeList.js

@@ -103,7 +103,7 @@
                     title: '项目类型',
                     valign:"middle",
                     align:"center",
-                    width:'8%',
+                    width:'10%',
                     rowspan: 2
                 }
                 ,{
@@ -111,7 +111,7 @@
                     title: '概预算信息',
                     valign:"middle",
                     align:"center",
-                    width:'8%',
+                    width:'10%',
                     rowspan: 2
                 }
                 ,{
@@ -129,13 +129,13 @@
                     },
                     valign:"middle",
                     align:"center",
-                    width:'8%',
+                    width:'10%',
                     rowspan: 2
                 },{
                     title: '费用检查',
                     valign:"middle",
                     align:"center",
-                    width:'24%',
+                    width:'30%',
                     colspan: 3,
                     rowspan: 1
                 }
@@ -144,7 +144,7 @@
                     field: 'constructionCostCheck',
                     valign:"middle",
                     align:"center",
-                    width:'8%',
+                    width:'10%',
                     title: '施工费检查',
                     colspan: 1
                 }
@@ -152,14 +152,14 @@
                     field: 'designCostCheck',
                     valign:"middle",
                     align:"center",
-                    width:'8%',
+                    width:'10%',
                     title: '设计费检查',
                     colspan: 1
                 },{
                     field: 'supervisorCostCheck',
                     valign:"middle",
                     align:"center",
-                    width:'8%',
+                    width:'10%',
                     title: '监理费检查',
                     colspan: 1
                 }
@@ -242,7 +242,8 @@ function getIdSelections() {
 function getTdValue() {
     var tableId = document.getElementById("dataTable");
     if (tableId.rows.length>=3){
-        for(var i = 2;i < tableId.rows.length;i++) {
+        if (tableId.rows[2].cells[0].innerHTML != '没有找到匹配的记录'){
+        for(var i = 2;i <tableId.rows.length;i++) {
             if(tableId.rows[i].cells[4].innerHTML!="-" && tableId.rows[i].cells[4].innerHTML=="未通过"){
                 tableId.rows[i].cells[4].setAttribute("style","color: red;text-align:center;vertical-align:middle;");
             }
@@ -270,7 +271,7 @@ function getTdValue() {
             if(tableId.rows[i].cells[7].innerHTML!="-" && tableId.rows[i].cells[7].innerHTML=="未检查"){
                 tableId.rows[i].cells[7].setAttribute("style"," color: blue;text-align:center;vertical-align:middle;");
             }
-            
+        }
         }
     }
 }