erp

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/util/ErpInfo.java

@@ -355,8 +355,9 @@ public  class ErpInfo {
                     if (materialDetails.contains("kVA")){
                         String str[] =  materialDetails.split(",");
                         for (int k = 0; k < str.length; k++) {
-                            if (str[k].contains("kVA")){
-                                materialDetails = str[k].substring(0,str[k].indexOf("kVA"));
+                            if (str[k].toLowerCase().contains("kva")){
+                                materialDetails = str[k].substring(0,str[k].toLowerCase().indexOf("kva"));
+                                break;
                             }
                         }
                         erpCreditChild1.setEqmTotalCapacity(materialDetails);//添加总容量

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/util/Test.java

@@ -6,12 +6,13 @@ import java.util.regex.Pattern;
 public class Test {
         @org.junit.Test
         public void getTest(){
-            String content = "10kV箱式变电站,400kVA,美式,硅钢片,普通,无环网柜,400kVA";
+            String content = "10kV箱式变电站,400kva,美式,硅钢片,普通,无环网柜,600kVA";
             String str[] =  content.split(",");
             for (int i = 0; i < str.length; i++) {
 //                System.out.println(str[i]);
-                if (str[i].contains("kVA")){
-                    System.out.println(str[i].substring(0,str[i].indexOf("kVA")));
+                    if (str[i].toLowerCase().contains("kva")){
+                    System.out.println(str[i].substring(0,str[i].toLowerCase().indexOf("kva")));
+                    break;
                 }
             }
         }

src/main/webapp/webpage/modules/sg/financial/erp/erpCreditList.js

@@ -37,9 +37,9 @@ $(document).ready(function() {
                //初始化加载第一页，默认第一页
                pageNumber:1,   
                //每页的记录行数（*）   
-               pageSize: 10,  
+               pageSize: 5,
                //可供选择的每页的行数（*）    
-               pageList: [10, 25, 50, 100],
+               pageList: [5,10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
                url: "${ctx}/sg/financial/erpCredit/data",
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
@@ -228,11 +228,11 @@ $(document).ready(function() {
                 auto: true,
 			    title:"导入数据",
 			    content: "${ctx}/tag/importExcel" ,
-			    btn: ['下载模板','确定', '关闭'],
-				btn1: function(index, layero){
-					  jp.downloadFile('${ctx}/sg/financial/erpCredit/import/template');
-				  },
-			    btn2: function(index, layero){
+			    btn: ['确定', '关闭'],
+				// btn1: function(index, layero){
+				// 	  jp.downloadFile('${ctx}/sg/financial/erpCredit/import/template');
+				//   },
+			    btn1: function(index, layero){
 						var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 						iframeWin.contentWindow.importExcel('${ctx}/sg/financial/erpCredit/import', function (data) {
 							if(data.success){
@@ -246,7 +246,7 @@ $(document).ready(function() {
                     return false;
 				  },
 				 
-				  btn3: function(index){ 
+				  btn2: function(index){
 					  jp.close(index);
 	    	       }
 			});