diff --git a/WebRoot/Excel/0fe49efe-6f28-4187-922f-fb59a08a13a7.pdf b/WebRoot/Excel/0fe49efe-6f28-4187-922f-fb59a08a13a7.pdf new file mode 100644 index 00000000..c516b8d7 Binary files /dev/null and b/WebRoot/Excel/0fe49efe-6f28-4187-922f-fb59a08a13a7.pdf differ diff --git a/WebRoot/Excel/881514a4-d21a-462a-9bce-2232b0bc7f86.pdf b/WebRoot/Excel/881514a4-d21a-462a-9bce-2232b0bc7f86.pdf new file mode 100644 index 00000000..2e67984c Binary files /dev/null and b/WebRoot/Excel/881514a4-d21a-462a-9bce-2232b0bc7f86.pdf differ diff --git a/WebRoot/Excel/881514a4-d21a-462a-9bce-2232b0bc7f86.xlsx b/WebRoot/Excel/881514a4-d21a-462a-9bce-2232b0bc7f86.xlsx new file mode 100644 index 00000000..b3f50b2d Binary files /dev/null and b/WebRoot/Excel/881514a4-d21a-462a-9bce-2232b0bc7f86.xlsx differ diff --git a/WebRoot/view/tb/dis/task_view.html b/WebRoot/view/tb/dis/task_view.html index bf9f575c..2ee21985 100644 --- a/WebRoot/view/tb/dis/task_view.html +++ b/WebRoot/view/tb/dis/task_view.html @@ -154,7 +154,7 @@ }); window.download = function (obj) { - window.location = '/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&bureau_id=' + obj.data.target_id + '&type_id=1'; + window.location = '/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&bureau_id=' + obj.data.target_id + '&type_id=1' + '&status_code=' + obj.data.status_code; } window.view = function (obj) { @@ -170,7 +170,7 @@ content: "../form/view_bureau.html?job_id=" + obj.data.job_id + "&target_id=" + obj.data.target_id + "&status_code=" + obj.data.status_code }); } else { - var base64Url = Base64.encode('/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&bureau_id=' + obj.data.target_id + '&type_id=2'); + var base64Url = Base64.encode('/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&bureau_id=' + obj.data.target_id + '&type_id=2' + '&status_code=' + obj.data.status_code); window.open('../exportPdf.html?url=' + base64Url, '_blank'); } } diff --git a/WebRoot/view/tb/org/task_view.html b/WebRoot/view/tb/org/task_view.html index a5459a48..85c61b7e 100644 --- a/WebRoot/view/tb/org/task_view.html +++ b/WebRoot/view/tb/org/task_view.html @@ -159,7 +159,7 @@ }); window.download = function (obj) { - window.location = '/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&bureau_id=' + obj.data.target_id + '&type_id=1'; + window.location = '/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&bureau_id=' + obj.data.target_id + '&type_id=1' + '&status_code=' + obj.data.status_code; } window.view = function (obj) { @@ -178,7 +178,7 @@ } }); } else { - var base64Url = Base64.encode('/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&bureau_id=' + obj.data.target_id + '&type_id=2'); + var base64Url = Base64.encode('/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&bureau_id=' + obj.data.target_id + '&type_id=2' + '&status_code=' + obj.data.status_code); window.open('../exportPdf.html?url=' + base64Url, '_blank'); } }