|
@@ -26,7 +26,11 @@
|
|
var boolFlag = true;
|
|
var boolFlag = true;
|
|
var startDate = new Date($("#startDate").val());
|
|
var startDate = new Date($("#startDate").val());
|
|
var endingDate = new Date($("#endingDate").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()){
|
|
if(startDate.getTime() > endingDate.getTime()){
|
|
parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
|
|
parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
|
|
return false;
|
|
return false;
|
|
@@ -246,7 +250,7 @@
|
|
multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0");
|
|
multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
function selectNum() {
|
|
function selectNum() {
|
|
top.layer.open({
|
|
top.layer.open({
|
|
type: 2,
|
|
type: 2,
|
|
@@ -555,7 +559,7 @@
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<label class="layui-form-label"><span class="require-item">*</span>审核人员:</label>
|
|
<label class="layui-form-label"><span class="require-item">*</span>审核人员:</label>
|
|
<div class="layui-input-block">
|
|
<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=""/>
|
|
<option value=""/>
|
|
<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
|
|
<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>
|
|
<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
|
|
@@ -568,7 +572,7 @@
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<label class="layui-form-label"><span class="require-item">*</span>审核人员:</label>
|
|
<label class="layui-form-label"><span class="require-item">*</span>审核人员:</label>
|
|
<div class="layui-input-block">
|
|
<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=""/>
|
|
<option value=""/>
|
|
<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
|
|
<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
|
|
<option value="${user.id}">${user.name}</option>
|
|
<option value="${user.id}">${user.name}</option>
|
|
@@ -1833,4 +1837,4 @@
|
|
</script>
|
|
</script>
|
|
|
|
|
|
</body>
|
|
</body>
|
|
-</html>
|
|
|
|
|
|
+</html>
|