diff --git a/WebRoot/Excel/b84c1061-7fc7-4f5b-9c90-0eec90e91126.xlsx b/WebRoot/Excel/b84c1061-7fc7-4f5b-9c90-0eec90e91126.xlsx new file mode 100644 index 00000000..6e01f99d Binary files /dev/null and b/WebRoot/Excel/b84c1061-7fc7-4f5b-9c90-0eec90e91126.xlsx differ diff --git a/WebRoot/Excel/d59f15cb-d270-4ba6-8a54-43548064f5ae.xlsx b/WebRoot/Excel/d59f15cb-d270-4ba6-8a54-43548064f5ae.xlsx new file mode 100644 index 00000000..6b6ca485 Binary files /dev/null and b/WebRoot/Excel/d59f15cb-d270-4ba6-8a54-43548064f5ae.xlsx differ diff --git a/WebRoot/view/tb/org/clone_task.html b/WebRoot/view/tb/org/clone_task.html index 79e89dc1..3b63a4a5 100644 --- a/WebRoot/view/tb/org/clone_task.html +++ b/WebRoot/view/tb/org/clone_task.html @@ -30,7 +30,7 @@
-
diff --git a/WebRoot/view/tb/org/publish.html b/WebRoot/view/tb/org/publish.html index bc77d128..17d5b5b1 100644 --- a/WebRoot/view/tb/org/publish.html +++ b/WebRoot/view/tb/org/publish.html @@ -40,8 +40,9 @@
@@ -50,8 +51,16 @@
-
+
+
+
+
+
+
+ +
@@ -67,7 +76,7 @@
-
+
@@ -83,6 +92,14 @@
+
+
+ +
@@ -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(",") + + }); + + } } }); diff --git a/WebRoot/view/tb/org/rename_task.html b/WebRoot/view/tb/org/rename_task.html index 9b48f827..824aa2ac 100644 --- a/WebRoot/view/tb/org/rename_task.html +++ b/WebRoot/view/tb/org/rename_task.html @@ -30,7 +30,7 @@
-
diff --git a/WebRoot/view/tb/org/save_group.html b/WebRoot/view/tb/org/save_group.html new file mode 100644 index 00000000..bd959ed4 --- /dev/null +++ b/WebRoot/view/tb/org/save_group.html @@ -0,0 +1,106 @@ + + + + + + + + + + + +
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+
+
+ + + + + + + + \ No newline at end of file diff --git a/WebRoot/view/tb/org/task_list.html b/WebRoot/view/tb/org/task_list.html index e18dd865..818f5456 100644 --- a/WebRoot/view/tb/org/task_list.html +++ b/WebRoot/view/tb/org/task_list.html @@ -66,10 +66,7 @@