From c58d9f94318d9c8c3c3dfdbcfd6b7d0d436de992 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期四, 10 一月 2019 09:09:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/mobil/wapprovalBatt-index.html |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html b/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
index 378caf9..5a20fae 100644
--- a/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
+++ b/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
@@ -121,9 +121,10 @@
 			 						}
 			 					}
 		 						console.info(model);
-		 						stationlist=model;
+		 						
 	 						}
 	 					}
+	 					stationlist=model;
 	 					createUl($('#battList'),model);
 	 				}
 	 			}
@@ -151,6 +152,7 @@
 						num :arrdata[i].num,
 						check_en:arrdata[i].check_en,
 						apply_date: arrdata[i].apply_date,
+						apply_name: arrdata[i].apply_name,
 						binf:{
 							StationId : arrdata[i].binf.StationId,	// 鏈烘埧缂栧彿
 							StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName3+"-"+arrdata[i].binf.StationName4),	// 鎷兼帴鏈烘埧鍚嶇О

--
Gitblit v1.9.1