|
|
@@ -7,6 +7,7 @@
|
|
|
<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
|
|
|
<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
|
|
|
<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
|
|
|
+ <script src="${ctxStatic}/common/html/js/script.js"></script>
|
|
|
<%@include file="/webpage/include/treetable.jsp" %>
|
|
|
|
|
|
<style>
|
|
|
@@ -21,80 +22,86 @@
|
|
|
function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
|
|
|
if(validateForm.form()){
|
|
|
var projectId = '${projectRecords.id}';
|
|
|
- var leng = $("#file_attachment tr").length;
|
|
|
- var leng1 = $("#reportedConsultantList tr").length;
|
|
|
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;
|
|
|
- }
|
|
|
- if (leng1==0){
|
|
|
- top.layer.msg("请添加咨询员信息！", {icon: 0});
|
|
|
- return false;
|
|
|
- }
|
|
|
- for(var i=0; i<leng; i++) {
|
|
|
- var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
|
|
|
- var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
|
|
|
- var name = $("#file_attachment tr").eq(i).find("td:eq(2)").html();
|
|
|
- var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
|
|
|
- if(second == 1){
|
|
|
- if(numberStr != undefined && numberStr !=null && numberStr !=''){
|
|
|
- if (fileFlag==1){
|
|
|
-
|
|
|
- }else{
|
|
|
- top.layer.msg("请上传成果文件！", {icon: 0});
|
|
|
+ if(boolFlag){
|
|
|
+ if(obj == 1){
|
|
|
+ var leng = $("#file_attachment tr").length;
|
|
|
+ var leng1 = $("#reportedConsultantList tr").length;
|
|
|
+ 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(boolFlag){
|
|
|
- var gistdata = $("#file_gistdata tr").length;
|
|
|
- for(var i=0; i<gistdata; i++) {
|
|
|
- var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
|
|
|
- var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
|
|
|
- var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
|
|
|
- if(second == 1){
|
|
|
- if(numberStr != undefined && numberStr !=null && numberStr !=''){
|
|
|
- if (fileFlag==1){
|
|
|
+ if(startDate.getTime() > endingDate.getTime()){
|
|
|
+ parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (leng1==0){
|
|
|
+ top.layer.msg("请添加咨询员信息！", {icon: 0});
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ for(var i=0; i<leng; i++) {
|
|
|
+ var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
|
|
|
+ var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
|
|
|
+ var name = $("#file_attachment tr").eq(i).find("td:eq(2)").html();
|
|
|
+ var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
|
|
|
+ if(second == 1){
|
|
|
+ if(numberStr != undefined && numberStr !=null && numberStr !=''){
|
|
|
+ if (fileFlag==1){
|
|
|
|
|
|
- }else{
|
|
|
- top.layer.msg("请上传依据性文件！", {icon: 0});
|
|
|
- return false;
|
|
|
+ }else{
|
|
|
+ top.layer.msg("请上传成果文件！", {icon: 0});
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ if(boolFlag){
|
|
|
+ var gistdata = $("#file_gistdata tr").length;
|
|
|
+ for(var i=0; i<gistdata; i++) {
|
|
|
+ var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
|
|
|
+ var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
|
|
|
+ var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
|
|
|
+ if(second == 1){
|
|
|
+ if(numberStr != undefined && numberStr !=null && numberStr !=''){
|
|
|
+ if (fileFlag==1){
|
|
|
+
|
|
|
+ }else{
|
|
|
+ top.layer.msg("请上传依据性文件！", {icon: 0});
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- }
|
|
|
- if(boolFlag){
|
|
|
- var other = $("#ile_other tr").length;
|
|
|
- for(var i=0; i<other; i++) {
|
|
|
- var numberStr = $("#ile_other tr").eq(i).find("td:first").html();
|
|
|
- var second = $("#ile_other tr").eq(i).find("td:eq(1)").html();
|
|
|
- var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
|
|
|
- if(second == 1){
|
|
|
- if(numberStr != undefined && numberStr !=null && numberStr !=''){
|
|
|
- if (fileFlag==1){
|
|
|
+ if(boolFlag){
|
|
|
+ var other = $("#ile_other tr").length;
|
|
|
+ for(var i=0; i<other; i++) {
|
|
|
+ var numberStr = $("#ile_other tr").eq(i).find("td:first").html();
|
|
|
+ var second = $("#ile_other tr").eq(i).find("td:eq(1)").html();
|
|
|
+ var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
|
|
|
+ if(second == 1){
|
|
|
+ if(numberStr != undefined && numberStr !=null && numberStr !=''){
|
|
|
+ if (fileFlag==1){
|
|
|
|
|
|
- }else{
|
|
|
- top.layer.msg("请上传其它文件！", {icon: 0});
|
|
|
- return false;
|
|
|
+ }else{
|
|
|
+ top.layer.msg("请上传其它文件！", {icon: 0});
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ var flags=judgment();
|
|
|
+ if (!flags){
|
|
|
+ return flags;
|
|
|
+ }else{
|
|
|
+ $("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessageNew/saveReport");
|
|
|
}
|
|
|
- }
|
|
|
- }
|
|
|
- if(boolFlag){
|
|
|
- if(obj == 1){
|
|
|
- $("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessageNew/saveReport");
|
|
|
}else{
|
|
|
+
|
|
|
$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessageNew/holdSaveReport");
|
|
|
}
|
|
|
$("#inputForm").submit();
|
|
|
@@ -749,19 +756,19 @@
|
|
|
<div class="layui-item layui-col-sm6">
|
|
|
<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
|
|
|
<div class="layui-input-block with-icon">
|
|
|
- <form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false" class="form-control required layui-input number" onchange="getFee()" onblur="getAttachment()"/>
|
|
|
+ <form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false" class="form-control judgment layui-input number" onchange="getFee()" onblur="getAttachment()"/>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="layui-item layui-col-sm6">
|
|
|
<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
|
|
|
<div class="layui-input-block with-icon">
|
|
|
- <form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false" class="form-control required layui-input number" onchange="getApprovalFee()"/>
|
|
|
+ <form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false" class="form-control judgment layui-input number" onchange="getApprovalFee()"/>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="layui-item layui-col-sm6">
|
|
|
- <label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
|
|
|
+ <label class="layui-form-label">合同价(元)：</label>
|
|
|
<div class="layui-input-block with-icon">
|
|
|
- <form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false" class="form-control required layui-input number"/>
|
|
|
+ <form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false" class="form-control layui-input number"/>
|
|
|
</div>
|
|
|
</div>
|
|
|
<%--<c:choose>
|
|
|
@@ -795,7 +802,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 layui-input" id="bzshbUserId" name="projectReportData.bzshbUserId">
|
|
|
+ <select class="form-control judgment layui-input" id="bzshbUserId" 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>
|
|
|
@@ -864,7 +871,7 @@
|
|
|
<label class="layui-form-label"><span class="require-item">*</span>专业咨询员：</label>
|
|
|
<div class="layui-input-block with-icon">
|
|
|
<sys:inquireselectUser id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
|
|
|
- cssStyle="background-color:#fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
|
|
|
+ cssStyle="background-color:#fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="layui-item layui-col-sm12 lw7">
|
|
|
@@ -872,7 +879,7 @@
|
|
|
<div class="layui-input-block">
|
|
|
<div class="layui-item layui-col-sm6 lw7 with-textarea">
|
|
|
<div class="layui-input-block" style="margin-left:0px;position: relative">
|
|
|
- <form:textarea placeholder="请输入审批意见：" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
|
|
|
+ <form:textarea placeholder="请输入审批意见：" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control judgment" rows="4" cssStyle="height: 200px;" maxlength="255" />
|
|
|
<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
|
|
|
<input type="file" name="upload_files" style="display: none;">
|
|
|
</div>
|
|
|
@@ -890,14 +897,14 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
-<%-- <form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control required"/>--%>
|
|
|
+<%-- <form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control judgment"/>--%>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="layui-item layui-col-sm6 lw7" style="margin-top: 20px;">
|
|
|
<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
|
|
|
<div class="layui-input-block with-icon">
|
|
|
<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${projectRecords.projectMasterId}" labelName="projectReportData.principal.name" labelValue="${projectRecords.projectMasterName}"
|
|
|
- cssStyle="background-color:#fff" title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
|
|
|
+ cssStyle="background-color:#fff" title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="layui-item layui-col-sm12 lw7 with-textarea">
|
|
|
@@ -905,7 +912,7 @@
|
|
|
<div class="layui-input-block">
|
|
|
<div class="layui-item layui-col-sm6 lw7 with-textarea">
|
|
|
<div class="layui-input-block" style="margin-left:0px;position: relative">
|
|
|
- <form:textarea placeholder="请输入审批意见：" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
|
|
|
+ <form:textarea placeholder="请输入审批意见：" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control judgment" rows="4" cssStyle="height: 200px;" maxlength="255" />
|
|
|
<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
|
|
|
<input type="file" name="upload_files" style="display: none;">
|
|
|
</div>
|
|
|
@@ -923,7 +930,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
-<%-- <form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control required"/>--%>
|
|
|
+<%-- <form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control judgment"/>--%>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1065,7 +1072,7 @@
|
|
|
<td style="display:none">${fileAttachment.fileFlag}</td>
|
|
|
</tr>
|
|
|
<c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
|
|
|
- <tr class="file_attachment_tr">
|
|
|
+ <tr class="file_attachment_${fileAttachment.id}_tr">
|
|
|
<td></td>
|
|
|
<c:choose>
|
|
|
<c:when test="${projectcontentinfo.uploadMode == 2}">
|
|
|
@@ -1208,7 +1215,7 @@
|
|
|
<td style="display:none">${fileGistdata.fileFlag}</td>
|
|
|
</tr>
|
|
|
<c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
|
|
|
- <tr class="file_gistdata_tr">
|
|
|
+ <tr class="file_gistdata_${fileGistdata.id}_tr">
|
|
|
<td></td>
|
|
|
<c:choose>
|
|
|
<c:when test="${projectcontentinfo.uploadMode == 2}">
|
|
|
@@ -1349,7 +1356,7 @@
|
|
|
<td style="display:none">${fileOther.fileFlag}</td>
|
|
|
</tr>
|
|
|
<c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
|
|
|
- <tr class="file_other_tr">
|
|
|
+ <tr class="file_other_${fileOther.id}_tr">
|
|
|
<td></td>
|
|
|
<c:choose>
|
|
|
<c:when test="${projectcontentinfo.uploadMode == 2}">
|
|
|
@@ -1467,7 +1474,7 @@
|
|
|
layui.form.on('select(zixunOpinion)', function(data){
|
|
|
var span=data.value;
|
|
|
if(span!=""){
|
|
|
- var opinion=$("#zixunOpinion").val()+span+";"
|
|
|
+ var opinion=$("#zixunOpinion").val()+span
|
|
|
$("#zixunOpinion").val(opinion);
|
|
|
}
|
|
|
});
|
|
|
@@ -1475,14 +1482,14 @@
|
|
|
var span=data.value;
|
|
|
if(span!=""){
|
|
|
$(this).attr("checked",false)
|
|
|
- var opinion=$("#zixunOpinion").val()+span+";"
|
|
|
+ var opinion=$("#zixunOpinion").val()+span
|
|
|
$("#zixunOpinion").val(opinion);
|
|
|
}
|
|
|
});
|
|
|
layui.form.on('select(fuzerenOpinion)', function(data){
|
|
|
var span=data.value;
|
|
|
if(span!=""){
|
|
|
- var opinion=$("#fuzerenOpinion").val()+span+";"
|
|
|
+ var opinion=$("#fuzerenOpinion").val()+span
|
|
|
$("#fuzerenOpinion").val(opinion);
|
|
|
}
|
|
|
});
|
|
|
@@ -1490,7 +1497,7 @@
|
|
|
var span=data.value;
|
|
|
if(span!=""){
|
|
|
$(this).attr("checked",false)
|
|
|
- var opinion=$("#fuzerenOpinion").val()+span+";"
|
|
|
+ var opinion=$("#fuzerenOpinion").val()+span
|
|
|
$("#fuzerenOpinion").val(opinion);
|
|
|
}
|
|
|
});
|
user5