|
@@ -6,6 +6,8 @@
|
|
<meta name="decorator" content="default"/>
|
|
<meta name="decorator" content="default"/>
|
|
<script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
|
|
<script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
|
|
<script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
|
|
<script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
|
|
|
|
+ <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
|
|
|
|
+ <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
|
|
<link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
|
|
<link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
|
|
<style>
|
|
<style>
|
|
#projectDesc-error{
|
|
#projectDesc-error{
|
|
@@ -75,6 +77,47 @@
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
$(document).ready(function() {
|
|
$(document).ready(function() {
|
|
|
|
+ var id;
|
|
|
|
+ var name;
|
|
|
|
+ var cname;
|
|
|
|
+ var cprice;
|
|
|
|
+ var ccname;
|
|
|
|
+ var cptype;
|
|
|
|
+ if ($("#contractIdId").val()!=null || $("#contractIdId").val()!=''){
|
|
|
|
+ id=$("#contractIdId").val();
|
|
|
|
+ name=$("#contractIdName").val();
|
|
|
|
+ cname=$("#contractName").val();
|
|
|
|
+ cprice=$("#contractPrice").val();
|
|
|
|
+ ccname=$("#contractClientName").val();
|
|
|
|
+ cptype=$("#constructionProjectType").val();
|
|
|
|
+ }
|
|
|
|
+ layui.use(['form', 'layer'], function () {
|
|
|
|
+ var form = layui.form;
|
|
|
|
+ //有无合同监听器
|
|
|
|
+ layui.form.on('radio(ext)', function(data){
|
|
|
|
+ var span=data.value;
|
|
|
|
+ if(span==0){
|
|
|
|
+ $("#contractIdId").val(id);
|
|
|
|
+ $("#contractIdName").val(name);
|
|
|
|
+ $("#contractName").val(cname);
|
|
|
|
+ $("#contractPrice").val(cprice);
|
|
|
|
+ $("#contractClientName").val(ccname);
|
|
|
|
+ $("#constructionProjectType").val(cptype);
|
|
|
|
+ $("#divv").show();
|
|
|
|
+ $("#divv3").show();
|
|
|
|
+ }else{
|
|
|
|
+ var h=$("#d1").html();
|
|
|
|
+ $("#contractIdId").val("");
|
|
|
|
+ $("#contractIdName").val("");
|
|
|
|
+ $("#contractName").val("");
|
|
|
|
+ $("#contractPrice").val("");
|
|
|
|
+ $("#contractClientName").val("");
|
|
|
|
+ $("#constructionProjectType").val("");
|
|
|
|
+ $("#divv").hide();
|
|
|
|
+ $("#divv3").hide();
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ });
|
|
var radioVal ;
|
|
var radioVal ;
|
|
validateForm = $("#inputForm").validate({
|
|
validateForm = $("#inputForm").validate({
|
|
submitHandler: function(form){
|
|
submitHandler: function(form){
|
|
@@ -130,14 +173,7 @@
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
- //自动选择合同状态
|
|
|
|
- if ($("#projectName").val() != "") {
|
|
|
|
- if ($("#contractName").val() == "") {
|
|
|
|
- $("#ext1").iCheck("check");
|
|
|
|
- }else{
|
|
|
|
- $("#ext").iCheck("check");
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
$('#areaId').on("change", function () {
|
|
$('#areaId').on("change", function () {
|
|
@@ -199,7 +235,18 @@
|
|
type : 'date'
|
|
type : 'date'
|
|
, trigger: 'click'
|
|
, trigger: 'click'
|
|
});
|
|
});
|
|
-
|
|
|
|
|
|
+ //自动选择合同状态
|
|
|
|
+ if ($("#projectName").val() != "") {
|
|
|
|
+ if ($("#contractName").val() == "") {
|
|
|
|
+ $("#ext1").attr("checked",true);
|
|
|
|
+ $("#divv").hide();
|
|
|
|
+ $("#divv3").hide();
|
|
|
|
+ }else{
|
|
|
|
+ $("#ext").attr("checked",true);
|
|
|
|
+ $("#divv").show();
|
|
|
|
+ $("#divv3").show();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
});
|
|
});
|
|
|
|
|
|
|
|
|
|
@@ -648,13 +695,14 @@
|
|
$("#buildingPercent").val("");
|
|
$("#buildingPercent").val("");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
</script>
|
|
</script>
|
|
</head>
|
|
</head>
|
|
<body>
|
|
<body>
|
|
<div class="single-form">
|
|
<div class="single-form">
|
|
<div class="container">
|
|
<div class="container">
|
|
<sys:message content="${message}"/>
|
|
<sys:message content="${message}"/>
|
|
- <form:form id="inputForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectRecords/save" method="post" class="form-horizontal">
|
|
|
|
|
|
+ <form:form id="inputForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectRecords/save" method="post" class="layui-form">
|
|
<form:hidden path="id"/>
|
|
<form:hidden path="id"/>
|
|
<form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
|
|
<form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
|
|
<input type="hidden" id="flagFile" value="">
|
|
<input type="hidden" id="flagFile" value="">
|
|
@@ -666,10 +714,10 @@
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<label class="layui-form-label">合同情况:</label>
|
|
<label class="layui-form-label">合同情况:</label>
|
|
<div class="layui-input-block">
|
|
<div class="layui-input-block">
|
|
- <input type="radio" class="i-checks" name="ext" <c:if test="${ruralProjectRecords.id==null }">checked</c:if> id="ext" value="0">
|
|
|
|
- <label for="ext">有合同</label>
|
|
|
|
- <input type="radio" class="i-checks" name="ext" <c:if test="${ruralProjectRecords.id!=null and ruralProjectRecords.workContractInfo==null }">checked</c:if> id="ext1" value="1">
|
|
|
|
- <label for="ext1">无合同</label>
|
|
|
|
|
|
+ <input type="radio" title="有合同" lay-filter="ext" name="ext" checked id="ext" value="0">
|
|
|
|
+<%-- <label for="ext">有合同</label>--%>
|
|
|
|
+ <input type="radio" title="无合同" lay-filter="ext" name="ext" id="ext1" value="1">
|
|
|
|
+<%-- <label for="ext1">无合同</label>--%>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -679,7 +727,7 @@
|
|
<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 with-icon">
|
|
<div class="layui-input-block with-icon">
|
|
<sys:gridselectContract url="${ctx}/ruralProject/ruralCostProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id" value="${ruralProjectRecords.workContractInfo.id}" title="选择合同" labelName="workContractInfo.name"
|
|
<sys:gridselectContract url="${ctx}/ruralProject/ruralCostProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id" value="${ruralProjectRecords.workContractInfo.id}" title="选择合同" labelName="workContractInfo.name"
|
|
- labelValue="${ruralProjectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
|
|
|
|
|
|
+ cssStyle="background-color: #fff" labelValue="${ruralProjectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
@@ -691,7 +739,7 @@
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<label class="layui-form-label double-line">合同金额(元):</label>
|
|
<label class="layui-form-label double-line">合同金额(元):</label>
|
|
<div class="layui-input-block">
|
|
<div class="layui-input-block">
|
|
- <input htmlEscape="false" readonly="true" id="contractPrice" class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.contractPrice}" onchange="formatNum(this);"/>
|
|
|
|
|
|
+ <input htmlEscape="false" readonly="true" id="contractPrice" class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.contractPrice}" onchange="formatNum(this);"/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
@@ -713,7 +761,7 @@
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<label class="layui-form-label">工程分类:</label>
|
|
<label class="layui-form-label">工程分类:</label>
|
|
<div class="layui-input-block">
|
|
<div class="layui-input-block">
|
|
- <input htmlEscape="false" readonly="true" id="constructionProjectType" class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.constructionProjectTypeStr}"/>
|
|
|
|
|
|
+ <input htmlEscape="false" readonly="true" id="constructionProjectType" class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.constructionProjectTypeStr}"/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -725,14 +773,14 @@
|
|
<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">
|
|
- <form:input path="projectName" htmlEscape="false" class="form-control layui-input required"/>
|
|
|
|
|
|
+ <form:input path="projectName" htmlEscape="false" placeholder="请输入项目名称" class="form-control layui-input required"/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<label class="layui-form-label">项目编号:</label>
|
|
<label class="layui-form-label">项目编号:</label>
|
|
<div class="layui-input-block">
|
|
<div class="layui-input-block">
|
|
<div class="input-group">
|
|
<div class="input-group">
|
|
- <form:input path="projectId" htmlEscape="false" readonly="true" class="form-control layui-input"/>
|
|
|
|
|
|
+ <form:input path="projectId" htmlEscape="false" readonly="true" class="form-control layui-input"/>
|
|
<%--<span class="input-group-btn">
|
|
<%--<span class="input-group-btn">
|
|
<label class="form-status"><c:choose><c:when test="${not empty ruralProjectRecords.projectStatus}">${fns:getDictLabel(ruralProjectRecords.projectStatus, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
|
|
<label class="form-status"><c:choose><c:when test="${not empty ruralProjectRecords.projectStatus}">${fns:getDictLabel(ruralProjectRecords.projectStatus, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
|
|
</span>--%>
|
|
</span>--%>
|
|
@@ -767,13 +815,13 @@
|
|
<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 with-icon">
|
|
<div class="layui-input-block with-icon">
|
|
<sys:treeselect id="area" name="area.id" value="${ruralProjectRecords.area.id}" labelName="area.name" labelValue="${ruralProjectRecords.area.name}"
|
|
<sys:treeselect id="area" name="area.id" value="${ruralProjectRecords.area.id}" labelName="area.name" labelValue="${ruralProjectRecords.area.name}"
|
|
- title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
|
|
|
|
|
|
+ cssStyle="background-color: #fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<label class="layui-form-label">所在省份:</label>
|
|
<label class="layui-form-label">所在省份:</label>
|
|
<div class="layui-input-block">
|
|
<div class="layui-input-block">
|
|
- <form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
|
|
|
|
|
|
+ <form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
@@ -791,7 +839,7 @@
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<label class="layui-form-label">建设地点:</label>
|
|
<label class="layui-form-label">建设地点:</label>
|
|
<div class="layui-input-block">
|
|
<div class="layui-input-block">
|
|
- <form:input path="projectSite" htmlEscape="false" class="form-control layui-input"/>
|
|
|
|
|
|
+ <form:input path="projectSite" placeholder="请输入建设地点" htmlEscape="false" class="form-control layui-input"/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
@@ -805,7 +853,7 @@
|
|
<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 with-icon">
|
|
<div class="layui-input-block with-icon">
|
|
<sys:treeselect id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
|
|
<sys:treeselect id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
|
|
- 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 required layui-input" allowClear="true" notAllowSelectParent="true"/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
@@ -817,13 +865,13 @@
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<label class="layui-form-label double-line">工作开始日期:</label>
|
|
<label class="layui-form-label double-line">工作开始日期:</label>
|
|
<div class="layui-input-block">
|
|
<div class="layui-input-block">
|
|
- <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
|
|
|
|
|
|
+ <input class="laydate-icondate form-control layui-input layer-date laydate-icon" style="background-color: #fff" readonly="readonly" id="startDate" name="startDate" placeholder="请选择开始日期" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<label class="layui-form-label double-line">工作结束日期:</label>
|
|
<label class="layui-form-label double-line">工作结束日期:</label>
|
|
<div class="layui-input-block">
|
|
<div class="layui-input-block">
|
|
- <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
|
|
|
|
|
|
+ <input class="laydate-icondate form-control layui-input layer-date laydate-icon" style="background-color: #fff" readonly="readonly" id="endingDate" name="endingDate" placeholder="请选择结束日期" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
<div class="layui-item layui-col-sm6 lw7">
|
|
@@ -835,7 +883,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">
|
|
- <form:select path="attachmentProjectSort" class="form-control required editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
|
|
|
|
|
|
+ <form:select placeholder="请选择" path="attachmentProjectSort" class="form-control required editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
|
|
<form:option value=""/>
|
|
<form:option value=""/>
|
|
<form:options items="${fns:getMainDictList('attachment_project_sort_cost')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
|
|
<form:options items="${fns:getMainDictList('attachment_project_sort_cost')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
|
|
</form:select>
|
|
</form:select>
|
|
@@ -955,13 +1003,13 @@
|
|
<div class="layui-item layui-col-sm6 lw7 with-textarea">
|
|
<div class="layui-item layui-col-sm6 lw7 with-textarea">
|
|
<label class="layui-form-label">工程概况:</label>
|
|
<label class="layui-form-label">工程概况:</label>
|
|
<div class="layui-input-block">
|
|
<div class="layui-input-block">
|
|
- <form:textarea path="projectDesc" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
|
|
|
|
|
|
+ <form:textarea placeholder="请输入工程概况" path="projectDesc" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="layui-item layui-col-sm6 lw7 with-textarea">
|
|
<div class="layui-item layui-col-sm6 lw7 with-textarea">
|
|
<label class="layui-form-label ">备注:</label>
|
|
<label class="layui-form-label ">备注:</label>
|
|
<div class="layui-input-block">
|
|
<div class="layui-input-block">
|
|
- <form:textarea path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
|
|
|
|
|
|
+ <form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|