From 6e41df337a08a1ac0ad54aaf89458d6ced35f6ac Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Mon, 19 Mar 2018 17:16:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9D=A5=E5=87=BD=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E8=A1=A8=E5=A4=B4=E5=88=97=E4=B8=8D=E6=8D=A2=E8=A1=8C?=
 =?UTF-8?q?=202.=E4=BF=AE=E6=94=B9=E6=9D=A5=E5=87=BD=EF=BC=8C=E4=B8=93?=
 =?UTF-8?q?=E9=A1=B9=E4=BB=BB=E5=8A=A1=E6=96=B0=E5=A2=9E=E6=97=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=95=BF=E5=BA=A6=E6=A0=A1=E9=AA=8C=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties    |  5 +++++
 src/main/resources/messages/message_zh_CN.properties |  5 +++++
 .../webapp/WEB-INF/views/basics/taskInfoForm.jsp     | 10 ++++++++++
 .../webapp/WEB-INF/views/basics/taskInfoList.jsp     |  5 +++--
 src/main/webapp/WEB-INF/views/cfg/requestForm.jsp    | 12 ++++++++++++
 src/main/webapp/WEB-INF/views/cfg/requestList.jsp    |  5 +++--
 6 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 17e69595a..b1e0d5f15 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -175,6 +175,11 @@ hasnot_approved=It has not been approved and can not be operated on !
 check_one=choose one please !
 one_more=please choose at least one !
 custom_columns=custom columns
+maxlength_64=The maxlength is 64\uff01
+maxlength_128=The maxlength is 128\uff01
+maxlength_256=The maxlength is 256\uff01
+maxlength_512=The maxlength is 512\uff01
+maxlength_4000=The maxlength is 4000\uff01
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 66f7a90c0..ffb07381a 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -174,6 +174,11 @@ hasnot_approved=\u672a\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\u8b
 check_one=\u8bf7\u9009\u62e9\u4e00\u6761\u6570\u636e\uff01
 one_more=\u8bf7\u81f3\u5c11\u9009\u62e9\u4e00\u6761\u6570\u636e!
 custom_columns=\u81ea\u5b9a\u4e49\u5217\u5b57\u6bb5
+maxlength_64=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f 64\u7684\u5b57\u7b26\u4e32\uff01
+maxlength_128=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f 128\u7684\u5b57\u7b26\u4e32\uff01
+maxlength_256=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f256\u7684\u5b57\u7b26\u4e32\uff01
+maxlength_512=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f512\u7684\u5b57\u7b26\u4e32\uff01
+maxlength_4000=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f4000\u7684\u5b57\u7b26\u4e32\uff01
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
index 800670b2d..9cae2e494 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
@@ -81,25 +81,35 @@
 				rules: {
 					taskName: {
 						required: true,
+						maxlength:64,
 					},
 					taskOrg: {
 						required: true,
+						maxlength:128,
 					},
 					taskTime: {
 						required: true,
 					},
+					taskDesc: {
+						maxlength:512,
+					},
 					
 				},
 				messages: {
 					taskName: {
 						required: '<spring:message code="required"/>',
+						maxlength: '<spring:message code="maxlength_64"/>',
 					},
 					taskOrg: {
 						required: '<spring:message code="required"/>',
+						maxlength: '<spring:message code="maxlength_128"/>',
 					},
 					taskTime: {
 						required: '<spring:message code="required"/>',
 					},
+					taskDesc: {
+						maxlength: '<spring:message code="maxlength_512"/>',
+					},
 				},
 				submitHandler: function(form){
 					//loading('onloading...');
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
index d1683c90c..d4fd0b4b5 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
@@ -151,9 +151,9 @@
 
 					</div>
 
-					<!-- <div class="table-responsive"> -->
+					<div class="table-responsive">
 					<sys:message content="${message}"/>
-						<table id="contentTable" class="table table-striped table-bordered table-condensed">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
@@ -198,6 +198,7 @@
 						</table>
 						<div class="page">${page}</div>	
 					</div>
+					</div>
 			</div>
 		</div>
 	</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
index aebed9bba..e90a620b4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
@@ -88,15 +88,21 @@
 				rules: {
 					requestNumber: {
 						required: true,
+						maxlength:64,
 					},
 					requestOrg: {
 						required: true,
+						maxlength:128,
 					},
 					requestTime: {
 						required: true,
 					},
+					requestTitle: {
+						maxlength:512,
+					},
 					requestContent: {
 						required: true,
+						maxlength:4000,
 					},
 					
 					
@@ -104,15 +110,21 @@
 				messages: {
 					requestNumber: {
 						required: '<spring:message code="required"/>',
+						maxlength:'<spring:message code="maxlength_64"/>',
 					},
 					requestOrg: {
 						required: '<spring:message code="required"/>',
+						maxlength:'<spring:message code="maxlength_128"/>',
 					},
 					requestTime: {
 						required: '<spring:message code="required"/>',
 					},
+					requestTitle: {
+						maxlength:'<spring:message code="maxlength_512"/>',
+					},
 					requestContent: {
 						required: '<spring:message code="required"/>',
+						maxlength:'<spring:message code="maxlength_4000"/>',
 					},
 				},
 				submitHandler: function(form){
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index 2393a504b..79d040c02 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -167,9 +167,9 @@
 					
 					
 
-					<!-- <div class="table-responsive"> -->
+					<div class="table-responsive">
 					<sys:message content="${message}"/>
-						<table id="contentTable" class="table table-striped table-bordered table-condensed">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
@@ -225,6 +225,7 @@
 		</div>
 	</div>
 	</div>
+	</div>
 
 <script>
  	$(document).ready(function() {