From 512733908ae4f3a851f40f0551724d2186ce56ec Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 11:20:11 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
index 68a38e6..9b5b62e 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
@@ -52,14 +52,11 @@
}
var temp = getCookie("eleparm");
var tempindex = getCookie("eleparmindex");
+ var tempnum = getCookie("eleparmnum");
//console.info(temp);
temp=JSON.parse(temp);
tempindex = JSON.parse(tempindex);
- console.info(temp);
- console.info(temp[30]);
- console.info(temp[33]);
- console.info(tempindex);
-
+ tempnum =JSON.parse(tempnum);
var suoyin = temp[33];
$(function(){creatAllView(tempindex.length)});
@@ -386,6 +383,7 @@
console.info(battString);
var obj = {
//apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),
+ num : tempnum[i],
binf:{
StationId : $("#StationId").val(), // 鏈烘埧缂栧彿
StationName : ($("#station_name1").val()+"-"+$("#city").val()+"-"+$("#StationName3").val()+"-"+$("#StationName4").val()), // 鎷兼帴鏈烘埧鍚嶇О
@@ -460,12 +458,15 @@
console.info(model);
if(model.code ==1){
alert("淇敼鎴愬姛");
+ window.location.href="batt-unapproved.html"
}else{
alert("淇敼澶辫触!");
+ window.location.href="batt-unapproved.html"
}
},
error:function(){
alert("淇敼鐢垫睜缁勫け璐�!");
+ window.location.href="batt-unapproved.html"
}
});
}
--
Gitblit v1.9.1