From c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 九月 2022 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/static/js/tableData.js | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/tableData.js b/src/main/webapp/static/js/tableData.js
index 8421657..1aba5b1 100644
--- a/src/main/webapp/static/js/tableData.js
+++ b/src/main/webapp/static/js/tableData.js
@@ -72,7 +72,7 @@
data:{},
success:function(res){
if(res.code==200){
- console.log(res)
+ // console.log(res)
data=res.data
// 鍒ゆ柇鏃堕棿鏄惁鏈塶ull 鏈塶ull鐨勬敼涓� ""
for(var i = 0;i<data.length;i++){
@@ -83,6 +83,11 @@
dataNull[k] = dataNull[k] === null ? "" : dataNull[k]
}
}
+ data[i].presaleAmt = data[i].presaleAmt=== null ? "" : data[i].presaleAmt;
+ data[i].plandeAmt = data[i].plandeAmt=== null ? "" : data[i].plandeAmt;;
+ data[i].planinAmt = data[i].planinAmt=== null ? "" : data[i].planinAmt;;
+ data[i].realdeAmt = data[i].realdeAmt=== null ? "" : data[i].realdeAmt;;
+ data[i].realinAmt = data[i].realinAmt=== null ? "" : data[i].realinAmt;;
}
// 琛ㄨ韩濉厖
$('#tab-body').empty()
@@ -106,8 +111,8 @@
+'<th class="projects">'+data[i].id+'</th>'
+'<th class="projects">'+data[i].type+'</th>'
+'<td class="nor-mal">'+data[i].presaleAmt+'</td>'
- +'<td class="nor-mal">'+data[i].startDay.substring(0,10)+'</td>'
- +'<td class="nor-mal">'+data[i].endDay.substring(0,10)+'</td>'
+ +'<td class="nor-mal">'+'<p>'+data[i].startDay.substring(0,10)+'</p>'+'</td>'
+ +'<td class="nor-mal">'+'<p>'+data[i].endDay.substring(0,10)+'</p>'+'</td>'
var str9 = '<td class="normal">'+'<p>'+data[i].plandeAmt+'</p>'+'<p>'+data[i].realdeAmt+'</p>'+'</td>'
+ '<td class="normal">'+'<p>'+data[i].planinAmt+'</p>'+'<p>'+data[i].realinAmt+'</p>'+'</td>'
var str3 = str2 +str + str9 +'</tr>'
--
Gitblit v1.9.1