Commit d169b5dc by yjh

覆盖版本重提交

parent 2acf3db0
<%@ taglib prefix="from" uri="http://www.springframework.org/tags/form" %>
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
<html>
......@@ -9,9 +10,6 @@
$(document).ready(function () {
$("#inputForm").validate({
submitHandler: function (form) {
messages: {
supplementContent: {maxlength: "最多输入{0}个字符"}
}
if ($("#supplementType").val() == " "){
top.$.jBox.tip('请选择业务类型', 'warning');
}else if ($("#supplementArea").val() == " "){
......@@ -108,23 +106,24 @@
path += "标题:${report.supplementTitle}</br>";
path += "被举报公司:${report.supplementCompany}</br>";
path += "被举报部门:${report.supplementDepartment}</br>";
var supplementType = "${report.supplementType}";
if (supplementType == "1"){
supplementType = "营销";
}else if (supplementType == "2"){
supplementType = "工程";
}else if (supplementType == "3"){
supplementType = "成本";
}else if (supplementType == "4"){
supplementType = "招采";
}else if (supplementType == "5"){
supplementType = "人力";
}else if (supplementType == "6"){
supplementType = "物业";
}else if (supplementType == "7"){
supplementType = "投诉";
}
path += "业务类型:"+supplementType+"</br>";
//12:01注
<%--var supplementType = "${report.supplementType}";--%>
<%--if (supplementType == "1"){--%>
<%--supplementType = "营销";--%>
<%--}else if (supplementType == "2"){--%>
<%--supplementType = "工程";--%>
<%--}else if (supplementType == "3"){--%>
<%--supplementType = "成本";--%>
<%--}else if (supplementType == "4"){--%>
<%--supplementType = "招采";--%>
<%--}else if (supplementType == "5"){--%>
<%--supplementType = "人力";--%>
<%--}else if (supplementType == "6"){--%>
<%--supplementType = "物业";--%>
<%--}else if (supplementType == "7"){--%>
<%--supplementType = "投诉";--%>
<%--}--%>
// path += "业务类型:"+supplementType+"</br>";
var supplementArea = "${report.supplementArea}";
if (supplementArea == "North China"){
supplementArea = "华北区域公司";
......@@ -157,8 +156,16 @@
console.log(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>
<style type="text/css">
.title{
......@@ -195,138 +202,141 @@
</style>
</head>
<body>
<ul class="nav nav-tabs">
<li class="active"><a href="${ctx}/report/track">跟踪举报信息</a></li>
</ul>
<br/>
<form:form id="inputForm" modelAttribute="report" action="${ctx}/report/addTrack" method="post" class="form-horizontal">
<ul class="nav nav-tabs">
<li class="active"><a href="${ctx}/report/track">跟踪举报信息</a></li>
</ul>
<br/>
<form:form id="inputForm" modelAttribute="report" action="${ctx}/report/addTrack" method="post" class="form-horizontal">
<form:hidden path="id"/>
<sys:message content="${message}"/>
<div id="attachment1" style="display: none">
<c:if test="${supplementAttachmentList ne null}">
<c:forEach items="${reportAttachmentList}" var="reportAttachment" varStatus="vs">
&nbsp;&nbsp;<a href="${reportAttachment.attachmentPath}" class="attachmentClass" target="_blank">${reportAttachment.attachmentName}</a><br>
</c:forEach>
</c:if>
</div>
<span class="title">举报信息补充</span>
<div class="control-group">
<label class="control-label">被举报公司:</label>
<div class="controls">
<form:input path="supplementCompany" 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="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>
<form:hidden path="id"/>
<sys:message content="${message}"/>
<div id="attachment1" style="display: none">
<c:if test="${supplementAttachmentList ne null}">
<c:forEach items="${reportAttachmentList}" var="reportAttachment" varStatus="vs">
&nbsp;&nbsp;<a href="${reportAttachment.attachmentPath}" class="attachmentClass" target="_blank">${reportAttachment.attachmentName}</a><br>
</c:forEach>
</c:if>
</div>
<span class="title">举报信息补充</span>
<div class="control-group">
<label class="control-label">被举报公司:</label>
<div class="controls">
<form:input path="supplementCompany" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
<div class="control-group">
<label class="control-label">业务类型:</label>
<div class="controls">
<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>
</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 class="control-group">
<label class="control-label">被举报区域:</label>
<div class="controls">
<form:select id="supplementArea" path="supplementArea" class="input-small required">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select>
<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 class="control-group">--%>
<%--<label class="control-label">被举报项目:</label>--%>
<%--<div class="controls">--%>
<%--<form:input path="supplementProject" htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%>
</div>
<div class="control-group">
<label class="control-label">业务类型:</label>
<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>--%>
<%--</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">
<label class="control-label">附件:</label>
<div id="attachment2" class="controls">
<c:if test="${supplementAttachmentList ne null}">
<c:forEach items="${supplementAttachmentList}" var="supplementAttachment" varStatus="vs">
&nbsp;&nbsp;<a href="${supplementAttachment.attachmentPath}" class="attachmentClass" target="_blank">${supplementAttachment.attachmentName}</a><br>
</c:forEach>
</c:if>
<form:hidden id="nameFile" path="supplementAttachment" htmlEscape="false"
maxlength="255" class="input-xlarge"/>
<sys:ckfinder input="nameFile" type="files" uploadPath="/file"
selectMultiple="true" maxWidth="100" maxHeight="100"/>
</div>
</div>
<div class="control-group">
<label class="control-label">被举报区域:</label>
<div class="controls">
<form:select id="supplementArea" path="supplementArea" class="input-small required">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select>
<span class="help-inline"><font color="red">*</font> </span>
</div>
<span class="title">处理结果</span>
<div class="control-group">
<label class="control-label">处理人:</label>
<div class="controls">
<form:input path="dealPersonName" value="${currentUser}" disabled="true" 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="supplementProject" 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:textarea id="supplementContent" htmlEscape="true" path="supplementContent" rows="4" maxlength="500" class="input-xxlarge"/>
</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>
<div class="control-group">
<label class="control-label">附件:</label>
<div id="attachment2" class="controls">
<c:if test="${supplementAttachmentList ne null}">
<c:forEach items="${supplementAttachmentList}" var="supplementAttachment" varStatus="vs">
&nbsp;&nbsp;<a href="${supplementAttachment.attachmentPath}" class="attachmentClass" target="_blank">${supplementAttachment.attachmentName}</a><br>
</c:forEach>
</c:if>
<form:hidden id="nameFile" path="supplementAttachment" htmlEscape="false"
maxlength="255" class="input-xlarge"/>
<sys:ckfinder input="nameFile" type="files" uploadPath="/file"
selectMultiple="true" maxWidth="100" maxHeight="100"/>
</div>
<div class="control-group">
<label class="control-label">处理结论:</label>
<div class="controls">
<form:select path="dealResult" class="input-small required">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select>
</div>
</div>
<span class="title">处理结果</span>
<div class="control-group">
<label class="control-label">处理人:</label>
<div class="controls">
<form:input path="dealPersonName" value="${currentUser}" disabled="true" 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 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>
<span class="title">移交他人处理</span>
<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>
<div class="control-group">
<label class="control-label">处理结论:</label>
<div class="controls">
<form:select path="dealResult" class="input-small required">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select>
</div>
<div class="form-actions">
<input id="btnSubmit" class="btn btn-primary" type="submit" value="提交"/>&nbsp;
<input id="btnMail" class="btn btn-primary" type="button" value="发邮件"/>
</div>
<span class="title">移交他人处理</span>
<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>
</form:form>
<div id="fade" class="black_overlay"></div>
<div id="chooseDiv" class="white_content">
<div id="chooseContent">
</div>
<div class="form-actions">
<input id="btnSubmit" class="btn btn-primary" type="submit" value="提交"/>&nbsp;
<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">
$(document).ready(function() {
$("#btnSearch").click(function () {
......@@ -418,50 +428,50 @@
</ul>
</form:form>
<div id="userList">
<table id="contentTable" class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th>选择</th>
<th>ID</th>
<th>员工号</th>
<th>姓名</th>
<th>手机号</th>
<th>所属公司</th>
<th>所属部门</th>
<th>职位</th>
</tr>
</thead>
<tbody>
<table id="contentTable" class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th>选择</th>
<th>ID</th>
<th>员工号</th>
<th>姓名</th>
<th>手机号</th>
<th>所属公司</th>
<th>所属部门</th>
<th>职位</th>
</tr>
</thead>
<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: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>
<div class="pagination">${page}</div>
</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>
<li class="btns">
<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>
</li>
</div>
</div>
</div>
</body>
</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