diff --git a/WebRoot/Excel/57b8418c-a52d-42bc-91e2-c3d5f46d4a31.xlsx b/WebRoot/Excel/57b8418c-a52d-42bc-91e2-c3d5f46d4a31.xlsx
new file mode 100644
index 00000000..69a00402
Binary files /dev/null and b/WebRoot/Excel/57b8418c-a52d-42bc-91e2-c3d5f46d4a31.xlsx differ
diff --git a/WebRoot/view/tb/org/clone_task.html b/WebRoot/view/tb/org/clone_task.html
index 7dd90678..7d9d3992 100644
--- a/WebRoot/view/tb/org/clone_task.html
+++ b/WebRoot/view/tb/org/clone_task.html
@@ -72,7 +72,7 @@
},
success: function (result) {
if (result.success) {
- layer.msg("成功!", {
+ layer.msg("复制成功!", {
icon: 1,
time: 1000
}, function () {
diff --git a/WebRoot/view/tb/org/postpone.html b/WebRoot/view/tb/org/postpone.html
index 9654f8ce..6ea0d364 100644
--- a/WebRoot/view/tb/org/postpone.html
+++ b/WebRoot/view/tb/org/postpone.html
@@ -77,7 +77,7 @@
},
success: function (result) {
if (result.success) {
- layer.msg("成功!", {
+ layer.msg("延期成功!", {
icon: 1,
time: 1000
}, function () {
diff --git a/WebRoot/view/tb/org/rename_task.html b/WebRoot/view/tb/org/rename_task.html
index c1897961..d3fc13fc 100644
--- a/WebRoot/view/tb/org/rename_task.html
+++ b/WebRoot/view/tb/org/rename_task.html
@@ -72,7 +72,7 @@
},
success: function (result) {
if (result.success) {
- layer.msg("成功!", {
+ layer.msg("重命名成功!", {
icon: 1,
time: 1000
}, function () {
diff --git a/WebRoot/view/tb/org/task_list.html b/WebRoot/view/tb/org/task_list.html
index d16fab75..9d3e49a7 100644
--- a/WebRoot/view/tb/org/task_list.html
+++ b/WebRoot/view/tb/org/task_list.html
@@ -88,9 +88,11 @@
+ {{# if(d.publish_state === 0){ }}
+ {{# } }}
@@ -130,14 +132,15 @@
, next: "下一页"
},
cols: [[
- { title: '序号', align: 'center', width: "5%", type: 'numbers' },
+ { title: '序号', align: 'center', width: "3%", type: 'numbers' },
{ title: '任务名称', align: 'left', templet: '#jobName-Templet' },
{ title: '发布时间', field: 'publish_time', align: 'center', width: "10%" },
{ title: '截止时间', field: 'deadline_time', align: 'center', width: "10%" },
{ title: '填报格式', field: 'job_type_name', align: 'center', width: "10%" },
{ title: '填报进度', align: 'center', width: "10%", templet: '#progress-Templet' },
- { title: '状态', field: 'publish_state_name', align: 'center', width: "5%" },
- { title: '操作', align: 'left', width: "20%", toolbar: '#table-bar' }
+ { title: '保存状态', field: 'is_save_name', align: 'center', width: "8%" },
+ { title: '发布状态', field: 'publish_state_name', align: 'center', width: "8%" },
+ { title: '操作', align: 'left', width: "18%", toolbar: '#table-bar' }
]],
skin: 'line',
toolbar: '#table-toolbar',
@@ -209,7 +212,7 @@
window.export = function (obj) {
-
+ window.location = "/QingLong/Excel/" + obj.data.upload_excel_filename;
}
window.copy = function (obj) {