From f4a01012820916dbc66fc2a681033b40c4cc0a1d Mon Sep 17 00:00:00 2001 From: skjia <106962133@qq.com> Date: Thu, 22 Aug 2024 15:30:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=BE=E8=83=9C=E5=87=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hxy-web/js/dataStatistics/staff/staffList.js | 35 +++++++++---------- .../viewStatistics/viewStatisticsList.js | 23 ++++++++---- .../dataStatistics/workVisa/workVisaList.js | 23 ++++++------ hxy-web/js/wireManager/header.js | 4 +-- hxy-web/js/wireManager/index.js | 2 +- hxy-web/js/wireManager/staff/staffAdd.js | 4 +-- .../js/wireManager/viewResult/viewResult.js | 17 ++++++++- 7 files changed, 66 insertions(+), 42 deletions(-) diff --git a/hxy-web/js/dataStatistics/staff/staffList.js b/hxy-web/js/dataStatistics/staff/staffList.js index 100a378..5d08815 100644 --- a/hxy-web/js/dataStatistics/staff/staffList.js +++ b/hxy-web/js/dataStatistics/staff/staffList.js @@ -51,7 +51,6 @@ layui.use(['form','layer','table'], function () { * 初始化数据 */ function init(){ -<<<<<<< HEAD var yjId=localStorage.getItem("selectyj"); var subId=localStorage.getItem("selectSubCom"); console.log(yjId,"yjId") @@ -60,17 +59,6 @@ function init(){ table.render({ elem: '#table', url: PATH_URL + "/personbase/getList", -======= - var subComId = $(window.parent.document).find("select[id='subComId']").val(); - - // 渲染表格 - table.render({ - elem: '#table', - where: { - fgsId: subComId - }, - // url: "/sys/achievement", ->>>>>>> e368ceeff701decf9d8a09e1b31bb567ab6d0496 page: true, method:'post', where:{yjId:yjId,subId:subId}, @@ -125,7 +113,7 @@ function init(){ }, { field: '', - title: '人员状态', + title: '合同状态', align: 'center', templet: function(d){ var contractStatus = d.contractState; @@ -162,11 +150,22 @@ function init(){ } +//导出 //导出 function exportData() { - // let search1 = $('#search1').val(); - // let search2 = $('#search2').val(); - window.location.href = oiPlanUrl + "/monthlyPlanSubmission/export?token=" + token; - - + var userName = $("#userName").val(); + var proName = $("#proName").val(); + var yjName = $("#yjName").val(); + var contractState = $("#contractState").val(); + var userState = $("#userState").val(); + yjId=localStorage.getItem("selectyj"); + subId=localStorage.getItem("selectSubCom"); + window.location.href = PATH_URL + `/personbase/exportDatas?token=` + token + + "&userName=" + userName + + "&proName=" + proName + + "&yjName=" + yjName + + "&contractState=" + contractState + + "&userState=" + userState + + "&subId=" + subId + + "&yjId=" + yjId } \ No newline at end of file diff --git a/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsList.js b/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsList.js index e5c072c..024052e 100644 --- a/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsList.js +++ b/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsList.js @@ -173,14 +173,7 @@ function init(){ // 渲染表格 table.render({ elem: '#table', -<<<<<<< HEAD url: PATH_URL + "/makeInfo/getListTabs", -======= - where: { - fgsId: subComId - } - // url: "/sys/achievement", ->>>>>>> e368ceeff701decf9d8a09e1b31bb567ab6d0496 page: true, method:'post', border: true, @@ -258,4 +251,20 @@ function updateView(id) { }, }); +} +function exportData() { + + var userName = $("#userName").val(); + var proName = $("#proName").val(); + var yjName = $("#yjName").val(); + var makeMonth = $("#makeMonth").val(); + yjId=localStorage.getItem("selectyj"); + subId=localStorage.getItem("selectSubCom"); + window.location.href = PATH_URL + `/makeInfo/exportDatas?token=` + token + + "&userName=" + userName + + "&proName=" + proName + + "&yjName=" + yjName + + "&makeMonth=" + makeMonth + + "&subId=" + subId + + "&yjId=" + yjId } \ No newline at end of file diff --git a/hxy-web/js/dataStatistics/workVisa/workVisaList.js b/hxy-web/js/dataStatistics/workVisa/workVisaList.js index f99688e..ec81f61 100644 --- a/hxy-web/js/dataStatistics/workVisa/workVisaList.js +++ b/hxy-web/js/dataStatistics/workVisa/workVisaList.js @@ -81,14 +81,7 @@ function init(){ // 渲染表格 table.render({ elem: '#table', -<<<<<<< HEAD url: PATH_URL + "/workvisa/getListTab", -======= - where: { - fgsId: subComId - }, - // url: "/sys/achievement", ->>>>>>> e368ceeff701decf9d8a09e1b31bb567ab6d0496 page: true, method:'post', skin: 'line', // 表格样式 @@ -155,8 +148,16 @@ function detailsView(id,proId,makeMonth) { //导出 -function exportData(){ - // let search1 = $('#search1').val(); - // let search2 = $('#search2').val(); - window.location.href = oiPlanUrl + "/monthlyPlanSubmission/export?token=" + token; +function exportData() { + var proName = $("#proName").val(); + var yjName = $("#yjName").val(); + var makeMonth = $("#makeMonth").val(); + yjId=localStorage.getItem("selectyj"); + subId=localStorage.getItem("selectSubCom"); + window.location.href = PATH_URL + `/workvisa/exportData?token=` + token + + "&proName=" + proName + + "&yjName=" + yjName + + "&makeMonth=" + makeMonth + + "&subId=" + subId + + "&yjId=" + yjId } \ No newline at end of file diff --git a/hxy-web/js/wireManager/header.js b/hxy-web/js/wireManager/header.js index a7e3aed..985480f 100644 --- a/hxy-web/js/wireManager/header.js +++ b/hxy-web/js/wireManager/header.js @@ -24,7 +24,7 @@ function init(){ $("#taskSourceId").attr("stationId", data.data[0].child[0].id); $("#taskSourceId").attr("stationName", data.data[0].child[0].title); $("#taskSourceId").attr("gsName", data.data[0].child[0].parentName); - localStorage.setItem("selectyj",data.data[0].child[0].id) + localStorage.setItem("oneselectyj",data.data[0].child[0].id) dropdown.render({ elem: '#taskSourceId', accordion: true, @@ -40,7 +40,7 @@ function init(){ /** * 选择运检站后会根据运检id重新查询页面内容 */ - localStorage.setItem("selectyj", item.id) + localStorage.setItem("oneselectyj", item.id) var iframe = $("#indexFrame")[0]; var iframeWindow = iframe.contentWindow; iframeWindow.setData(); diff --git a/hxy-web/js/wireManager/index.js b/hxy-web/js/wireManager/index.js index 6c264de..59ad348 100644 --- a/hxy-web/js/wireManager/index.js +++ b/hxy-web/js/wireManager/index.js @@ -14,7 +14,7 @@ layui.use(['element', 'layer', 'form', 'element','laypage'], function(){ function setData(){ var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId"); - + localStorage.setItem("oneselectyj",yjId) $.ajax({ type: 'post', url: PATH_URL + '/lineProjectHomePage/getDataOverview', diff --git a/hxy-web/js/wireManager/staff/staffAdd.js b/hxy-web/js/wireManager/staff/staffAdd.js index f4e902b..bff4a55 100644 --- a/hxy-web/js/wireManager/staff/staffAdd.js +++ b/hxy-web/js/wireManager/staff/staffAdd.js @@ -254,7 +254,7 @@ layui.use(['element','layer','transfer', 'form', 'upload','laydate','tree'], fun function initProSelect(arr){ - var yj_id=localStorage.getItem("selectyj"); + var yj_id=localStorage.getItem("oneselectyj"); $.ajax({ type:"post", url : PATH_URL + "/personbase/getProDetail", @@ -389,7 +389,7 @@ function initTree(){ }); } - var yj_id=localStorage.getItem("selectyj"); + var yj_id=localStorage.getItem("oneselectyj"); console.log(yj_id,"yj_id"); $.ajax({//id获取详情打开弹窗传值子页面 type: 'post', diff --git a/hxy-web/js/wireManager/viewResult/viewResult.js b/hxy-web/js/wireManager/viewResult/viewResult.js index a948d02..fc15419 100644 --- a/hxy-web/js/wireManager/viewResult/viewResult.js +++ b/hxy-web/js/wireManager/viewResult/viewResult.js @@ -2,7 +2,7 @@ var pers = [] var table,form,laydate -var yjId=localStorage.getItem("selectyj"); +var yjId=localStorage.getItem("oneselectyj"); layui.use(['form','layer','table','laydate'], function () { table = layui.table; form = layui.form; @@ -198,4 +198,19 @@ function updateView(id,userId,makeMonth) { }, }); +} +//导出 +function exportData() { + var userName = $("#userName").val(); + var proName = $("#proName").val(); + var yjName = $("#yjName").val(); + var makeMonth = $("#makeMonth").val(); + + yjId=localStorage.getItem("oneselectyj"); + window.location.href = PATH_URL + `/makeInfo/exportData?token=` + token + + "&userName=" + userName + + "&proName=" + proName + + "&yjName=" + yjName + + "&makeMonth=" + makeMonth + + "&yjId=" + yjId } \ No newline at end of file