Merge branch 'master' of http://git.helou.vip:8088/ly/ypc_manager
commit
7740e93ffe
|
|
@ -77,6 +77,6 @@ public interface TbStuckMapper
|
||||||
|
|
||||||
List<TbStuck> selectTbStuckByDept2(String deptId);
|
List<TbStuck> selectTbStuckByDept2(String deptId);
|
||||||
|
|
||||||
Long selectCount(String deptId);
|
Long selectCount(TbStuck stuck);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -59,4 +59,6 @@ public interface TbXjxdzhxxbMapper
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int deleteTbXjxdzhxxbByIds(String[] Ids);
|
public int deleteTbXjxdzhxxbByIds(String[] Ids);
|
||||||
|
|
||||||
|
public TbXjxdzhxxb selectCountBySj(TbXjxdzhxxb xjxdzhxxb);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectTbMdjfjxxxbList" parameterType="basepro.manager.pojo.TbMdjfjxxxb" resultMap="TbMdjfjxxxbResult">
|
<select id="selectTbMdjfjxxxbList" parameterType="basepro.manager.pojo.TbMdjfjxxxb" resultMap="TbMdjfjxxxbResult">
|
||||||
<include refid="selectTbMdjfjxxxbVo"/>
|
select * from ( select MDJFBH, FSSJ, XZQHDM, XZQHMC, FSDZ, MDJFLY, TBDWMC, MDJFLX, MDJFJS, MDJFCD, DSR_SFZHM, DJR_SFZHM, DJSJ,
|
||||||
<where>
|
ZRDWDM, ZRDWMC, TCSJ, TCGCJS, TCJG, JLGXSJ,s.dept_id from tb_mdjfjxxxb b left join sys_dept s on b.ZRDWDM = s.dept_id ) d
|
||||||
|
<where>
|
||||||
|
1=1 ${params.dataScope}
|
||||||
<if test="fssj != null "> and FSSJ = #{fssj}</if>
|
<if test="fssj != null "> and FSSJ = #{fssj}</if>
|
||||||
<if test="xzqhdm != null and xzqhdm != ''"> and XZQHDM = #{xzqhdm}</if>
|
<if test="xzqhdm != null and xzqhdm != ''"> and XZQHDM = #{xzqhdm}</if>
|
||||||
<if test="xzqhmc != null and xzqhmc != ''"> and XZQHMC = #{xzqhmc}</if>
|
<if test="xzqhmc != null and xzqhmc != ''"> and XZQHMC = #{xzqhmc}</if>
|
||||||
|
|
@ -45,7 +47,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="dsrSfzhm != null and dsrSfzhm != ''"> and DSR_SFZHM = #{dsrSfzhm}</if>
|
<if test="dsrSfzhm != null and dsrSfzhm != ''"> and DSR_SFZHM = #{dsrSfzhm}</if>
|
||||||
<if test="djrSfzhm != null and djrSfzhm != ''"> and DJR_SFZHM = #{djrSfzhm}</if>
|
<if test="djrSfzhm != null and djrSfzhm != ''"> and DJR_SFZHM = #{djrSfzhm}</if>
|
||||||
<if test="djsj != null "> and DJSJ = #{djsj}</if>
|
<if test="djsj != null "> and DJSJ = #{djsj}</if>
|
||||||
<if test="zrdwdm != null and zrdwdm != ''"> and ZRDWDM = #{zrdwdm}</if>
|
<if test="params.beginDjsj != null and params.beginDjsj != ''"><!-- 开始时间检索 -->
|
||||||
|
and date_format(DJSJ,'%y%m%d') >= date_format(#{params.beginDjsj},'%y%m%d')
|
||||||
|
</if>
|
||||||
|
<if test="params.endDjsj != null and params.endDjsj != ''"><!-- 结束时间检索 -->
|
||||||
|
and date_format(DJSJ,'%y%m%d') <= date_format(#{params.endDjsj},'%y%m%d')
|
||||||
|
</if>
|
||||||
|
<if test="zrdwdm != null and zrdwdm != ''">
|
||||||
|
and (d.ZRDWDM = #{zrdwdm} OR d.ZRDWDM IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{zrdwdm},ancestors) ))
|
||||||
|
</if>
|
||||||
<if test="zrdwmc != null and zrdwmc != ''"> and ZRDWMC = #{zrdwmc}</if>
|
<if test="zrdwmc != null and zrdwmc != ''"> and ZRDWMC = #{zrdwmc}</if>
|
||||||
<if test="params.beginTCSJ != null and params.beginTCSJ != ''"><!-- 开始时间检索 -->
|
<if test="params.beginTCSJ != null and params.beginTCSJ != ''"><!-- 开始时间检索 -->
|
||||||
AND date_format(TCSJ,'%y%m%d') >= date_format(#{params.beginTCSJ},'%y%m%d')
|
AND date_format(TCSJ,'%y%m%d') >= date_format(#{params.beginTCSJ},'%y%m%d')
|
||||||
|
|
|
||||||
|
|
@ -52,12 +52,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectCount" parameterType="String" resultType="Long">
|
<select id="selectCount" parameterType="basepro.manager.pojo.TbStuck" resultType="Long">
|
||||||
select count(id) from tb_stuck
|
select count(id) from tb_stuck
|
||||||
<where>
|
<where>
|
||||||
<if test="deptId != null and deptId != ''">
|
<if test="deptId != null and deptId != ''">
|
||||||
AND (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) ))
|
AND (dept_id = #{deptId} OR dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) ))
|
||||||
</if>
|
</if>
|
||||||
|
<if test="type != null and type != ''"> and type = #{type}</if>
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,11 +70,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
and (d.GAJGDM = #{GAJGDM} OR d.GAJGDM IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{GAJGDM},ancestors) ))
|
and (d.GAJGDM = #{GAJGDM} OR d.GAJGDM IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{GAJGDM},ancestors) ))
|
||||||
</if>
|
</if>
|
||||||
<if test="GAJGMC != null and GAJGMC != ''"> and GAJGMC = #{GAJGMC}</if>
|
<if test="GAJGMC != null and GAJGMC != ''"> and GAJGMC = #{GAJGMC}</if>
|
||||||
|
<if test="ZAFKRQ != null "> and ZAFKRQ = #{ZAFKRQ}</if>
|
||||||
<if test="params.beginZAFKRQ != null and params.beginZAFKRQ != ''"><!-- 开始时间检索 -->
|
<if test="params.beginZAFKRQ != null and params.beginZAFKRQ != ''"><!-- 开始时间检索 -->
|
||||||
AND date_format(d.ZAFKRQ,'%y%m%d') >= date_format(#{params.beginZAFKRQ},'%y%m%d')
|
and date_format(ZAFKRQ,'%y%m%d') >= date_format(#{params.beginZAFKRQ},'%y%m%d')
|
||||||
</if>
|
</if>
|
||||||
<if test="params.endZAFKRQ != null and params.endZAFKRQ != ''"><!-- 结束时间检索 -->
|
<if test="params.endZAFKRQ != null and params.endZAFKRQ != ''"><!-- 结束时间检索 -->
|
||||||
AND date_format(d.ZAFKRQ,'%y%m%d') <= date_format(#{params.endZAFKRQ},'%y%m%d')
|
and date_format(ZAFKRQ,'%y%m%d') <= date_format(#{params.endZAFKRQ},'%y%m%d')
|
||||||
</if>
|
</if>
|
||||||
<if test="TRXFJLSL != null "> and TRXFJLSL = #{TRXFJLSL}</if>
|
<if test="TRXFJLSL != null "> and TRXFJLSL = #{TRXFJLSL}</if>
|
||||||
<if test="TRXFCLSL != null "> and TRXFCLSL = #{TRXFCLSL}</if>
|
<if test="TRXFCLSL != null "> and TRXFCLSL = #{TRXFCLSL}</if>
|
||||||
|
|
|
||||||
|
|
@ -64,4 +64,6 @@ public interface ITbXjxdzhxxbService
|
||||||
public int deleteTbXjxdzhxxbById(Long Id);
|
public int deleteTbXjxdzhxxbById(Long Id);
|
||||||
|
|
||||||
public TbXjxdzhxxb getNumByPctj(String manageDeptId);
|
public TbXjxdzhxxb getNumByPctj(String manageDeptId);
|
||||||
|
|
||||||
|
public List<TbXjxdzhxxb> xjxdStatics(TbXjxdzhxxb xjxdzhxxb);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
package basepro.manager.service.impl;
|
package basepro.manager.service.impl;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -167,13 +168,18 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService
|
||||||
}else {
|
}else {
|
||||||
xjxd.setZAPCRYSL(0L);
|
xjxd.setZAPCRYSL(0L);
|
||||||
xjxd.setZAPCCLSL(0L);
|
xjxd.setZAPCCLSL(0L);
|
||||||
|
xjxd.setZHZTRYSL(0L);
|
||||||
|
xjxd.setQFSFRYSL(0l);
|
||||||
}
|
}
|
||||||
//检查站数量
|
//检查站数量
|
||||||
TbStuck stuck = new TbStuck();
|
TbStuck stuck = new TbStuck();
|
||||||
stuck.setDeptId(manageDeptId);
|
stuck.setDeptId(manageDeptId);
|
||||||
List<TbStuck> tbStuckList = stuckMapper.selectTbStuckList(stuck);
|
stuck.setType("1");
|
||||||
xjxd.setYXGAJCZSL(Long.valueOf(tbStuckList.size()));
|
Long gdk = stuckMapper.selectCount(stuck);
|
||||||
xjxd.setStuckList(tbStuckList);
|
stuck.setType("2");
|
||||||
|
Long lsk = stuckMapper.selectCount(stuck);
|
||||||
|
xjxd.setYXGAJCZSL(gdk);
|
||||||
|
xjxd.setSLZHKDSL(lsk);
|
||||||
SysDept dept = deptMapper.selectDeptById(manageDeptId);
|
SysDept dept = deptMapper.selectDeptById(manageDeptId);
|
||||||
if (null != dept){
|
if (null != dept){
|
||||||
xjxd.setGAJGDM(dept.getDeptId());
|
xjxd.setGAJGDM(dept.getDeptId());
|
||||||
|
|
@ -181,4 +187,20 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService
|
||||||
}
|
}
|
||||||
return xjxd;
|
return xjxd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<TbXjxdzhxxb> xjxdStatics(TbXjxdzhxxb xjxdzhxxb) {
|
||||||
|
RoadCheckStatistics checkStatistics = new RoadCheckStatistics();
|
||||||
|
checkStatistics.setDeptId("0");
|
||||||
|
List<RoadCheckStatistics> statisticsList = checkStatisticsMapper.getDept(checkStatistics);
|
||||||
|
List<TbXjxdzhxxb> xjxdzhxxbList = new ArrayList<>();
|
||||||
|
for (RoadCheckStatistics statistics : statisticsList) {
|
||||||
|
xjxdzhxxb.setGAJGDM(statistics.getDeptId());
|
||||||
|
TbXjxdzhxxb tbXjxdzhxxb = tbXjxdzhxxbMapper.selectCountBySj(xjxdzhxxb);
|
||||||
|
tbXjxdzhxxb.setGAJGDM(statistics.getDeptId());
|
||||||
|
tbXjxdzhxxb.setGAJGMC(statistics.getOrgName());
|
||||||
|
xjxdzhxxbList.add(tbXjxdzhxxb);
|
||||||
|
}
|
||||||
|
return xjxdzhxxbList;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package basepro.manager.controller;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import basepro.manager.common.annotation.DataScope;
|
||||||
import basepro.manager.common.utils.poi.ExcelUtil;
|
import basepro.manager.common.utils.poi.ExcelUtil;
|
||||||
import basepro.manager.pojo.TbMdjfjxxxb;
|
import basepro.manager.pojo.TbMdjfjxxxb;
|
||||||
import basepro.manager.service.ITbMdjfjxxxbService;
|
import basepro.manager.service.ITbMdjfjxxxbService;
|
||||||
|
|
@ -49,6 +50,7 @@ public class TbMdjfjxxxbController extends BaseController
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("system:mdjfjxxxb:list")
|
@RequiresPermissions("system:mdjfjxxxb:list")
|
||||||
@PostMapping("/list")
|
@PostMapping("/list")
|
||||||
|
@DataScope(deptAlias = "d")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public TableDataInfo list(TbMdjfjxxxb tbMdjfjxxxb)
|
public TableDataInfo list(TbMdjfjxxxb tbMdjfjxxxb)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,10 @@ public class TbXjxdzhxxbController extends BaseController
|
||||||
PageDomain pageDomain = TableSupport.buildPageRequest();
|
PageDomain pageDomain = TableSupport.buildPageRequest();
|
||||||
Integer pageNum = pageDomain.getPageNum();
|
Integer pageNum = pageDomain.getPageNum();
|
||||||
Integer pageSize = pageDomain.getPageSize();
|
Integer pageSize = pageDomain.getPageSize();
|
||||||
|
SysUser user = ShiroUtils.getSysUser();
|
||||||
|
if ("340000000000".equals(user.getManageDeptId()) || "0".equals(user.getManageDeptId())){
|
||||||
|
|
||||||
|
}
|
||||||
TableDataInfo info = tbXjxdzhxxbService.selectTbXjxdzhxxbList(tbXjxdzhxxb,pageNum,pageSize);
|
TableDataInfo info = tbXjxdzhxxbService.selectTbXjxdzhxxbList(tbXjxdzhxxb,pageNum,pageSize);
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
<body class="white-bg">
|
<body class="white-bg">
|
||||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||||
<form class="form-horizontal m" id="form-mdjfjxxxb-add">
|
<form class="form-horizontal m" id="form-mdjfjxxxb-add">
|
||||||
|
<input type="hidden" id="treeId" name="zrdwdm">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
|
@ -134,19 +135,14 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label">责任公安机关代码:</label>
|
<label class="col-sm-4 control-label">责任公安机关:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="zrdwdm" class="form-control" type="text" required>
|
<input name="zrdwmc" onclick="selectDeptTree()" id="treeName" placeholder="请选择归属部门" class="form-control" type="text" required>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
|
||||||
<label class="col-sm-4 control-label">责任公安机关名称:</label>
|
|
||||||
<div class="col-sm-8">
|
|
||||||
<input name="zrdwmc" class="form-control" type="text" required>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
@ -229,6 +225,35 @@
|
||||||
minView: 0,
|
minView: 0,
|
||||||
autoclose: true
|
autoclose: true
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function selectDeptTree() {
|
||||||
|
var treeId = $("#treeId").val();
|
||||||
|
var deptId = $.common.isEmpty(treeId) ? "340000000000" : $("#treeId").val();
|
||||||
|
var type = 4;
|
||||||
|
var url = ctx + "system/dept/selectDeptTree/" + deptId+"/"+type;
|
||||||
|
var options = {
|
||||||
|
title: '选择机构',
|
||||||
|
width: "380",
|
||||||
|
url: url,
|
||||||
|
callBack: doSubmit
|
||||||
|
};
|
||||||
|
$.modal.openOptions(options);
|
||||||
|
}
|
||||||
|
|
||||||
|
function doSubmit(index, layero){
|
||||||
|
var tree = layero.find("iframe")[0].contentWindow.$._tree;
|
||||||
|
var body = layer.getChildFrame('body', index);
|
||||||
|
var treedeptId = body.find('#treeId').val();
|
||||||
|
if (treedeptId.substr(4)=='00000000') {
|
||||||
|
$.modal.msgError("市局单位下无法建卡点");
|
||||||
|
return ;
|
||||||
|
}
|
||||||
|
$("#treeId").val(body.find('#treeId').val());
|
||||||
|
$("#treeName").val(body.find('#treeName').val());
|
||||||
|
layer.close(index);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
@ -8,6 +8,7 @@
|
||||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||||
<form class="form-horizontal m" id="form-mdjfjxxxb-edit" th:object="${tbMdjfjxxxb}">
|
<form class="form-horizontal m" id="form-mdjfjxxxb-edit" th:object="${tbMdjfjxxxb}">
|
||||||
<input name="mdjfbh" th:field="*{mdjfbh}" type="hidden">
|
<input name="mdjfbh" th:field="*{mdjfbh}" type="hidden">
|
||||||
|
<input type="hidden" id="treeId" th:field="*{zrdwdm}">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
|
@ -135,19 +136,14 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label">责任公安机关代码:</label>
|
<label class="col-sm-4 control-label">责任公安机关名称:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="zrdwdm" th:field="*{zrdwdm}" class="form-control" type="text" required>
|
<input name="zrdwmc" th:field="*{zrdwmc}" onclick="selectDeptTree()" id="treeName" class="form-control" type="text" required>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
|
||||||
<label class="col-sm-4 control-label">责任公安机关名称:</label>
|
|
||||||
<div class="col-sm-8">
|
|
||||||
<input name="zrdwmc" th:field="*{zrdwmc}" class="form-control" type="text" required>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
@ -209,29 +205,52 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$("input[name='fssj']").datetimepicker({
|
$("input[name='fssjStr']").datetimepicker({
|
||||||
format: "yyyy-mm-dd",
|
format: "yyyy-mm-dd hh:ii:ss",
|
||||||
minView: "month",
|
minView: 0,
|
||||||
autoclose: true
|
autoclose: true
|
||||||
});
|
});
|
||||||
|
|
||||||
$("input[name='djsj']").datetimepicker({
|
$("input[name='djsjStr']").datetimepicker({
|
||||||
format: "yyyy-mm-dd",
|
format: "yyyy-mm-dd hh:ii:ss",
|
||||||
minView: "month",
|
minView: 0,
|
||||||
autoclose: true
|
autoclose: true
|
||||||
});
|
});
|
||||||
|
|
||||||
$("input[name='tcsj']").datetimepicker({
|
$("input[name='tcsjStr']").datetimepicker({
|
||||||
format: "yyyy-mm-dd",
|
format: "yyyy-mm-dd hh:ii:ss",
|
||||||
minView: "month",
|
minView: 0,
|
||||||
autoclose: true
|
autoclose: true
|
||||||
});
|
});
|
||||||
|
|
||||||
$("input[name='jlgxsj']").datetimepicker({
|
$("input[name='jlgxsjStr']").datetimepicker({
|
||||||
format: "yyyy-mm-dd",
|
format: "yyyy-mm-dd hh:ii:ss",
|
||||||
minView: "month",
|
minView: 0,
|
||||||
autoclose: true
|
autoclose: true
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function selectDeptTree() {
|
||||||
|
var treeId = $("#treeId").val();
|
||||||
|
var deptId = $.common.isEmpty(treeId) ? "340000000000" : $("#treeId").val();
|
||||||
|
var type = 4;
|
||||||
|
var url = ctx + "system/dept/selectDeptTree/" + deptId+"/"+type;
|
||||||
|
var options = {
|
||||||
|
title: '选择机构',
|
||||||
|
width: "380",
|
||||||
|
url: url,
|
||||||
|
callBack: doSubmit
|
||||||
|
};
|
||||||
|
$.modal.openOptions(options);
|
||||||
|
}
|
||||||
|
|
||||||
|
function doSubmit(index, layero){
|
||||||
|
var tree = layero.find("iframe")[0].contentWindow.$._tree;
|
||||||
|
var body = layer.getChildFrame('body', index);
|
||||||
|
$("#treeId").val(body.find('#treeId').val());
|
||||||
|
$("#treeName").val(body.find('#treeName').val());
|
||||||
|
layer.close(index);
|
||||||
|
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
@ -10,24 +10,25 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-12 search-collapse">
|
<div class="col-sm-12 search-collapse">
|
||||||
<form id="formId">
|
<form id="formId">
|
||||||
|
<input type="hidden" id="treeId" name="zrdwdm">
|
||||||
<div class="select-list">
|
<div class="select-list">
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
<label>矛盾纠纷来源:</label>
|
<label>纠纷来源:</label>
|
||||||
<select name="mdjfly" th:with="type=${@dict.getType('t_dict_mdjfly')}">
|
<select name="mdjfly" th:with="type=${@dict.getType('t_dict_mdjfly')}">
|
||||||
<option value="">所有</option>
|
<option value="">所有</option>
|
||||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||||
</select>
|
</select>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<label>矛盾纠纷类型:</label>
|
<label>纠纷类型:</label>
|
||||||
<select name="mdjflx" th:with="type=${@dict.getType('t_dict_mdjflx')}">
|
<select name="mdjflx" th:with="type=${@dict.getType('t_dict_mdjflx')}">
|
||||||
<option value="">所有</option>
|
<option value="">所有</option>
|
||||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||||
</select>
|
</select>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<label>矛盾纠纷程度:</label>
|
<label>纠纷程度:</label>
|
||||||
<select name="mdjfcd" th:with="type=${@dict.getType('t_dict_mdjfcd')}" >
|
<select name="mdjfcd" th:with="type=${@dict.getType('t_dict_mdjfcd')}" >
|
||||||
<option value="">所有</option>
|
<option value="">所有</option>
|
||||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||||
|
|
@ -35,17 +36,17 @@
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<label>责任公安机关名称:</label>
|
<label>责任公安机关:</label>
|
||||||
<input type="text" name="zrdwmc"/>
|
<input type="text" name="zrdwmc" onclick="selectDeptTree()" id="treeName" placeholder="请选择机构" />
|
||||||
</li>
|
</li>
|
||||||
<li class="select-time">
|
<li class="select-time">
|
||||||
<label>矛盾纠纷调处时间:</label>
|
<label>登记时间:</label>
|
||||||
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTCSJ]"/>
|
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginDjsj]"/>
|
||||||
<span>-</span>
|
<span>-</span>
|
||||||
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTCSJ]"/>
|
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endDjsj]"/>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<label>矛盾纠纷调处结果:</label>
|
<label>纠纷调处结果:</label>
|
||||||
<select name="tcjg" th:with="type=${@dict.getType('t_dict_mdjfdcjg')}" >
|
<select name="tcjg" th:with="type=${@dict.getType('t_dict_mdjfdcjg')}" >
|
||||||
<option value="">所有</option>
|
<option value="">所有</option>
|
||||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||||
|
|
@ -54,7 +55,7 @@
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
||||||
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
|
<a class="btn btn-warning btn-rounded btn-sm" onclick="reset()"><i class="fa fa-refresh"></i> 重置</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -65,15 +66,15 @@
|
||||||
<a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="system:mdjfjxxxb:add">
|
<a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="system:mdjfjxxxb:add">
|
||||||
<i class="fa fa-plus"></i> 添加
|
<i class="fa fa-plus"></i> 添加
|
||||||
</a>
|
</a>
|
||||||
<a class="btn btn-primary single disabled" onclick="$.operate.editFull()" shiro:hasPermission="system:mdjfjxxxb:edit">
|
<!--<a class="btn btn-primary single disabled" onclick="$.operate.editFull()" shiro:hasPermission="system:mdjfjxxxb:edit">
|
||||||
<i class="fa fa-edit"></i> 修改
|
<i class="fa fa-edit"></i> 修改
|
||||||
</a>
|
</a>-->
|
||||||
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:mdjfjxxxb:remove">
|
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:mdjfjxxxb:remove">
|
||||||
<i class="fa fa-remove"></i> 删除
|
<i class="fa fa-remove"></i> 删除
|
||||||
</a>
|
</a>
|
||||||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:mdjfjxxxb:export">
|
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:mdjfjxxxb:export">
|
||||||
<i class="fa fa-download"></i> 导出
|
<i class="fa fa-download"></i> 导出
|
||||||
</a>
|
</a>-->
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-12 select-table table-striped">
|
<div class="col-sm-12 select-table table-striped">
|
||||||
<table id="bootstrap-table"></table>
|
<table id="bootstrap-table"></table>
|
||||||
|
|
@ -204,6 +205,35 @@
|
||||||
};
|
};
|
||||||
$.table.init(options);
|
$.table.init(options);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function reset() {
|
||||||
|
$("#treeId").val("");
|
||||||
|
$.form.reset()
|
||||||
|
}
|
||||||
|
|
||||||
|
function selectDeptTree() {
|
||||||
|
var treeId = $("#treeId").val();
|
||||||
|
var deptId = $.common.isEmpty(treeId) ? "340000000000" : treeId;
|
||||||
|
var type = 1;
|
||||||
|
var url = ctx + "system/dept/selectDeptTree/" + deptId+"/"+type;
|
||||||
|
var options = {
|
||||||
|
title: '选择机构',
|
||||||
|
width: "380",
|
||||||
|
height: "620",
|
||||||
|
url: url,
|
||||||
|
callBack: doSubmit
|
||||||
|
};
|
||||||
|
$.modal.openOptions(options);
|
||||||
|
}
|
||||||
|
function doSubmit(index, layero){
|
||||||
|
var tree = layero.find("iframe")[0].contentWindow.$._tree;
|
||||||
|
var body = layer.getChildFrame('body', index);
|
||||||
|
$("#treeId").val(body.find('#treeId').val());
|
||||||
|
$("#treeName").val(body.find('#treeName').val());
|
||||||
|
layer.close(index);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
@ -341,7 +341,7 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label">设立临时治安卡点数量:</label>
|
<label class="col-sm-4 control-label">设立临时治安卡点数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="SLZHKDSL" class="form-control" type="number" value="0" required>
|
<input name="SLZHKDSL" class="form-control" type="number" value="0" th:value="*{xjxd.SLZHKDSL}" required>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-12 search-collapse">
|
<div class="col-sm-12 search-collapse">
|
||||||
<form id="formId">
|
<form id="formId">
|
||||||
|
<input type="hidden" id="treeId" name="GAJGDM">
|
||||||
<div class="select-list">
|
<div class="select-list">
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
|
|
@ -18,7 +19,7 @@
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<label>公安机关名称:</label>
|
<label>公安机关名称:</label>
|
||||||
<input type="text" name="GAJGMC"/>
|
<input type="text" name="GAJGMC" onclick="selectDeptTree()" id="treeName" placeholder="请选择机构" />
|
||||||
</li>
|
</li>
|
||||||
<li class="select-time">
|
<li class="select-time">
|
||||||
<label>登记日期:</label>
|
<label>登记日期:</label>
|
||||||
|
|
@ -29,7 +30,7 @@
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
||||||
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
|
<a class="btn btn-warning btn-rounded btn-sm" onclick="reset()"><i class="fa fa-refresh"></i> 重置</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -40,15 +41,15 @@
|
||||||
<a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="system:xjxdzhxxb:add">
|
<a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="system:xjxdzhxxb:add">
|
||||||
<i class="fa fa-plus"></i> 添加
|
<i class="fa fa-plus"></i> 添加
|
||||||
</a>
|
</a>
|
||||||
<a class="btn btn-primary single disabled" onclick="$.operate.editFull()" shiro:hasPermission="system:xjxdzhxxb:edit">
|
<!--<a class="btn btn-primary single disabled" onclick="$.operate.editFull()" shiro:hasPermission="system:xjxdzhxxb:edit">
|
||||||
<i class="fa fa-edit"></i> 修改
|
<i class="fa fa-edit"></i> 修改
|
||||||
</a>
|
</a>-->
|
||||||
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:xjxdzhxxb:remove">
|
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:xjxdzhxxb:remove">
|
||||||
<i class="fa fa-remove"></i> 删除
|
<i class="fa fa-remove"></i> 删除
|
||||||
</a>
|
</a>
|
||||||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:xjxdzhxxb:export">
|
<!--<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:xjxdzhxxb:export">
|
||||||
<i class="fa fa-download"></i> 导出
|
<i class="fa fa-download"></i> 导出
|
||||||
</a>
|
</a>-->
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-12 select-table table-striped">
|
<div class="col-sm-12 select-table table-striped">
|
||||||
<table id="bootstrap-table"></table>
|
<table id="bootstrap-table"></table>
|
||||||
|
|
@ -260,6 +261,35 @@
|
||||||
};
|
};
|
||||||
$.table.init(options);
|
$.table.init(options);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function reset() {
|
||||||
|
$("#treeId").val("");
|
||||||
|
$.form.reset()
|
||||||
|
}
|
||||||
|
|
||||||
|
function selectDeptTree() {
|
||||||
|
var treeId = $("#treeId").val();
|
||||||
|
var deptId = $.common.isEmpty(treeId) ? "340000000000" : treeId;
|
||||||
|
var type = 1;
|
||||||
|
var url = ctx + "system/dept/selectDeptTree/" + deptId+"/"+type;
|
||||||
|
var options = {
|
||||||
|
title: '选择机构',
|
||||||
|
width: "380",
|
||||||
|
height: "620",
|
||||||
|
url: url,
|
||||||
|
callBack: doSubmit
|
||||||
|
};
|
||||||
|
$.modal.openOptions(options);
|
||||||
|
}
|
||||||
|
function doSubmit(index, layero){
|
||||||
|
var tree = layero.find("iframe")[0].contentWindow.$._tree;
|
||||||
|
var body = layer.getChildFrame('body', index);
|
||||||
|
$("#treeId").val(body.find('#treeId').val());
|
||||||
|
$("#treeName").val(body.find('#treeName').val());
|
||||||
|
layer.close(index);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
Loading…
Reference in New Issue