Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/web/ErpCreditController.java

@@ -173,12 +173,10 @@ public class ErpCreditController extends BaseController {
 	@ResponseBody
 	@RequestMapping(value = "detail")
 	public ErpCredit detail(String id) {
-		System.out.println(id);
 		return erpCreditService.get(id);
 	}
 	/**
 	 * 导入Excel数据
-
 	 */
 	@ResponseBody
 //	@RequiresPermissions("sg:financial:erpCredit:import")

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

@@ -331,31 +331,35 @@ $(document).ready(function() {
 	  $.get("${ctx}/sg/financial/erpCredit/detail?id="+row.id, function(erpCredit){
     	var testDataMain1Child1RowIdx = 0, testDataMain1Child1Tpl = $("#testDataMain1Child1Tpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 		var data1 =  erpCredit.erpCreditChild1s;
-		for (var i=0; i<data1.length; i++){
-			data1[i].dict = {};
-			data1[i].dict.isHave = jp.getDictLabel(${fns:toJson(fns:getDictList('yes_no'))}, data1[i].isHave, "-");
-			addRow('#testDataMain1Child-'+row.id+'-1-List', testDataMain1Child1RowIdx, testDataMain1Child1Tpl, data1[i]);
-			testDataMain1Child1RowIdx = testDataMain1Child1RowIdx + 1;
+		if(data1!=null){
+			for (var i=0; i<data1.length; i++){
+				// data1[i].dict = {};
+				// data1[i].dict.isHave = jp.getDictLabel(${fns:toJson(fns:getDictList('yes_no'))}, data1[i].isHave, "-");
+				addRow('#testDataMain1Child-'+row.id+'-1-List', testDataMain1Child1RowIdx, testDataMain1Child1Tpl, data1[i]);
+				testDataMain1Child1RowIdx = testDataMain1Child1RowIdx + 1;
+			}
 		}
 				
     	var testDataMain1Child2RowIdx = 0, testDataMain1Child2Tpl = $("#testDataMain1Child2Tpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 		var data2 =  erpCredit.erpCreditChild2s;
-		for (var i=0; i<data2.length; i++){
-			data2[i].dict = {};
-			data2[i].dict.isHave = jp.getDictLabel(${fns:toJson(fns:getDictList('yes_no'))}, data2[i].isHave, "-");
-			addRow('#testDataMain1Child-'+row.id+'-2-List', testDataMain1Child2RowIdx, testDataMain1Child2Tpl, data2[i]);
-			testDataMain1Child2RowIdx = testDataMain1Child2RowIdx + 1;
+    	if(data2!=null){
+			for (var i=0; i<data2.length; i++){
+				// data2[i].dict = {};
+				// data2[i].dict.isHave = jp.getDictLabel(${fns:toJson(fns:getDictList('yes_no'))}, data2[i].isHave, "-");
+				addRow('#testDataMain1Child-'+row.id+'-2-List', testDataMain1Child2RowIdx, testDataMain1Child2Tpl, data2[i]);
+				testDataMain1Child2RowIdx = testDataMain1Child2RowIdx + 1;
+			}
 		}
-				
     	var testDataMain1Child3RowIdx = 0, testDataMain1Child3Tpl = $("#testDataMain1Child3Tpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 		var data3 =  erpCredit.erpCreditChild3s;
-		for (var i=0; i<data3.length; i++){
-			data3[i].dict = {};
-			data3[i].dict.isHave = jp.getDictLabel(${fns:toJson(fns:getDictList('yes_no'))}, data3[i].isHave, "-");
-			addRow('#testDataMain1Child-'+row.id+'-3-List', testDataMain1Child3RowIdx, testDataMain1Child3Tpl, data3[i]);
-			testDataMain1Child3RowIdx = testDataMain1Child3RowIdx + 1;
+    	if(data3!=null){
+			for (var i=0; i<data3.length; i++){
+				// data3[i].dict = {};
+				// data3[i].dict.isHave = jp.getDictLabel(${fns:toJson(fns:getDictList('yes_no'))}, data3[i].isHave, "-");
+				addRow('#testDataMain1Child-'+row.id+'-3-List', testDataMain1Child3RowIdx, testDataMain1Child3Tpl, data3[i]);
+				testDataMain1Child3RowIdx = testDataMain1Child3RowIdx + 1;
+			}
 		}
-				
       	  			
       })
      
@@ -374,7 +378,7 @@ $(document).ready(function() {
 		<ul class="nav nav-tabs">
 				<li class="active"><a data-toggle="tab" href="#tab-{{idx}}-1" aria-expanded="true">设备费</a></li>
 				<li><a data-toggle="tab" href="#tab-{{idx}}-2" aria-expanded="true">材料费</a></li>
-				<li><a data-toggle="tab" href="#tab-{{idx}}-3" aria-expanded="true">10kv线路信息</a></li>
+				<li><a data-toggle="tab" href="#tab-{{idx}}-3" aria-expanded="true">10KV线路信息</a></li>
 		</ul>
 		<div class="tab-content">
 				 <div id="tab-{{idx}}-1" class="tab-pane fade in active">
@@ -422,7 +426,7 @@ $(document).ready(function() {
 				</div>
 		</div>//-->
 	</script>
-	<script type="text/template" id="testDataMain1Child1Tpl">
+	<script type="text/template" id="testDataMain1Child1Tpl">//<!--
 				<tr>
 					<td>
 						{{row.eqmMaterialDetails1}}
@@ -439,9 +443,9 @@ $(document).ready(function() {
 					<td>
 						{{row.eqmBookedFee1}}
 					</td>
-				</tr>
+				</tr>//-->
 	</script>
-	<script type="text/template" id="testDataMain1Child2Tpl">
+	<script type="text/template" id="testDataMain1Child2Tpl">//<!--
 				<tr>
 					<td>
 						{{row.eqmMaterialDetails2}}
@@ -449,9 +453,9 @@ $(document).ready(function() {
 					<td>
 						{{row.mtlBookedFee2}}
 					</td>
-				</tr>
+				</tr>//-->
 	</script>
-	<script type="text/template" id="testDataMain1Child3Tpl">
+	<script type="text/template" id="testDataMain1Child3Tpl">//<!--
 				<tr>
 					<td>
 						{{row.tenKvModel}}
@@ -471,5 +475,5 @@ $(document).ready(function() {
                     <td>
                         {{row.tenKvItesFhvFollow}}
                     </td>
-				</tr>
+				</tr>//-->
 	</script>