From ba28a445d502ea308b73e4a21d12ac35166c9438 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.27>
Date: 星期五, 14 十二月 2018 09:34:53 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html | 8 +++++---
gx_tieta/WebRoot/mobil/batt-approved.html | 6 ++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index 81a71f0..a3790d1 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -328,11 +328,9 @@
if(i%34==33){
//<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
console.info(i);
- arrTd[i]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>';
-
+ arrTd[i]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>';
continue;
-
- }
+ }
arrTd[i]=i*10;
}
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