Merge remote-tracking branch 'origin/master'

src/main/webapp/static/utilJs/custom.js

@@ -6,3 +6,12 @@ function wirteNum(obj){
     obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
     obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
 }
+
+
+function onblurNum(obj){
+    if(undefined == obj.value || null == obj.value || '' == obj.value){
+        obj.value = 0;
+    }else{
+        obj.value = parseFloat(obj.value);
+    }
+}

src/main/webapp/webpage/include/head.jsp

@@ -70,7 +70,7 @@
 <script src="${ctxStatic}/common/content.js" type="text/javascript"></script>
 <link href="${ctxStatic}/common/css/login.css" type="text/css" rel="stylesheet" />
 <script src="${ctxStatic}/common/js/common.js" type="text/javascript"></script>
-<script src="${ctxStatic}/utilJs/custom.js" type="text/javascript"></script>
+<script src="${ctxStatic}/utilJs/custom.js?1" type="text/javascript"></script>
 <script type="text/javascript">var ctx = '${ctx}', ctxStatic='${ctxStatic}',ctxp='${ctxp}';</script>
 
 <!-- 引入默认样式 -->

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit.jsp

@@ -950,6 +950,14 @@
 
         }
 
+        function onblurNum(obj){
+            if(undefined == obj.value || null == obj.value || '' == obj.value){
+                obj.value = 0;
+            }else{
+                obj.value = parseFloat(obj.value);
+            }
+        }
+
         function zxChange() {
             //咨询营业收入
             var mv = $("#ZiXunShouRu").val();

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedAudit.jsp

@@ -971,6 +971,14 @@
 
         }
 
+        function onblurNum(obj){
+            if(undefined == obj.value || null == obj.value || '' == obj.value){
+                obj.value = 0;
+            }else{
+                obj.value = parseFloat(obj.value);
+            }
+        }
+
         function zxChange() {
             //咨询营业收入
             var mv = $("#ZiXunShouRu").val();

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp

@@ -1804,7 +1804,7 @@
 					<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 					<span id="attachment_title"></span>
 					<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-						<table id="upTable" class="table table-bordered table-condensed">
+						<table id="upTable" class="table table-bordered table-condensed tree_table" style=" table-layout: fixed">
 							<thead>
 							<tr>
 								<th width="30%">文件类型</th>
@@ -1818,12 +1818,12 @@
 								<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
 									<c:choose>
 										<c:when test="${fileAttachment.mustFlag == 1}">
-											<td class="tabMove" style="text-align:left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
+											<td class="tabMove" style="word-wrap:break-word;text-align:left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 										</c:when>
 										<c:otherwise>
 											<c:choose>
 												<c:when test="${fileAttachment.flag == 0}">
-													<td class="tabMove"  style="text-align:left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
+													<td class="tabMove"  style="word-wrap:break-word;text-align:left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 												</c:when>
 												<c:otherwise>
 													<td></td>
@@ -1831,7 +1831,7 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-									<td>
+									<td style="word-wrap:break-word;">
 										<c:choose>
 											<c:when test="${fileAttachment.flag == 0}">
 												<%--												<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
@@ -1886,8 +1886,8 @@
 											</c:otherwise>
 										</c:choose>
 									</td>
-									<td>${fileAttachment.fileSize}</td>
-									<td class="op-td" style="text-align:center;">
+									<td style="word-wrap:break-word;">${fileAttachment.fileSize}</td>
+									<td class="op-td" style="word-wrap:break-word;text-align:center;">
 										<div class="op-btn-box" >
 											<c:choose>
 												<c:when test="${fileAttachment.flag == 0}">
@@ -1935,7 +1935,7 @@
 					<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 					<span id="gistdata_title"></span>
 					<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-						<table id="gistdata_upTable" class="table table-bordered table-condensed">
+						<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table" style=" table-layout: fixed">
 							<thead>
 							<tr>
 								<th width="30%">文件类型</th>
@@ -1950,12 +1950,12 @@
 										<%-- <td>${status.index + 1}</td>--%>
 									<c:choose>
 										<c:when test="${fileGistdata.mustFlag == 1}">
-											<td class="tabMove"  style="text-align:left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
+											<td class="tabMove"  style="word-wrap:break-word;text-align:left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 										</c:when>
 										<c:otherwise>
 											<c:choose>
 												<c:when test="${fileGistdata.flag == 0}">
-													<td class="tabMove"  style="text-align:left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
+													<td class="tabMove"  style="word-wrap:break-word;text-align:left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 												</c:when>
 												<c:otherwise>
 													<td></td>
@@ -1963,7 +1963,7 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-									<td>
+									<td style="word-wrap:break-word;">
 										<c:choose>
 											<c:when test="${fileGistdata.flag == 0}">
 												<%--												<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
@@ -2018,8 +2018,8 @@
 											</c:otherwise>
 										</c:choose>
 									</td>
-									<td>${fileGistdata.fileSize}</td>
-									<td class="op-td"  style="text-align:center;">
+									<td style="word-wrap:break-word;">${fileGistdata.fileSize}</td>
+									<td class="op-td"  style="word-wrap:break-word;text-align:center;">
 										<div class="op-btn-box" >
 											<c:choose>
 												<c:when test="${fileGistdata.flag == 0}">
@@ -2067,7 +2067,7 @@
 					<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 					<span id="other_title"></span>
 					<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-						<table id="upTable_other" class="table table-bordered table-condensed">
+						<table id="upTable_other" class="table table-bordered table-condensed tree_table" style=" table-layout: fixed">
 							<thead>
 							<tr>
 								<th width="30%">文件类型</th>
@@ -2082,12 +2082,12 @@
 										<%-- <td>${status.index + 1}</td>--%>
 									<c:choose>
 										<c:when test="${fileOther.mustFlag == 1}">
-											<td class="tabMove"  style="text-align:left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
+											<td class="tabMove"  style="word-wrap:break-word;text-align:left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 										</c:when>
 										<c:otherwise>
 											<c:choose>
 												<c:when test="${fileOther.flag == 0}">
-													<td class="tabMove"  style="text-align:left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
+													<td class="tabMove"  style="word-wrap:break-word;text-align:left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 												</c:when>
 												<c:otherwise>
 													<td></td>
@@ -2095,7 +2095,7 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-									<td>
+									<td style="word-wrap:break-word;">
 										<c:choose>
 											<c:when test="${fileOther.flag == 0}">
 												<%--												<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
@@ -2150,8 +2150,8 @@
 											</c:otherwise>
 										</c:choose>
 									</td>
-									<td>${fileGistdata.fileSize}</td>
-									<td class="op-td" style="text-align:center;">
+									<td style="word-wrap:break-word;">${fileGistdata.fileSize}</td>
+									<td class="op-td" style="word-wrap:break-word;text-align:center;">
 										<div class="op-btn-box" >
 											<c:choose>
 												<c:when test="${fileOther.flag == 0}">