xs 5 years ago
parent
commit
94101782e8

+ 15 - 7
src/main/webapp/webpage/modules/sg/financial/erp/erpCreditList.js

@@ -276,7 +276,7 @@ $(document).ready(function() {
             $('#remove').prop('disabled', ! $('#erpTable').bootstrapTable('getSelections').length);
             $('#view,#edit').prop('disabled', $('#erpTable').bootstrapTable('getSelections').length!=1);
         });
-		  
+    	var str = "";
 		$("#btnImport").click(function(){
 			jp.open({
 			    type: 2,
@@ -293,22 +293,30 @@ $(document).ready(function() {
 						iframeWin.contentWindow.importExcel('${ctx}/sg/financial/erpCredit/import', function (data) {
 							if(data.success){
 								jp.success(data.msg);
+								// jp.success(data.strings);
+								str = data.list;
+                                jp.downloadFile('${ctx}/sg/financial/erpCredit/export?ids='+ data.list);
 								refresh();
-							}else{
-								jp.error(data.msg);
+							}else if (data.flag) {
+                                jp.success("导入失败");
+                                var str1 =encodeURI(encodeURI(data.list));
+                                jp.openSaveDialog('不符合导出条件项目', "${ctx}/sg/financial/erpCredit/tips?str="+str1,'800px', '500px');
+							}else {
+                                jp.error(data.msg);
 							}
                             jp.close(index);
                         });//调用保存事件
                     return false;
 				  },
-				 
+
 				  btn2: function(index){
 					  jp.close(index);
 	    	       }
-			}); 
+			});
+            getExport(flag,str)
 		});
 	  $("#export").click(function(){//导出Excel文件
-			jp.downloadFile('${ctx}/sg/financial/erpCredit/export?ids='+ getIdSelections());
+			jp.downloadFile('${ctx}/sg/financial/erpCredit/export?ids='+ str);
 	  });
 	  $("#search").click("click", function() {// 绑定查询按扭
 		  $('#erpTable').bootstrapTable('refresh');
@@ -348,7 +356,6 @@ $(document).ready(function() {
          	  			jp.error(data.msg);
          	  		}
          	  	})
-          	   
 		})
   }
   
@@ -358,6 +365,7 @@ $(document).ready(function() {
   }
   function add(){
 	  jp.openSaveDialog('新增记录', "${ctx}/sg/financial/erpCredit/form",'800px', '500px');
+      // jp.openSaveDialog('新增记录', "${ctx}/sg/financial/erpCredit/tips",'800px', '500px');
   }
   
    function edit(id){//没有权限时,不显示确定按钮

+ 28 - 0
src/main/webapp/webpage/modules/sg/financial/erp/erpCreditTips.jsp

@@ -0,0 +1,28 @@
+<%@ page contentType="text/html;charset=UTF-8" isELIgnored="false"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title></title>
+	<meta name="decorator" content="ani"/>
+</head>
+<body class="bg-white">
+<table class="ani table">
+	<thead>
+	<tr>
+		<th width="35%">项目定义编号</th>
+		<th width="30%">有无维护数据</th>
+		<th width="30%">物料是否完成</th>
+	</tr>
+	</thead>
+	<tbody>
+		<c:forEach var="erp" items="${erpList}">
+			<tr>
+				<td>${erp.itemId}</td>
+				<td>${erp.mainFlag}</td>
+				<td>${erp.infoFlag}</td>
+			</tr>
+		</c:forEach>
+	</tbody>
+</table>
+</body>
+</html>