From 78110e040425adf4243f966ccc865fb0498f69e1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 14 十二月 2018 10:07:31 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
index f6a02f6..3c1a91f 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
@@ -382,8 +382,9 @@
var index = String(i);
console.info(battString);
var obj = {
- //apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),
+ 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()), // 鎷兼帴鏈烘埧鍚嶇О
@@ -421,6 +422,7 @@
BattProductDate : $("#startTestrecord").val()+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡
BattInUseDate : $("#endTestrecord").val()+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡
install_user : $("#install_user").val(), //瀹夎浜哄憳
+
}
}
arr.push(obj);
@@ -461,12 +463,12 @@
window.location.href="batt-unapproved.html"
}else{
alert("淇敼澶辫触!");
- window.location.href="batt-unapproved.html"
+ //window.location.href="batt-unapproved.html"
}
},
error:function(){
alert("淇敼鐢垫睜缁勫け璐�!");
- window.location.href="batt-unapproved.html"
+ //window.location.href="batt-unapproved.html"
}
});
}
--
Gitblit v1.9.1