'commit'

WebRoot/view/tb/exportPdf.html

@@ -38,6 +38,8 @@
 
             var data = { "url": _url };
 
+            console.log(data);
+
             var pdfTpl = pdfScript.innerHTML,
                 pdfView = document.getElementById('pdfView');
             laytpl(pdfTpl).render(data, function (html) {                

WebRoot/view/tb/school/report_excel.html

@@ -27,7 +27,7 @@
     <script src="../../../component/layui/layui.js"></script>
     <script src="../../../component/pear/pear.js"></script>
 
-    <script>        
+    <script>
         layui.use(function () {
             var $ = layui.jquery;
             var upload = layui.upload;
@@ -35,6 +35,10 @@
             var jobId = GetQueryString("job_id");
             var downExcelPath = GetQueryString("file_name");
 
+            var statusCode = GetQueryString("status_code");
+
+
+
             $("#downExcel").click(function () {
                 window.location = "/QingLong/Excel/" + downExcelPath;
             });
@@ -42,7 +46,7 @@
             upload.render({
                 elem: '#uploadExcel',
                 url: '/QingLong/collect/importData',
-                data: { job_id: jobId },
+                data: { job_id: jobId, status_code: statusCode },
                 text: { // 自定义提示文本                    
                     "check-error": "只允许上传xlsx格式的文件"
                 },

WebRoot/view/tb/school/task_list.html

@@ -156,7 +156,7 @@
                             title: '填报',
                             shade: 0.1,
                             area: ['560px', '430px'],
-                            content: './report_excel.html?job_id=' + obj.data.job_id + '&file_name=' + obj.data.upload_excel_filename_finish
+                            content: './report_excel.html?job_id=' + obj.data.job_id + '&file_name=' + obj.data.upload_excel_filename_finish + "&status_code=" + obj.data.status_code
                         });
                     }
                 } else {
@@ -201,7 +201,7 @@
                             }
                         });
                     } else {
-                        var base64Url = Base64.encode('/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&type_id=2');
+                        var base64Url = Base64.encode('/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&type_id=2' + '&status_code=' + obj.data.status_code);
                         window.open('../exportPdf.html?url=' + base64Url, '_blank');
                     }
                 }