From c84dfae56a2b1aa115a10e9c814a0152cf71d5de Mon Sep 17 00:00:00 2001 From: kgdxpr Date: Fri, 26 Jan 2024 09:31:38 +0800 Subject: [PATCH 1/3] 'commit' --- WebRoot/view/tb/form/save_form.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/WebRoot/view/tb/form/save_form.html b/WebRoot/view/tb/form/save_form.html index 88bdff36..81faa747 100644 --- a/WebRoot/view/tb/form/save_form.html +++ b/WebRoot/view/tb/form/save_form.html @@ -99,7 +99,6 @@ } else { parent.window.location = "/QingLong/view/tb/org/task_list.html"; } - }); } else { layer.msg(result.message, { @@ -118,7 +117,6 @@ return false; }); - function GetQueryString(name, istop) { var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i"); var r = window.location.search.substr(1).match(reg); From 4c424c98ecef081fbd98a08568f36637a764139f Mon Sep 17 00:00:00 2001 From: kgdxpr Date: Fri, 26 Jan 2024 09:42:56 +0800 Subject: [PATCH 2/3] 'commit' --- WebRoot/view/tb/dis/task_view_p.html | 8 ++++++++ WebRoot/view/tb/form/report_p.html | 9 ++++++--- WebRoot/view/tb/form/view.html | 2 +- WebRoot/view/tb/school/task_list_p.html | 4 ++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/WebRoot/view/tb/dis/task_view_p.html b/WebRoot/view/tb/dis/task_view_p.html index 2f757b63..914beef2 100644 --- a/WebRoot/view/tb/dis/task_view_p.html +++ b/WebRoot/view/tb/dis/task_view_p.html @@ -129,6 +129,14 @@ parseData: function (res) { // res 即为原始返回的数据 for (var i = 0; i < res.data.length; i++) { res.data[i].job_type = parseInt(jobType); + + + if (res.data[i].status_code.toString().slice(-1) == "0") { + res.data[i].is_finish = 0; + } else { + res.data[i].is_finish = 1; + } + } return res; } diff --git a/WebRoot/view/tb/form/report_p.html b/WebRoot/view/tb/form/report_p.html index cd037b14..e5feac22 100644 --- a/WebRoot/view/tb/form/report_p.html +++ b/WebRoot/view/tb/form/report_p.html @@ -73,6 +73,8 @@ var element = layui.element var jobId = GetQueryString("job_id"); + var statusCode = GetQueryString("status_code"); + var targetId = GetQueryString("target_id"); function unique(x) { @@ -91,7 +93,7 @@ $.ajax({ - url: "/QingLong/collect/getJob?job_id=" + jobId, + url: "/QingLong/collect/getJob?job_id=" + jobId + "&status_code=" + statusCode + "&target_id=" + targetId, async: false, type: 'GET', success: function (res) { @@ -202,7 +204,7 @@ //获取表单数据 $.ajax({ - url: "/QingLong/collect/getFormFillJob?job_id=" + jobId+"&target_id=-1", + url: "/QingLong/collect/getFormFillJob?job_id=" + jobId + "&target_id=" + targetId + "&status_code=" + statusCode, async: false, type: 'GET', dataType: "json", @@ -281,7 +283,8 @@ type: 'post', data: { "job_id": jobId, - "json": JSON.stringify(json) + "json": JSON.stringify(json), + "status_code": statusCode }, success: function (result) { if (result.success) { diff --git a/WebRoot/view/tb/form/view.html b/WebRoot/view/tb/form/view.html index 57c2c1e8..1a405b1d 100644 --- a/WebRoot/view/tb/form/view.html +++ b/WebRoot/view/tb/form/view.html @@ -195,7 +195,7 @@ //获取表单数据 $.ajax({ - url: "/QingLong/collect/getFormFillJob?job_id=" + jobId + "&status_code=" + statusCode, + url: "/QingLong/collect/getFormFillJob?job_id=" + jobId + "&status_code=" + statusCode + "&target_id=" + targetId, async: false, type: 'GET', dataType: "json", diff --git a/WebRoot/view/tb/school/task_list_p.html b/WebRoot/view/tb/school/task_list_p.html index f7ca8f8b..611cdfde 100644 --- a/WebRoot/view/tb/school/task_list_p.html +++ b/WebRoot/view/tb/school/task_list_p.html @@ -147,7 +147,7 @@ anim: 'slideLeft', area: ['1000px', '100%'], shade: 0.1, - content: "../form/report_p.html?job_id=" + obj.data.job_id + content: "../form/report_p.html?job_id=" + obj.data.job_id + "&status_code=" + obj.data.status_code + "&target_id=" + obj.data.target_id }); } } @@ -175,7 +175,7 @@ area: ['1000px', '100%'], shade: 0.1, shadeClose: true, - content: "../form/view.html?job_id=" + obj.data.job_id + content: "../form/view.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 + '&type_id=2'); From 020e0ed27af04e512cdd6ec8b0600ee50654bd97 Mon Sep 17 00:00:00 2001 From: kgdxpr Date: Fri, 26 Jan 2024 09:48:24 +0800 Subject: [PATCH 3/3] 'commit' --- WebRoot/view/tb/dis/task_view_p.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/WebRoot/view/tb/dis/task_view_p.html b/WebRoot/view/tb/dis/task_view_p.html index 914beef2..90d98631 100644 --- a/WebRoot/view/tb/dis/task_view_p.html +++ b/WebRoot/view/tb/dis/task_view_p.html @@ -18,9 +18,9 @@
@@ -105,7 +105,7 @@ where: { job_id: jobId, keyword: $("#org_name").val(), - status_codes: "1110,1111,1210,1211,2210,2211,2310,2311" + status_codes: $("#status").val() }, height: 'full-155', page: { @@ -165,7 +165,7 @@ area: ['750px', '100%'], shade: 0.1, shadeClose: true, - content: "../form/view_bureau.html?job_id=" + obj.data.job_id + "&target_id=" + obj.data.target_id + 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');