main
kgdxpr 2 years ago
parent b686515011
commit 8c522504c3

@ -30,7 +30,7 @@
<label class="layui-form-label" style="width: auto !important;"><span
class="require-star"></span>任务名称</label>
<div class="layui-input-block" style="margin-left: 90px !important;">
<input type="text" id="task_name" lay-verify="taskName" autocomplete="off" placeholder="请输入任务名称"
<input type="text" id="task_name" lay-verify="required|taskName" autocomplete="off" placeholder="请输入任务名称"
class="layui-input input-width">
</div>
</div>

@ -40,8 +40,9 @@
<div class="layui-input-block" style="margin-left: 134px !important;">
<div class="layui-tab layui-tab-brief">
<ul class="layui-tab-title" style="border-bottom-style:none">
<li class="layui-this">按单位类型选</li>
<li>按指定单位选</li>
<li class="layui-this">按单位类型</li>
<li>按指定单位</li>
<li>按指定分组</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@ -50,8 +51,16 @@
<input type="checkbox" id="xqjyj" lay-skin="tag" title="县区教育局">
</div>
<div class="layui-tab-item">
<div class="layui-btn-container tag" lay-filter="orgs" lay-allowclose="true"
style="border-style:dashed;border-width:1px;border-color: #CCCCCC;height: 100px;width: 630px;padding: 10px;overflow: auto;">
<div style="display: flex;align-items:flex-end">
<div class="layui-input-inline" style="width: auto;">
<div class="layui-btn-container tag" lay-filter="orgs" lay-allowclose="true"
style="border-style:dashed;border-width:1px;border-color: #CCCCCC;height: 100px;width: 545px;padding: 10px;overflow: auto;">
</div>
</div>
<div class="layui-input-inline" style="width: auto;">
<button type="button" class="layui-btn layui-btn-primary layui-btn-xs"
lay-on="saveGroup">保存到分组</button>
</div>
</div>
<div id="tableDiv" style="width: 650px;">
@ -67,7 +76,7 @@
</div>
<div class="layui-input-group" style="margin-left: -16px;">
<input type="text" id="org_name" placeholder="请输入单位名称" class="layui-input" lay-affix="clear" lay-filter="clear">
<div class="layui-input-split layui-input-suffix" style="cursor: pointer;" lay-on="confirm">
<div class="layui-input-split layui-input-suffix" style="cursor: pointer;" lay-on="confirm">
<i class="layui-icon layui-icon-search"></i>
</div>
</div>
@ -83,6 +92,14 @@
</div>
<div class="layui-tab-item">
<table id="group-table"></table>
<script type="text/html" id="group-bar">
<button type="button" class="layui-btn layui-btn-xs layui-btn-danger">
<i class="layui-icon layui-icon-delete"></i> 删除
</button>
</script>
</div>
</div>
</div>
</div>
@ -131,7 +148,7 @@
org_type_id: "-1",
org_name: $("#org_name").val()
},
height: '#tableDiv',
height: 'full-130',
page: {
limit: 5
, layout: ['count', 'prev', 'page', 'next', 'skip']
@ -194,6 +211,22 @@
}
});
table.render({
elem: '#group-table',
url: '/QingLong/collect/listGroup',
height: 'full-130',
cols: [[
{ type: 'checkbox', width: "5%" },
{ title: '序号', align: 'center', width: "5%", type: 'numbers' },
{ title: '分名称', field: 'group_name', align: 'center' },
{ title: '操作', toolbar: '#group-bar',align: 'center', width: "25%" }
]],
skin: 'line',
defaultToolbar: []
});
tag.on('delete(orgs)', function (data) {
var orgId = data.elem.prevObject.prevObject[0].getAttribute("lay-id");
bureauIds = bureauIds.filter(item => item !== orgId);
@ -205,6 +238,25 @@
util.on({
confirm: function () {
tableReload();
},
saveGroup: function () {
if (Array.isArray(bureauIds) && bureauIds.length === 0) {
layer.msg("请先选择单位!", {
icon: 2,
time: 1500
});
} else {
layer.open({
type: 2,
title: '保存分组',
shadeClose: true,
shade: 0,
area: ['600px', '200px'],
content: './save_group.html?bureau_ids=' + bureauIds.join(",")
});
}
}
});

@ -30,7 +30,7 @@
<label class="layui-form-label" style="width: auto !important;"><span
class="require-star"></span>任务名称</label>
<div class="layui-input-block" style="margin-left: 90px !important;">
<input type="text" id="task_name" lay-verify="taskName" autocomplete="off" placeholder="请输入任务名称"
<input type="text" id="task_name" lay-verify="required|taskName" autocomplete="off" placeholder="请输入任务名称"
class="layui-input input-width">
</div>
</div>

@ -0,0 +1,106 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title></title>
<link rel="stylesheet" href="../../../component/pear/css/pear.css" />
<style>
.require-star {
position: absolute;
width: 3px;
height: 14px;
background-color: #ea4335;
top: 12px;
right: 8px;
border-radius: 1.5px;
}
.input-width {
max-width: 475px
}
</style>
</head>
<body>
<form class="layui-form" action="">
<div class="mainBox">
<div class="main-container" style="margin-top: 25px;">
<div class="layui-form-item">
<label class="layui-form-label" style="width: auto !important;"><span
class="require-star"></span>分组名称</label>
<div class="layui-input-block" style="margin-left: 90px !important;">
<input type="text" id="group_name" name="group_name" lay-verify="required|groupName" autocomplete="off" placeholder="请输入分组名称"
class="layui-input input-width">
</div>
</div>
</div>
</div>
<div class="bottom">
<div class="button-container">
<button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit="" lay-filter="save">
<i class="layui-icon layui-icon-ok"></i>
提交
</button>
</div>
</div>
</form>
<script src="../../../component/layui/layui.js"></script>
<script src="../../../component/pear/pear.js"></script>
<script src="../../../component/pear/base64.js"></script>
<script>
layui.use(function () {
var form = layui.form;
var $ = layui.jquery;
var bureauIds = GetQueryString("bureau_ids");
// 自定义验证
form.verify({
groupName: [/^.{2,32}$/, '任务名称长度必须为2到32位']
});
form.on('submit(save)', function (data) {
$.ajax({
url: '/QingLong/collect/addGroup',
type: 'post',
data: {
"group_name": data.field.group_name,
"bureauIds": bureauIds
},
success: function (result) {
if (result.success) {
layer.msg("保存分组成功!", {
icon: 1,
time: 1000
}, function () {
parent.layer.close(parent.layer.getFrameIndex(window.name));
});
} else {
layer.msg(result.message, {
icon: 2,
time: 2000
});
}
}
});
return false;
});
function GetQueryString(name, istop) {
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
var r = window.location.search.substr(1).match(reg);
if (typeof (istop) != "undefined") r = top.location.search.substr(1).match(reg);
if (r != null) return unescape(r[2]);
return null;
}
});
</script>
<script>
</script>
</body>
</html>

@ -66,10 +66,7 @@
<div class="layui-card-body">
<table id="data-table"></table>
<script type="text/html" id="progress-Templet">
{{# if(d.publish_state === 1){ }}
<!-- <div class="layui-progress layui-progress-big" lay-filter="fill_progress" lay-showpercent="true" style="margin-top: 8px;cursor: pointer;" onclick='progress("{{= d.job_id }}","{{= d.total_count }}","{{= d.finish_count }}")'>
<div class="layui-progress-bar" lay-percent="{{= d.fill_progress }}"></div>
</div> -->
{{# if(d.publish_state === 1){ }}
<div class="layui-progress" lay-showpercent="true" style="margin-top: 18px;cursor: pointer;" onclick='progress("{{= d.job_id }}","{{= d.total_count }}","{{= d.finish_count }}")'>
<div class="layui-progress-bar" lay-percent="{{= d.finish_count }} / {{= d.total_count }}"></div>
</div>
@ -146,7 +143,7 @@
var $ = layui.jquery;
var common = layui.common;
var laytpl = layui.laytpl;
var element = layui.element;
var element = layui.element;
tableRender();
@ -260,7 +257,7 @@
});
}
window.postpone = function (obj) {
window.postpone = function (obj) {
layer.open({
type: 2,
title: '延长截止时间',

@ -1013,7 +1013,7 @@ public class CollectController extends Controller {
@Before({POST.class})
@IsLoginInterface({})
@EmptyInterface({"group_name", "bureauIds"})
public void addGroup(int group_name, String bureauIds) {
public void addGroup(String group_name, String bureauIds) {
//操作人员
String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
//检查当前登录人员是不是发布任务的角色
@ -1056,10 +1056,8 @@ public class CollectController extends Controller {
/**
*
*/
@Before({POST.class})
@Before({GET.class})
@IsLoginInterface({})
@IsNumericInterface({"group_id"})
@EmptyInterface({"group_name", "bureauIds"})
public void listGroup() {
//操作人员
String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");

@ -1087,7 +1087,7 @@ public class CollectModel {
* @param group_name
* @param bureauIds
*/
public int addGroup(int group_name, String bureauIds, int publish_role_id) {
public int addGroup(String group_name, String bureauIds, int publish_role_id) {
Record record = new Record();
record.set("group_name", group_name);
record.set("bureauIds", bureauIds);

Loading…
Cancel
Save