Commit d169b5dc by yjh

覆盖版本重提交

parent 2acf3db0
<%@ taglib prefix="from" uri="http://www.springframework.org/tags/form" %>
<%@ page contentType="text/html;charset=UTF-8" %> <%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/WEB-INF/views/include/taglib.jsp" %> <%@ include file="/WEB-INF/views/include/taglib.jsp" %>
<html> <html>
...@@ -9,9 +10,6 @@ ...@@ -9,9 +10,6 @@
$(document).ready(function () { $(document).ready(function () {
$("#inputForm").validate({ $("#inputForm").validate({
submitHandler: function (form) { submitHandler: function (form) {
messages: {
supplementContent: {maxlength: "最多输入{0}个字符"}
}
if ($("#supplementType").val() == " "){ if ($("#supplementType").val() == " "){
top.$.jBox.tip('请选择业务类型', 'warning'); top.$.jBox.tip('请选择业务类型', 'warning');
}else if ($("#supplementArea").val() == " "){ }else if ($("#supplementArea").val() == " "){
...@@ -108,23 +106,24 @@ ...@@ -108,23 +106,24 @@
path += "标题:${report.supplementTitle}</br>"; path += "标题:${report.supplementTitle}</br>";
path += "被举报公司:${report.supplementCompany}</br>"; path += "被举报公司:${report.supplementCompany}</br>";
path += "被举报部门:${report.supplementDepartment}</br>"; path += "被举报部门:${report.supplementDepartment}</br>";
var supplementType = "${report.supplementType}"; //12:01注
if (supplementType == "1"){ <%--var supplementType = "${report.supplementType}";--%>
supplementType = "营销"; <%--if (supplementType == "1"){--%>
}else if (supplementType == "2"){ <%--supplementType = "营销";--%>
supplementType = "工程"; <%--}else if (supplementType == "2"){--%>
}else if (supplementType == "3"){ <%--supplementType = "工程";--%>
supplementType = "成本"; <%--}else if (supplementType == "3"){--%>
}else if (supplementType == "4"){ <%--supplementType = "成本";--%>
supplementType = "招采"; <%--}else if (supplementType == "4"){--%>
}else if (supplementType == "5"){ <%--supplementType = "招采";--%>
supplementType = "人力"; <%--}else if (supplementType == "5"){--%>
}else if (supplementType == "6"){ <%--supplementType = "人力";--%>
supplementType = "物业"; <%--}else if (supplementType == "6"){--%>
}else if (supplementType == "7"){ <%--supplementType = "物业";--%>
supplementType = "投诉"; <%--}else if (supplementType == "7"){--%>
} <%--supplementType = "投诉";--%>
path += "业务类型:"+supplementType+"</br>"; <%--}--%>
// path += "业务类型:"+supplementType+"</br>";
var supplementArea = "${report.supplementArea}"; var supplementArea = "${report.supplementArea}";
if (supplementArea == "North China"){ if (supplementArea == "North China"){
supplementArea = "华北区域公司"; supplementArea = "华北区域公司";
...@@ -157,8 +156,16 @@ ...@@ -157,8 +156,16 @@
console.log(path); console.log(path);
window.location.href = path; window.location.href = path;
}); });
var checkedNumber = "${report.supplementType}";
var number=checkedNumber.split(",");
var ck=document.getElementsByName("supplementType");
for (var i = 0; i < number.length; i++) {
ck[number[i]-1].checked=true;
}
}); });
</script> </script>
<style type="text/css"> <style type="text/css">
.title{ .title{
...@@ -195,138 +202,141 @@ ...@@ -195,138 +202,141 @@
</style> </style>
</head> </head>
<body> <body>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="${ctx}/report/track">跟踪举报信息</a></li> <li class="active"><a href="${ctx}/report/track">跟踪举报信息</a></li>
</ul> </ul>
<br/> <br/>
<form:form id="inputForm" modelAttribute="report" action="${ctx}/report/addTrack" method="post" class="form-horizontal"> <form:form id="inputForm" modelAttribute="report" action="${ctx}/report/addTrack" method="post" class="form-horizontal">
<form:hidden path="id"/> <form:hidden path="id"/>
<sys:message content="${message}"/> <sys:message content="${message}"/>
<div id="attachment1" style="display: none"> <div id="attachment1" style="display: none">
<c:if test="${supplementAttachmentList ne null}"> <c:if test="${supplementAttachmentList ne null}">
<c:forEach items="${reportAttachmentList}" var="reportAttachment" varStatus="vs"> <c:forEach items="${reportAttachmentList}" var="reportAttachment" varStatus="vs">
&nbsp;&nbsp;<a href="${reportAttachment.attachmentPath}" class="attachmentClass" target="_blank">${reportAttachment.attachmentName}</a><br> &nbsp;&nbsp;<a href="${reportAttachment.attachmentPath}" class="attachmentClass" target="_blank">${reportAttachment.attachmentName}</a><br>
</c:forEach> </c:forEach>
</c:if> </c:if>
</div> </div>
<span class="title">举报信息补充</span> <span class="title">举报信息补充</span>
<div class="control-group"> <div class="control-group">
<label class="control-label">被举报公司:</label> <label class="control-label">被举报公司:</label>
<div class="controls"> <div class="controls">
<form:input path="supplementCompany" htmlEscape="false" maxlength="200" class="input-xlarge required"/> <form:input path="supplementCompany" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<div class="control-group">
<label class="control-label">被举报部门:</label>
<div class="controls">
<form:input path="supplementDepartment" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<div class="control-group">
<label class="control-label">标题:</label>
<div class="controls">
<form:input path="supplementTitle" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div> </div>
<div class="control-group"> </div>
<label class="control-label">业务类型:</label> <div class="control-group">
<div class="controls"> <label class="control-label">被举报部门:</label>
<form:select id="supplementType" path="supplementType" class="input-small required"> <div class="controls">
<form:option value=" ">请选择</form:option> <form:input path="supplementDepartment" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
<form:options items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value" <span class="help-inline"><font color="red">*</font> </span>
htmlEscape="false"/></form:select>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div> </div>
<div class="control-group"> </div>
<label class="control-label">被举报区域:</label> <div class="control-group">
<div class="controls"> <label class="control-label">标题:</label>
<form:select id="supplementArea" path="supplementArea" class="input-small required"> <div class="controls">
<form:option value=" ">请选择</form:option> <form:input path="supplementTitle" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
<form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value" <span class="help-inline"><font color="red">*</font> </span>
htmlEscape="false"/></form:select>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div> </div>
<%--<div class="control-group">--%> </div>
<%--<label class="control-label">被举报项目:</label>--%> <div class="control-group">
<%--<div class="controls">--%> <label class="control-label">业务类型:</label>
<%--<form:input path="supplementProject" htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%> <div class="controls">
<span class="supplementType">
<form:checkboxes path="supplementType" items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"/>
</span>
<%--<form:select id="supplementType" path="supplementType" class="input-small required">--%>
<%--<form:option value=" ">请选择</form:option>--%>
<%--<form:options items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"--%>
<%--htmlEscape="false"/></form:select>--%>
<%--<span class="help-inline"><font color="red">*</font> </span>--%> <%--<span class="help-inline"><font color="red">*</font> </span>--%>
<%--</div>--%>
<%--</div>--%>
<div class="control-group">
<label class="control-label">内容:</label>
<div class="controls">
<form:textarea id="supplementContent" htmlEscape="true" path="supplementContent" rows="4" maxlength="500" class="input-xxlarge"/>
</div>
</div> </div>
<div class="control-group"> </div>
<label class="control-label">附件:</label> <div class="control-group">
<div id="attachment2" class="controls"> <label class="control-label">被举报区域:</label>
<c:if test="${supplementAttachmentList ne null}"> <div class="controls">
<c:forEach items="${supplementAttachmentList}" var="supplementAttachment" varStatus="vs"> <form:select id="supplementArea" path="supplementArea" class="input-small required">
&nbsp;&nbsp;<a href="${supplementAttachment.attachmentPath}" class="attachmentClass" target="_blank">${supplementAttachment.attachmentName}</a><br> <form:option value=" ">请选择</form:option>
</c:forEach> <form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
</c:if> htmlEscape="false"/></form:select>
<form:hidden id="nameFile" path="supplementAttachment" htmlEscape="false" <span class="help-inline"><font color="red">*</font> </span>
maxlength="255" class="input-xlarge"/>
<sys:ckfinder input="nameFile" type="files" uploadPath="/file"
selectMultiple="true" maxWidth="100" maxHeight="100"/>
</div>
</div> </div>
<span class="title">处理结果</span> </div>
<div class="control-group"> <%--<div class="control-group">--%>
<label class="control-label">处理人:</label> <%--<label class="control-label">被举报项目:</label>--%>
<div class="controls"> <%--<div class="controls">--%>
<form:input path="dealPersonName" value="${currentUser}" disabled="true" htmlEscape="false" maxlength="200" class="input-xlarge required"/> <%--<form:input path="supplementProject" htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%>
<span class="help-inline"><font color="red">*</font> </span> <%--<span class="help-inline"><font color="red">*</font> </span>--%>
</div> <%--</div>--%>
<%--</div>--%>
<div class="control-group">
<label class="control-label">内容:</label>
<div class="controls">
<form:textarea id="supplementContent" htmlEscape="true" path="supplementContent" rows="4" maxlength="500" class="input-xxlarge"/>
</div> </div>
<div class="control-group"> </div>
<label class="control-label">处理成果文件:</label> <div class="control-group">
<div id="attachment3" class="controls"> <label class="control-label">附件:</label>
<c:if test="${dealAttachmentList ne null}"> <div id="attachment2" class="controls">
<c:forEach items="${dealAttachmentList}" var="dealAttachment" varStatus="vs"> <c:if test="${supplementAttachmentList ne null}">
&nbsp;&nbsp;<a href="${dealAttachment.attachmentPath}" class="attachmentClass" target="_blank">${dealAttachment.attachmentName}</a><br> <c:forEach items="${supplementAttachmentList}" var="supplementAttachment" varStatus="vs">
</c:forEach> &nbsp;&nbsp;<a href="${supplementAttachment.attachmentPath}" class="attachmentClass" target="_blank">${supplementAttachment.attachmentName}</a><br>
</c:if> </c:forEach>
<form:hidden id="dealFile" path="dealAttachment" htmlEscape="false" </c:if>
maxlength="255" class="input-xlarge"/> <form:hidden id="nameFile" path="supplementAttachment" htmlEscape="false"
<sys:ckfinder input="dealFile" type="files" uploadPath="/file" maxlength="255" class="input-xlarge"/>
selectMultiple="true" maxWidth="100" maxHeight="100"/> <sys:ckfinder input="nameFile" type="files" uploadPath="/file"
<label id="checkFile" class="error" style="display: none;">必填信息</label> selectMultiple="true" maxWidth="100" maxHeight="100"/>
</div>
</div> </div>
<div class="control-group"> </div>
<label class="control-label">处理结论:</label> <span class="title">处理结果</span>
<div class="controls"> <div class="control-group">
<form:select path="dealResult" class="input-small required"> <label class="control-label">处理人:</label>
<form:option value=" ">请选择</form:option> <div class="controls">
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value" <form:input path="dealPersonName" value="${currentUser}" disabled="true" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
htmlEscape="false"/></form:select> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div>
<div class="control-group">
<label class="control-label">处理成果文件:</label>
<div id="attachment3" class="controls">
<c:if test="${dealAttachmentList ne null}">
<c:forEach items="${dealAttachmentList}" var="dealAttachment" varStatus="vs">
&nbsp;&nbsp;<a href="${dealAttachment.attachmentPath}" class="attachmentClass" target="_blank">${dealAttachment.attachmentName}</a><br>
</c:forEach>
</c:if>
<form:hidden id="dealFile" path="dealAttachment" htmlEscape="false"
maxlength="255" class="input-xlarge"/>
<sys:ckfinder input="dealFile" type="files" uploadPath="/file"
selectMultiple="true" maxWidth="100" maxHeight="100"/>
<label id="checkFile" class="error" style="display: none;">必填信息</label>
</div> </div>
<span class="title">移交他人处理</span> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label">移交:</label> <label class="control-label">处理结论:</label>
<div class="controls"> <div class="controls">
<input type="text" id="userId" name="exchangeAfterUser" value="" style="display:none;"/> <form:select path="dealResult" class="input-small required">
<input id="chooseUser" type="text" value="选择移交人员" <c:if test="${isAdmin eq false}">disabled="true"</c:if> htmlEscape="false" maxlength="200" class="input-xlarge"/> <form:option value=" ">请选择</form:option>
</div> <form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select>
</div> </div>
<div class="form-actions"> </div>
<input id="btnSubmit" class="btn btn-primary" type="submit" value="提交"/>&nbsp; <span class="title">移交他人处理</span>
<input id="btnMail" class="btn btn-primary" type="button" value="发邮件"/> <div class="control-group">
<label class="control-label">移交:</label>
<div class="controls">
<input type="text" id="userId" name="exchangeAfterUser" value="" style="display:none;"/>
<input id="chooseUser" type="text" value="选择移交人员" <c:if test="${isAdmin eq false}">disabled="true"</c:if> htmlEscape="false" maxlength="200" class="input-xlarge"/>
</div> </div>
</form:form> </div>
<div id="fade" class="black_overlay"></div> <div class="form-actions">
<div id="chooseDiv" class="white_content"> <input id="btnSubmit" class="btn btn-primary" type="submit" value="提交"/>&nbsp;
<div id="chooseContent"> <input id="btnMail" class="btn btn-primary" type="button" value="发邮件"/>
</div>
</form:form>
<div id="fade" class="black_overlay"></div>
<div id="chooseDiv" class="white_content">
<div id="chooseContent">
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("#btnSearch").click(function () { $("#btnSearch").click(function () {
...@@ -418,50 +428,50 @@ ...@@ -418,50 +428,50 @@
</ul> </ul>
</form:form> </form:form>
<div id="userList"> <div id="userList">
<table id="contentTable" class="table table-striped table-bordered table-condensed"> <table id="contentTable" class="table table-striped table-bordered table-condensed">
<thead> <thead>
<tr> <tr>
<th>选择</th> <th>选择</th>
<th>ID</th> <th>ID</th>
<th>员工号</th> <th>员工号</th>
<th>姓名</th> <th>姓名</th>
<th>手机号</th> <th>手机号</th>
<th>所属公司</th> <th>所属公司</th>
<th>所属部门</th> <th>所属部门</th>
<th>职位</th> <th>职位</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<c:if test="${page.list.size()>0}">
<c:forEach items="${page.list}" var="user" varStatus="vs">
<tr>
<td id="radioBtn"><input type="radio" value="${user.id}"></td>
<td>${vs.count}</td>
<td>${user.no}</td>
<td>${user.name}</td>
<td>${user.mobile}</td>
<td>${user.company.name}</td>
<td>${user.office.name}</td>
<td>${user.position.name}</td>
</tr>
</c:forEach>
</c:if>
</tbody>
</table>
<span id="chooseItem"></span>
<c:if test="${page.list.size()=='0'}">
<span style="color: #999999;margin: 20px 0 70px 20px;display: block;">未查询到相关内容</span>
</c:if>
<c:if test="${page.list.size()>0}"> <c:if test="${page.list.size()>0}">
<c:forEach items="${page.list}" var="user" varStatus="vs"> <div class="pagination">${page}</div>
<tr>
<td id="radioBtn"><input type="radio" value="${user.id}"></td>
<td>${vs.count}</td>
<td>${user.no}</td>
<td>${user.name}</td>
<td>${user.mobile}</td>
<td>${user.company.name}</td>
<td>${user.office.name}</td>
<td>${user.position.name}</td>
</tr>
</c:forEach>
</c:if> </c:if>
</tbody>
</table>
<span id="chooseItem"></span>
<c:if test="${page.list.size()=='0'}">
<span style="color: #999999;margin: 20px 0 70px 20px;display: block;">未查询到相关内容</span>
</c:if>
<c:if test="${page.list.size()>0}">
<div class="pagination">${page}</div>
</c:if>
</div> </div>
<li class="btns"> <li class="btns">
<label style="width:auto;"><input id="btnConfirm" class="btn btn-primary" type="button" value="确定"/>&nbsp;&nbsp; <label style="width:auto;"><input id="btnConfirm" class="btn btn-primary" type="button" value="确定"/>&nbsp;&nbsp;
<input id="btnClose" class="btn btn-primary" type="button" value="关闭"/></label> <input id="btnClose" class="btn btn-primary" type="button" value="关闭"/></label>
</li> </li>
</div>
</div> </div>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment