From 742107313fb8ebc4df0090c6b5b720fc936c92ee Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 30 五月 2022 14:30:21 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/itemTable.js                       |    3 +++
 src/main/webapp/static/js/projectSchedule/projectSchedule.js |    5 +++--
 src/main/webapp/static/js/tableData.js                       |    5 +++++
 src/main/webapp/static/js/projectSchedule/testData.js        |    1 +
 src/main/resources/application.yml                           |    2 +-
 src/main/webapp/static/js/item/item.js                       |    2 +-
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 27e1ab9..fd4e3a8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -17,7 +17,7 @@
 #    url: jdbc:sqlserver://127.0.0.1:51433;databasename=zypms
 #    username: sa
 #    password: Zoneyung@zy56$
-    url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms
+    url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms_pro
     username: sa
     password: sa@123
   mvc:
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index 68b8d2f..3c289a9 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -30,7 +30,7 @@
             // ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
             ,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'}
             ,{field: 'projectStatus$', align: 'center', title: '椤圭洰杩涘害'}
-
+            ,{field: 'orderDesc', align: 'center', title: '璁㈠崟绫诲瀷鎻忚堪', width: 115}
             // ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
             // ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
             ,{field: 'startTime0$', align: 'center',title: '璁″垝寮�濮嬫椂闂�', width: 115}
diff --git a/src/main/webapp/static/js/itemTable.js b/src/main/webapp/static/js/itemTable.js
index f02b773..979a894 100644
--- a/src/main/webapp/static/js/itemTable.js
+++ b/src/main/webapp/static/js/itemTable.js
@@ -19,6 +19,9 @@
             pageName: 'curr',
             pageSize: 'limit'
         },
+        page: true,
+        limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
         parseData: function (res) {
             return {
                 'code': res.code,
diff --git a/src/main/webapp/static/js/projectSchedule/projectSchedule.js b/src/main/webapp/static/js/projectSchedule/projectSchedule.js
index 3c17b62..dbc6935 100644
--- a/src/main/webapp/static/js/projectSchedule/projectSchedule.js
+++ b/src/main/webapp/static/js/projectSchedule/projectSchedule.js
@@ -37,7 +37,8 @@
 	$('#tab-body').empty()
 	var bodyStr = []
 	for (var i = 0; i < bodyData.length; i++) {
-		str = '<tr>' + '<td class="projectName">' + bodyData[i].name + '</td>'
+		str = '<tr>' + '<td class="projectName">' + bodyData[i].uuid + '</td>'
+			+ '<td class="projectName">' + bodyData[i].name + '</td>'
 			+ '<td>' + bodyData[i].orderDesc + '</td>'
 			+ '<td>' + bodyData[i].salesman + '</td>'
 			+ '<td>' + bodyData[i].presaleAmt + '</td>'
@@ -49,7 +50,7 @@
 			+ '<td>' + bodyData[i].deliveryMk$ + '</td>'
 			+ '<td>' + bodyData[i].custMan + '</td>' 
 			+ '<td>' + bodyData[i].custMobile + '</td>' 
-			+ '<td>' + bodyData[i].custAdress + '</td>' 
+			+ '<td>' + bodyData[i].custAdress + '</td>'
 			+ '<td>' + bodyData[i].projectStatus$ + '</td>'
 			+ '<td>' + bodyData[i].planCarInfo + '</td>' 
 			+ '<td>' + bodyData[i].plandeDate0$ + '</td>' 
diff --git a/src/main/webapp/static/js/projectSchedule/testData.js b/src/main/webapp/static/js/projectSchedule/testData.js
index cb3d17a..7ed56c2 100644
--- a/src/main/webapp/static/js/projectSchedule/testData.js
+++ b/src/main/webapp/static/js/projectSchedule/testData.js
@@ -7,6 +7,7 @@
 	getProject();
 },5000)
 var headData = [
+	'璁㈠崟鍙�',
 	'瀹㈡埛鍚嶇О',
 	'璁㈠崟绫诲瀷',
 	'涓氬姟鍛�',
diff --git a/src/main/webapp/static/js/tableData.js b/src/main/webapp/static/js/tableData.js
index 524eba0..1aba5b1 100644
--- a/src/main/webapp/static/js/tableData.js
+++ b/src/main/webapp/static/js/tableData.js
@@ -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()

--
Gitblit v1.9.1