Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -522,7 +522,7 @@
 														<c:otherwise>
 															<c:choose>
 																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%')">${fileOther.attachName} ; </a>
+																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%','1')">${fileOther.attachName} ; </a>
 																</c:when>
 																<c:otherwise>
 																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%')">${fileOther.attachName} ; </a>
@@ -980,4 +980,4 @@
 	}
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportForm.jsp

@@ -39,7 +39,11 @@
 				var boolFlag = true;
 				var startDate = new Date($("#startDate").val());
 				var endingDate = new Date($("#endingDate").val());
-
+				var bzshbUserId = $("#bzshbUserId").val();
+				if(bzshbUserId == undefined || bzshbUserId ==null || bzshbUserId ==''){
+					parent.layer.msg("请选择审核人员!", {icon: 5});
+					return false;
+				}
 				if(startDate.getTime() > endingDate.getTime()){
 					parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
 					return false;
@@ -283,7 +287,7 @@
                 multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0");
             }
         }
-        
+
         function selectNum() {
 			top.layer.open({
 				type: 2,
@@ -1862,4 +1866,4 @@
 	}
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/projectAccessoryForm.jsp

@@ -761,7 +761,7 @@
 																<c:otherwise>
 																	<c:choose>
 																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%')">${fileOther.attachName} ; </a>
+																			<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%','1')">${fileOther.attachName} ; </a>
 																		</c:when>
 																		<c:otherwise>
 																			<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%')">${fileOther.attachName} ; </a>
@@ -1140,4 +1140,4 @@
 	}
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordView.jsp

@@ -477,7 +477,7 @@
 													<c:otherwise>
 														<c:choose>
 															<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%')">${fileOther.attachName} ; </a>
+																<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%','1')">${fileOther.attachName} ; </a>
 															</c:when>
 															<c:otherwise>
 																<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%')">${fileOther.attachName} ; </a>
@@ -876,4 +876,4 @@
 	}
 </script>--%>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit.jsp

@@ -607,7 +607,7 @@
 														<c:otherwise>
 															<c:choose>
 																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.temporaryUrl}','90%','90%')">${fileAttachment.attachName} ; </a>
+																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.temporaryUrl}','90%','90%','1')">${fileAttachment.attachName} ; </a>
 																</c:when>
 																<c:otherwise>
 																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.temporaryUrl}','90%','90%')">${fileAttachment.attachName} ; </a>
@@ -720,7 +720,7 @@
 														<c:otherwise>
 															<c:choose>
 																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.temporaryUrl}','90%','90%')">${fileGistdata.attachName} ; </a>
+																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.temporaryUrl}','90%','90%','1')">${fileGistdata.attachName} ; </a>
 																</c:when>
 																<c:otherwise>
 																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.temporaryUrl}','90%','90%')">${fileGistdata.attachName} ; </a>
@@ -835,7 +835,7 @@
 														<c:otherwise>
 															<c:choose>
 																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%')">${fileOther.attachName} ; </a>
+																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%','1')">${fileOther.attachName} ; </a>
 																</c:when>
 																<c:otherwise>
 																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%')">${fileOther.attachName} ; </a>
@@ -1114,4 +1114,4 @@
 	}
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp

@@ -664,7 +664,7 @@
 														<c:otherwise>
 															<c:choose>
 																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%')">${fileOther.attachName} ; </a>
+																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%','1')">${fileOther.attachName} ; </a>
 																</c:when>
 																<c:otherwise>
 																	<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%')">${fileOther.attachName} ; </a>
@@ -857,4 +857,4 @@
 	}
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm.jsp

@@ -26,7 +26,11 @@
 				var boolFlag = true;
 				var startDate = new Date($("#startDate").val());
 				var endingDate = new Date($("#endingDate").val());
-
+				var bzshbUserId = $("#bzshbUserId").val();
+				if(bzshbUserId == undefined || bzshbUserId ==null || bzshbUserId ==''){
+					parent.layer.msg("请选择审核人员!", {icon: 5});
+					return false;
+				}
 				if(startDate.getTime() > endingDate.getTime()){
 					parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
 					return false;
@@ -267,7 +271,7 @@
                 multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0");
             }
         }
-        
+
         function selectNum() {
 			top.layer.open({
 				type: 2,
@@ -576,7 +580,7 @@
 					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
 						<div class="layui-input-block">
-							<select class="form-control required editable-select layui-input" id="bzshbUserId" disabled="disabled" name="projectReportData.bzshbUserId">
+							<select class="form-control required layui-input" id="bzshbUserId" disabled="disabled" name="projectReportData.bzshbUserId">
 								<option value=""/>
 								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
 									<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
@@ -589,7 +593,7 @@
 					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
 						<div class="layui-input-block">
-							<select class="form-control required editable-select layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
+							<select class="form-control required layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
 								<option value=""/>
 								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
 									<option value="${user.id}">${user.name}</option>
@@ -1857,4 +1861,4 @@
 </script>
 
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectAccessoryView.jsp

@@ -396,7 +396,7 @@
 																<c:otherwise>
 																	<c:choose>
 																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%')">${fileOther.attachName} ; </a>
+																			<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%','1')">${fileOther.attachName} ; </a>
 																		</c:when>
 																		<c:otherwise>
 																			<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.temporaryUrl}','90%','90%')">${fileOther.attachName} ; </a>
@@ -454,4 +454,4 @@
 	</div>
 </div>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -584,7 +584,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
                     <div class="layui-input-block with-icon">
                         <sys:treeselect id="office" name="office.id" value="${workStaffBasicInfo.office.id}" labelName="office.name" labelValue="${workStaffBasicInfo.office.name}"
-                                       cssStyle="background-color:#fff" title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="true"/>
+                                       cssStyle="background-color:#fff" title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -2042,4 +2042,4 @@
 
 </script>
 </body>
-</html>
+</html>