|
|
@@ -284,11 +284,11 @@
|
|
|
});
|
|
|
|
|
|
}
|
|
|
- function openDialogForm(title,url,width,height,target){
|
|
|
- if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
|
|
|
- width='auto';
|
|
|
- height='auto';
|
|
|
- }else{//如果是PC端，根据用户设置的width和height显示。
|
|
|
+ function openDialogForm(title,url,width,height,target) {
|
|
|
+ if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
|
|
|
+ width = 'auto';
|
|
|
+ height = 'auto';
|
|
|
+ } else {//如果是PC端，根据用户设置的width和height显示。
|
|
|
|
|
|
}
|
|
|
top.layer.open({
|
|
|
@@ -296,12 +296,13 @@
|
|
|
area: [width, height],
|
|
|
title: title,
|
|
|
maxmin: false, //开启最大化最小化按钮
|
|
|
- content: url ,
|
|
|
- skin:"one-btns",
|
|
|
+ content: url,
|
|
|
+ skin: "one-btns",
|
|
|
btn: ['关闭'],
|
|
|
- cancel: function(index){
|
|
|
+ cancel: function (index) {
|
|
|
}
|
|
|
});
|
|
|
+ }
|
|
|
</script>
|
|
|
<style>
|
|
|
body{
|
|
|
@@ -325,6 +326,12 @@
|
|
|
<input id="toflag" name="toflag" type="hidden" value="1"/>
|
|
|
<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
|
|
|
<div class="commonQuery lw6">
|
|
|
+ <div class="layui-item query athird">
|
|
|
+ <label class="layui-form-label">负责地区：</label>
|
|
|
+ <div class="layui-input-block with-icon">
|
|
|
+ <form:input path="territory" htmlEscape="false" maxlength="64" class=" form-control layui-input"/>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<div class="layui-item athird">
|
|
|
<label class="layui-form-label">申请人：</label>
|
|
|
<div class="layui-input-block with-icon">
|
|
|
@@ -332,13 +339,6 @@
|
|
|
title="登记人" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="layui-item query athird">
|
|
|
- <label class="layui-form-label">申请部门：</label>
|
|
|
- <div class="layui-input-block with-icon">
|
|
|
- <sys:treeselectMoHu id="officeId" name="office.id" value="${districtDirectorApplication.office.id}" labelName="office.name" labelValue="${districtDirectorApplication.office.name}"
|
|
|
- title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
<div class="layui-item athird">
|
|
|
<div class="input-group">
|
|
|
<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
|
|
|
@@ -352,7 +352,14 @@
|
|
|
</div>
|
|
|
<div id="moresees" style="clear:both;display:none;" class="lw6">
|
|
|
<div class="layui-item query athird">
|
|
|
- <label class="layui-form-label">负责地区：</label>
|
|
|
+ <label class="layui-form-label">申请部门：</label>
|
|
|
+ <div class="layui-input-block with-icon">
|
|
|
+ <sys:treeselectMoHu id="officeId" name="office.id" value="${districtDirectorApplication.office.id}" labelName="office.name" labelValue="${districtDirectorApplication.office.name}"
|
|
|
+ title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="layui-item query athird">
|
|
|
+ <label class="layui-form-label">关联区域：</label>
|
|
|
<div class="layui-input-block with-icon">
|
|
|
<sys:treeselectStaffArea id="area" name="area.id" value="${districtDirectorApplication.area.id}" labelName="area.name"
|
|
|
labelValue="${districtDirectorApplication.area.name}"
|
|
|
@@ -417,7 +424,7 @@
|
|
|
{field:'index',align:'center', title: '序号',width:80}
|
|
|
/*,{field:'number',align:'center', title: '申请编号', width:160}*/
|
|
|
,{field:'territory',align:'center', title: '负责地区', minwidth:100,templet:function(d){
|
|
|
- return "<a class=\"attention-info\" title=\"" + d.territory + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看地区申请', '${ctx}/districtDirectorApplication/districtDirectorApplication/lookForm?id=" + d.id +"','95%', '95%')\">" + d.territory + "</a>";
|
|
|
+ return "<a class=\"attention-info\" title=\"" + d.territory + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看地区申请', '${ctx}/districtDirectorApplication/districtDirectorApplication/lookForm?id=" + d.id +"','"+ d.id +"','95%', '95%')\">" + d.territory + "</a>";
|
|
|
}}
|
|
|
,{field:'createName', align:'center',title: '申请人', minwidth:100,templet:function(d){
|
|
|
return "<span title=\"" + d.createName + "\">" + d.createName + "</span>";
|
|
|
@@ -459,7 +466,7 @@
|
|
|
,"territory":"${districtDirectorApplication.territory}"
|
|
|
,"areaDirector":"${districtDirectorApplication.areaDirector}"
|
|
|
,"createName":"<c:out value="${districtDirectorApplication.createBy.name}" escapeXml="false"/>"
|
|
|
- ,"candel": <c:choose><c:when test="${(districtDirectorApplication.status == 1 or districtDirectorApplication.status == 3 or districtDirectorApplication.status == 4)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
|
|
|
+ ,"candel": <c:choose><c:when test="${(districtDirectorApplication.status == 5)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
|
|
|
}
|
|
|
</c:forEach>
|
|
|
</c:if>
|
sangwenwei