diff --git a/WebRoot/view/tb/dis/publish.html b/WebRoot/view/tb/dis/publish.html new file mode 100644 index 00000000..027d5587 --- /dev/null +++ b/WebRoot/view/tb/dis/publish.html @@ -0,0 +1,416 @@ + + + + + + + + + + + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
    +
  • 按单位类型
    • +
  • 按指定单位
    • +
  • 按指定分组
    • +
+
+ +
+ + +
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+ +
+ +
+
+
+
+ + +
+
+ +
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ + +
+
+ +
+ + + + + + + \ 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 97161f20..f87efbaa 100644 --- a/WebRoot/view/tb/org/task_list.html +++ b/WebRoot/view/tb/org/task_list.html @@ -228,11 +228,11 @@ window.del(obj); } else if (obj.event === 'exportStruct') { window.exportStruct(obj); - }else if (obj.event === 'exportHz') { + } else if (obj.event === 'exportHz') { window.exportHz(obj); } - + }); window.fill_progress = function (job_id, total_count, finish_count, job_type) { @@ -250,33 +250,61 @@ window.forward_progress = function (job_id, total_count, finish_count, job_type) { var id = "9001" - parent.layui.admin.closeTab(id); + parent.layui.admin.closeTab(id); parent.layui.admin.addTab(id, "转发进度", "/QingLong/view/tb/org/task_view_forward.html?job_id=" + job_id + "&job_type=" + job_type); } - + window.publish = function (obj) { if (obj.data.is_save === 1) { - // layer.open({ - // type: 2, - // title: '发布任务', - // shade: 0.1, - // area: ['860px', '730px'], - // content: './publish.html?job_id=' + obj.data.job_id - // }); - - layer.open({ - type: 2, - title: '发布任务', - offset: 'r', - anim: 'slideLeft', - area: ['860px', '100%'], - shade: 0.1, - content: './publish.html?job_id=' + obj.data.job_id + + $.ajax({ + url: "/QingLong/collect/getCurrentPersonPublishRole", + async: false, + type: 'GET', + success: function (res) { + if (res.success) { + if (res.publish_role_id == 255) { + layer.open({ + type: 2, + title: '发布任务', + offset: 'r', + anim: 'slideLeft', + area: ['860px', '100%'], + shade: 0.1, + content: './publish.html?job_id=' + obj.data.job_id + }); + } else if (res.publish_role_id == 268) { + layer.open({ + type: 2, + title: '发布任务', + offset: 'r', + anim: 'slideLeft', + area: ['860px', '100%'], + shade: 0.1, + content: '../dis/publish.html?job_id=' + obj.data.job_id + }); + } + } else { + layer.msg("获取身份异常！", { + icon: 2, + time: 1000 + }); + } + + }, error: function (xhr, status, error) { + layer.msg("获取数据异常！", { + icon: 2, + time: 1000 + }); + } }); + + + } else { layer.msg('该任务尚未保存，请在修改中进行保存！', { @@ -321,7 +349,7 @@ // window.location = "/QingLong/Excel/" + obj.data.upload_excel_filename; } - + window.exportHz = function (obj) { window.location = "/QingLong/collect/getSummaryExcel?job_id=" + obj.data.job_id; }