diff --git a/WebRoot/Excel/0047142c-daf5-4b75-adc7-421e6a2966ef.xlsx b/WebRoot/Excel/0047142c-daf5-4b75-adc7-421e6a2966ef.xlsx new file mode 100644 index 00000000..07425217 Binary files /dev/null and b/WebRoot/Excel/0047142c-daf5-4b75-adc7-421e6a2966ef.xlsx differ diff --git a/WebRoot/Excel/222e870f-2c8b-4339-a228-bb865c35d737.xlsx b/WebRoot/Excel/222e870f-2c8b-4339-a228-bb865c35d737.xlsx new file mode 100644 index 00000000..3deb9535 Binary files /dev/null and b/WebRoot/Excel/222e870f-2c8b-4339-a228-bb865c35d737.xlsx differ diff --git a/WebRoot/Excel/7da60c07-3893-4be2-871e-13c36b586b74.xlsx b/WebRoot/Excel/7da60c07-3893-4be2-871e-13c36b586b74.xlsx new file mode 100644 index 00000000..9d690f71 Binary files /dev/null and b/WebRoot/Excel/7da60c07-3893-4be2-871e-13c36b586b74.xlsx differ diff --git a/WebRoot/Excel/8203b223-4a9b-420d-91ef-a84fd3cb3d92.xlsx b/WebRoot/Excel/8203b223-4a9b-420d-91ef-a84fd3cb3d92.xlsx new file mode 100644 index 00000000..02fadf77 Binary files /dev/null and b/WebRoot/Excel/8203b223-4a9b-420d-91ef-a84fd3cb3d92.xlsx differ diff --git a/WebRoot/Excel/b2e37ce7-2563-4994-8cf6-0842312a17d4.xlsx b/WebRoot/Excel/b2e37ce7-2563-4994-8cf6-0842312a17d4.xlsx new file mode 100644 index 00000000..c3786e34 Binary files /dev/null and b/WebRoot/Excel/b2e37ce7-2563-4994-8cf6-0842312a17d4.xlsx differ diff --git a/WebRoot/Excel/da928c97-d21b-4a40-b9ac-f4a99e7e5292.xlsx b/WebRoot/Excel/da928c97-d21b-4a40-b9ac-f4a99e7e5292.xlsx new file mode 100644 index 00000000..02fadf77 Binary files /dev/null and b/WebRoot/Excel/da928c97-d21b-4a40-b9ac-f4a99e7e5292.xlsx differ diff --git a/WebRoot/Excel/ef870f8b-3a02-4483-a9d5-23a01324d418.xlsx b/WebRoot/Excel/ef870f8b-3a02-4483-a9d5-23a01324d418.xlsx new file mode 100644 index 00000000..80832f69 Binary files /dev/null and b/WebRoot/Excel/ef870f8b-3a02-4483-a9d5-23a01324d418.xlsx differ diff --git a/WebRoot/Excel/f10282c5-b9dd-44fc-bd70-123ec1e95141.xlsx b/WebRoot/Excel/f10282c5-b9dd-44fc-bd70-123ec1e95141.xlsx new file mode 100644 index 00000000..4ab4006d Binary files /dev/null and b/WebRoot/Excel/f10282c5-b9dd-44fc-bd70-123ec1e95141.xlsx differ diff --git a/WebRoot/view/tb/dis/task_list_w.html b/WebRoot/view/tb/dis/task_list_w.html index 37a07ad5..3d3cfd32 100644 --- a/WebRoot/view/tb/dis/task_list_w.html +++ b/WebRoot/view/tb/dis/task_list_w.html @@ -85,7 +85,7 @@ url: '/QingLong/collect/viewJobList', where: { keyword: $("#task_name").val(), - is_finish: 0, + is_finish: -1, fill_type_id: 2, forward_progress: forwardProgress }, diff --git a/WebRoot/view/tb/dis/task_list_y.html b/WebRoot/view/tb/dis/task_list_y.html index 41c5e3c8..f149f42a 100644 --- a/WebRoot/view/tb/dis/task_list_y.html +++ b/WebRoot/view/tb/dis/task_list_y.html @@ -95,7 +95,7 @@ url: '/QingLong/collect/viewJobList', where: { keyword: $("#task_name").val(), - is_finish: 0, + is_finish: -1, fill_type_id: 2, forward_progress: forwardProgress }, diff --git a/WebRoot/view/tb/school/task_list.html b/WebRoot/view/tb/school/task_list.html index 3a0e5d1f..03c96406 100644 --- a/WebRoot/view/tb/school/task_list.html +++ b/WebRoot/view/tb/school/task_list.html @@ -156,7 +156,7 @@ if (obj.data.job_type === 1) { layer.open({ type: 2, - title: '填报', + title: '查看', offset: 'r', anim: 'slideLeft', area: ['750px', '100%'],