[user3] 4 years ago
parent
commit
afe3510734

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

@@ -616,7 +616,7 @@ public class ProjectBudgetController extends BaseController {
                     if (notExit.size() > 0) {
                         for (String a :
                                 notExit) {
-//                            nullMsg.append("项目编号" + a + "缺少应付金额;");
+                            nullMsg.append("项目编号" + a + "缺少应付金额;");
                         }
                     }
                     if (null != nullMsg && !"".equals(nullMsg)) {
@@ -679,7 +679,7 @@ public class ProjectBudgetController extends BaseController {
                         int i = donorMaterialService.verifyProjectMaterial(erpCreditChild2s, itemId,itemName);
                         //将有问题的信息记录下来
                         if (i == 0) {
-                            costNotMsg.append("成本项目编号" + itemId + "(无甲供材数据;");
+                            costNotMsg.append("成本项目编号" + itemId + "(无甲供材数据);");
                             //修改项目donor_material_check状态
                             projectBudgetService.updateCheck(itemId, "donor_material_check", "2");
                             e.setItemName(e.getItemName() + "(未通过财务检查)");

+ 4 - 1
src/main/webapp/webpage/modules/sg/financial/settlement/financeList.js

@@ -188,7 +188,10 @@
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
                     iframeWin.contentWindow.importExcel('${ctx}/finance/budget/importErp', function (data) {
                         if (data.success) {
-                            jp.alert(data.msg);
+                            console.log(data)
+                            if (data.msg != '') {
+                                jp.alert(data.msg);
+                            }
                             if (data.errorCode != "9999"){
                                 jp.downloadFile('${ctx}/sg/financial/erpCredit/export','finalAccount');//给个name是为了能够在某些条件下下载两个文件
                             }