Merge remote-tracking branch 'origin/master'

src/main/webapp/static/oss/ossupload.js

@@ -117,11 +117,6 @@ function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divI
         success:function (data1) {
             if(data1.code==='1'){
                 returnUrl = realPath+"/sys/workattachment/saveAttachment";
-                var p = Math.floor(1*25);
-                $("#jindutiao"+divId).attr("style","width: "+p+"%");
-                $("#jindutiao"+divId).attr("aria-valuenow",p+"%");
-                $("#baifenbi"+divId).html(p+"%");
-                $("#fileName"+divId).html("上传进度：");
 
                 $.ajax({
                     type:'post',
@@ -418,11 +413,6 @@ function multitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,
         }
     });
 
-    var p = Math.floor(1*25);
-    $("#jindutiao"+divId).attr("style","width: "+p+"%");
-    $("#jindutiao"+divId).attr("aria-valuenow",p+"%");
-    $("#baifenbi"+divId).html(p+"%");
-    $("#fileName"+divId).html("上传进度：");
     $.ajax({
         type:'post',
         url:realPath+"/bos/upload",

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceAllForm.jsp

@@ -357,19 +357,19 @@
 							<input id="workInvoiceProjectRelationList{{idx}}_delFlag" name="workInvoiceProjectRelationList[{{idx}}].delFlag" type="hidden" value="0"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_projectName"   type="text" value="{{row.projectName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectName"   type="text" value="{{row.projectName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td style="text-align:center;">
-							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" readonly="readonly"  class="form-control"/>
                         </td>
                     </tr>//-->
 					</script>
@@ -559,4 +559,4 @@
 </div>
 
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceAudit.jsp

@@ -105,19 +105,19 @@
 							<input id="workInvoiceProjectRelationList{{idx}}_delFlag" name="workInvoiceProjectRelationList[{{idx}}].delFlag" type="hidden" value="0"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_projectName"   type="text" value="{{row.projectName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectName"   type="text" value="{{row.projectName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td style="text-align:center;">
-							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" readonly="readonly"  class="form-control"/>
                         </td>
                     </tr>//-->
 				</script>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllForm.jsp

@@ -441,16 +441,16 @@
 													labelValue="{{row.projectName}}" cssClass="form-control judgment layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojecttss>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td style="text-align:center;">
-							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td class="text-center op-td" >
                             {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workInvoiceProjectRelationList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllReceiptForm.jsp

@@ -221,19 +221,19 @@
 							<input id="workInvoiceProjectRelationList{{idx}}_delFlag" name="workInvoiceProjectRelationList[{{idx}}].delFlag" type="hidden" value="0"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_projectName"   type="text" value="{{row.projectName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectName"   type="text" value="{{row.projectName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td style="text-align:center;">
-							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" readonly="readonly"  class="form-control"/>
                         </td>
                     </tr>//-->
 					</script>
@@ -472,4 +472,4 @@
 
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAuditEnd.jsp

@@ -480,19 +480,19 @@
 						<c:forEach items="${workInvoice.workInvoiceProjectRelationList}" var="list">
 							<tr>
 								<td>
-									<input type="text" value="${list.projectName}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.projectName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td>
-									<input type="text" value="${list.workContractName}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.workContractName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td style="text-align:center;">
-									<input type="text" value="${list.projectNum}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.projectNum}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td>
-									<input type="text" value="${list.clientName}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.clientName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td>
-									<input type="text" value="${list.reportDataNum}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.reportDataNum}" readonly="readonly"  class="form-control"/>
 								</td>
 <%--								<td class="text-center op-td" >--%>
 <%--									{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workInvoiceProjectRelationList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}--%>

src/main/webapp/webpage/modules/workinvoice/workInvoiceForm.jsp

@@ -441,16 +441,16 @@
 													labelValue="{{row.projectName}}" cssClass="form-control judgment layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojecttss>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td style="text-align:center;">
-							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td class="text-center op-td" >
                             {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workInvoiceProjectRelationList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}

src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp

@@ -482,16 +482,16 @@
 													labelValue="{{row.projectName}}" cssClass="form-control judgment layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojecttss>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td style="text-align:center;">
-							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
-							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td class="text-center op-td" >
                             {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow1(this, '#workInvoiceProjectRelationList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
@@ -706,4 +706,4 @@
 	</div>
 </div>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/workinvoice/workInvoiceProjectView.jsp

@@ -17,7 +17,7 @@
 			  $("#inputForm").submit();
 			  return true;
 		  }
-	
+
 		  return false;
 		}
 		$(document).ready(function() {
@@ -71,19 +71,19 @@
 							<tr>
 								<td>
 									<a onclick="openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=${list.projectId}','95%', '95%')">
-									<input type="text" value="${list.projectName}" maxlength="32" readonly="readonly"  class="form-control"/></a>
+									<input type="text" value="${list.projectName}" readonly="readonly"  class="form-control"/></a>
 								</td>
 								<td>
-									<input type="text" value="${list.workContractName}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.workContractName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td style="text-align:center;">
-									<input type="text" value="${list.projectNum}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.projectNum}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td>
-									<input type="text" value="${list.clientName}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.clientName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td>
-									<input type="text" value="${list.reportDataNum}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.reportDataNum}" readonly="readonly"  class="form-control"/>
 								</td>
 									<%--								<td class="text-center op-td" >--%>
 									<%--									{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workInvoiceProjectRelationList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}--%>
@@ -99,4 +99,4 @@
 	</div>
 </div>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/workinvoice/workInvoiceView.jsp

@@ -17,7 +17,7 @@
 			  $("#inputForm").submit();
 			  return true;
 		  }
-	
+
 		  return false;
 		}
 		$(document).ready(function() {
@@ -70,19 +70,19 @@
 						<c:forEach items="${workInvoice.workInvoiceProjectRelationList}" var="list">
 							<tr>
 								<td>
-									<input type="text" value="${list.projectName}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.projectName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td>
-									<input type="text" value="${list.workContractName}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.workContractName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td style="text-align:center;">
-									<input type="text" value="${list.projectNum}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.projectNum}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td>
-									<input type="text" value="${list.clientName}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.clientName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td>
-									<input type="text" value="${list.reportDataNum}" maxlength="32" readonly="readonly"  class="form-control"/>
+									<input type="text" value="${list.reportDataNum}" readonly="readonly"  class="form-control"/>
 								</td>
 									<%--								<td class="text-center op-td" >--%>
 									<%--									{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workInvoiceProjectRelationList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}--%>
@@ -282,4 +282,4 @@
 	</div>
 </div>
 </body>
-</html>
+</html>