diff --git a/WebRoot/Excel/13d42817-e83c-4346-9cfb-59a4f50d41e2.xlsx b/WebRoot/Excel/13d42817-e83c-4346-9cfb-59a4f50d41e2.xlsx new file mode 100644 index 00000000..6b6ca485 Binary files /dev/null and b/WebRoot/Excel/13d42817-e83c-4346-9cfb-59a4f50d41e2.xlsx differ diff --git a/WebRoot/Excel/55bd5807-e084-4c7a-9077-62ff2ce08109.xlsx b/WebRoot/Excel/55bd5807-e084-4c7a-9077-62ff2ce08109.xlsx new file mode 100644 index 00000000..1b119fdf Binary files /dev/null and b/WebRoot/Excel/55bd5807-e084-4c7a-9077-62ff2ce08109.xlsx differ diff --git a/WebRoot/Excel/57f5045a-dbd2-4aa3-a499-a9ea777fedf6.xlsx b/WebRoot/Excel/57f5045a-dbd2-4aa3-a499-a9ea777fedf6.xlsx new file mode 100644 index 00000000..6b6ca485 Binary files /dev/null and b/WebRoot/Excel/57f5045a-dbd2-4aa3-a499-a9ea777fedf6.xlsx differ diff --git a/WebRoot/Excel/798cce84-8ae3-490b-831d-f91211750731.xlsx b/WebRoot/Excel/798cce84-8ae3-490b-831d-f91211750731.xlsx new file mode 100644 index 00000000..6b6ca485 Binary files /dev/null and b/WebRoot/Excel/798cce84-8ae3-490b-831d-f91211750731.xlsx differ diff --git a/WebRoot/Excel/f6ab8158-a862-4450-b6bb-5fe30440583c.xlsx b/WebRoot/Excel/f6ab8158-a862-4450-b6bb-5fe30440583c.xlsx new file mode 100644 index 00000000..5ee602d0 Binary files /dev/null and b/WebRoot/Excel/f6ab8158-a862-4450-b6bb-5fe30440583c.xlsx differ diff --git a/WebRoot/Excel/f712a798-66e0-4b57-808e-0076b2c7d85d.xlsx b/WebRoot/Excel/f712a798-66e0-4b57-808e-0076b2c7d85d.xlsx new file mode 100644 index 00000000..660cc65e Binary files /dev/null and b/WebRoot/Excel/f712a798-66e0-4b57-808e-0076b2c7d85d.xlsx differ diff --git a/WebRoot/view/tb/org/publish.html b/WebRoot/view/tb/org/publish.html index 944f958a..491e7ef0 100644 --- a/WebRoot/view/tb/org/publish.html +++ b/WebRoot/view/tb/org/publish.html @@ -95,7 +95,7 @@
@@ -214,6 +214,7 @@ table.render({ elem: '#group-table', + id: 'groupTable', url: '/QingLong/collect/listGroup', height: 'full-130', @@ -268,6 +269,37 @@ tableReload(); }); + table.on('tool(groupTable)', function (obj) { + + if (obj.event === 'delGroup') { + layer.confirm('确定要删除吗?', { + icon: 3, + title: '提示' + }, function (index) { + $.ajax({ + url: '/QingLong/collect/delGroup', + type: 'post', + data: { group_id: obj.data.group_id }, + success: function (result) { + if (result.success) { + layer.msg("删除成功!", { + icon: 1, + time: 1000 + }, function () { + groupTableReload() + }); + } else { + layer.msg(result.message, { + icon: 2, + time: 2000 + }); + } + } + }); + }); + } + }); + function tableReload() { table.reloadData('myTable', { where: { @@ -278,13 +310,19 @@ }); } + function groupTableReload() { + table.reloadData('groupTable', { + scrollPos: false + }); + } + form.on('submit(publish)', function (data) { - var checkStatus = table.checkStatus('group-table'); + var checkStatus = table.checkStatus('groupTable'); var groupIds = checkStatus.data.map(function (item) { return item.group_id; }); - + var shiZhiSchool = 0; var shiZhiJiaoFu = 0; var quXiaoJiaoYuJu = 0; @@ -315,6 +353,8 @@ data.field["shiZhiJiaoFu"] = shiZhiJiaoFu; data.field["quXiaoJiaoYuJu"] = quXiaoJiaoYuJu; data.field["bureauIds"] = bureauIds.join(","); + data.field["groupIds"] = groupIds.join(','); + $.ajax({ url: '/QingLong/collect/publishJob',