Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/financial/settlement/service/DonorMaterialService.java

@@ -170,7 +170,11 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
             Row row = importExcel.getRow(i);
             if (null != row) {
                 String cellOne = this.getCellValue(row.getCell(1));
-                String cellTwo = this.getCellValue(row.getCell(2));
+                Cell cell=row.getCell(2);
+                if (cell.getCellType()!=1){
+                    cell.setCellType(1);
+                }
+                String cellTwo = cell.getStringCellValue();
                 if (null!=cellTwo  && !"".equals(cellTwo) && !"无".equals(cellTwo)  && !"0".equals(cellTwo)) {
                     donorMaterial.setProjectName(projectName);
                     donorMaterial.setProjectId(projectId);

src/main/webapp/webpage/modules/sg/financial/settlement/costCheckList.jsp

@@ -38,7 +38,7 @@
                                class="form form-horizontal well clearfix">
                         <div class="col-xs-12 col-sm-6 col-md-4">
                             <label class="label-item single-overflow pull-left" title="项目编码：">项目编码：</label>
-                            <form:input path="projectId" htmlEscape="false" maxlength="64" class=" form-control"/>
+                            <form:input path="projectId" htmlEscape="false" class=" form-control"/>
                         </div>
                         <div class="col-xs-12 col-sm-6 col-md-4">
                             <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>

src/main/webapp/webpage/modules/sg/financial/settlement/donorMaterialList.jsp

@@ -37,7 +37,7 @@
                                class="form form-horizontal well clearfix">
                         <div class="col-xs-12 col-sm-6 col-md-4">
                             <label class="label-item single-overflow pull-left" title="项目编码：">项目编码：</label>
-                            <form:input path="projectId" htmlEscape="false" maxlength="64" class=" form-control"/>
+                            <form:input path="projectId" htmlEscape="false" class=" form-control"/>
                         </div>
                         <div class="col-xs-12 col-sm-6 col-md-4">
                             <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>

src/main/webapp/webpage/modules/sg/financial/settlement/financeBudgetList.jsp

@@ -39,7 +39,7 @@
                                class="form form-horizontal well clearfix">
                         <div class="col-xs-12 col-sm-6 col-md-4">
                             <label class="label-item single-overflow pull-left" title="项目编码：">项目编码：</label>
-                            <form:input path="projectId" htmlEscape="false" maxlength="64" class=" form-control"/>
+                            <form:input path="projectId" htmlEscape="false" class=" form-control"/>
                         </div>
                         <div class="col-xs-12 col-sm-6 col-md-4">
                             <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>

src/main/webapp/webpage/modules/sg/financial/settlement/financeList.jsp

@@ -39,7 +39,7 @@
                                class="form form-horizontal well clearfix">
                         <div class="col-xs-12 col-sm-6 col-md-4">
                             <label class="label-item single-overflow pull-left" title="项目编码：">项目编码：</label>
-                            <form:input path="projectId" htmlEscape="false" maxlength="64" class=" form-control"/>
+                            <form:input path="projectId" htmlEscape="false" class=" form-control"/>
                         </div>
                         <div class="col-xs-12 col-sm-6 col-md-4">
                             <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>

src/main/webapp/webpage/modules/sg/raiseCapitalDesign/aerialConductorForm.jsp

@@ -137,9 +137,9 @@
 						<tr>
 							<th class="hide"></th>
 							<th>导线型号</th>
-							<th>单回路路径</th>
-							<th>双回路路径</th>
-							<th>单线长</th>
+							<th>单回路路径(km)</th>
+							<th>双回路路径(km)</th>
+							<th>单线长(km)</th>
 						</tr>
 					</thead>
 					<tbody id="highVoltageList">
@@ -196,9 +196,9 @@
 							<tr>
 								<th class="hide"></th>
 								<th>导线型号</th>
-								<th>单回路路径</th>
-								<th>双回路路径</th>
-								<th>单线长</th>
+								<th>单回路路径(km)</th>
+								<th>双回路路径(km)</th>
+								<th>单线长(km)</th>
 							</tr>
 							</thead>
 							<tbody id="lowVoltageList">

src/main/webapp/webpage/modules/sg/raiseCapitalDesign/inventoryForm.jsp

@@ -109,7 +109,7 @@
 						</td>
 
 						<td  class="max-width-250">
-							<input type='text' id="inventoryList[{{idx}}]_quantity" name="inventoryList[{{idx}}].quantity" placeholder="请输入数字"  class="form-control number"  value="{{row.quantity}}"/>
+							<input type='text' id="inventoryList[{{idx}}]_quantity" name="inventoryList[{{idx}}].quantity" placeholder="请输入数字"  class="form-control number"  value="{{row.quantity}}" onkeyup="this.value=this.value.replace(/^(\d*\.?\d{0,2}).*/,'$1')" maxlength="10"/>
 						</td>
 						<td class="max-width-250">
 							<input type='text' id="inventoryList[{{idx}}]_remarks" name="inventoryList[{{idx}}].remarks" class="form-control"  value="{{row.remarks}}"/>

src/main/webapp/webpage/modules/sg/raiseCapitalDesign/raiseCapitalDesign.jsp

@@ -142,7 +142,7 @@
 											</a>
 										</div>
 										<div style="float: left;margin-left: 5px;margin: auto">
-											<input style="width:40px;" placeholder="0" type="number" min="0" name="need" id="${itemss.id}"/><span>&nbsp;${itemss.mdUnit}</span>
+											<input style="width:70px;" placeholder="0" type="number" min="0" name="need" id="${itemss.id}"/><span>&nbsp;${itemss.mdUnit}</span>
 <%--											<span><img onclick="jp.showPic('${itemss.mdImg}')" src="${itemss.mdImg}" height="50px"></span>--%>
 											<c:if test="${not empty itemss.mdImg}">
 												<a id="imgButton" class="btn btn-success btn-xs waves-effect m-r-5" href="javascript:jp.openViewDialog('查看附件','${ctx}/picking/activiti/pickPic?id=${itemss.id}', '800px', '500px')">显示附件</a>