diff --git a/js/car_settlement/branch_settlement_list.js b/js/car_settlement/branch_settlement_list.js index f8286f6..9882708 100644 --- a/js/car_settlement/branch_settlement_list.js +++ b/js/car_settlement/branch_settlement_list.js @@ -268,6 +268,18 @@ function initTable() { // 详情 function branchSettlementDetail(obj) { + let startTime = '', endTime = ''; + if (currentTabId === '2') { // 本年度 + let dateArr = getNowYear(); + startTime = dateArr[0], endTime = dateArr[1]; + } else if (currentTabId === '3') { // 自定义时间 + let date = $('#date').val(); + if (date) { + let dateArr = date.split(' - '); + startTime = dateArr[0], endTime = dateArr[1]; + } + } + obj.startTime =startTime,obj.endTime =endTime; openIframeByParamObj("branchSettbranchSettlementDetaillementProDetail", "分公司详情", "./child/branch_settlement_detail.html", "92%", "95%", obj); } diff --git a/js/car_settlement/child/branch_settlement_detail.js b/js/car_settlement/child/branch_settlement_detail.js index 773704f..f862224 100644 --- a/js/car_settlement/child/branch_settlement_detail.js +++ b/js/car_settlement/child/branch_settlement_detail.js @@ -60,7 +60,9 @@ function reloadTable(pageNum) { encryptedData: JSON.stringify({ 'proName': $('#proName').val(), // 'status': $('#status').val(), - 'bmname': objParam.bmname + 'bmname': objParam.bmname, + startTime:objParam.startTime, + endTime:objParam.endTime }), }, }, @@ -81,7 +83,9 @@ function initTable() { encryptedData: JSON.stringify({ 'proName': $('#proName').val(), // 'status': $('#status').val(), - 'bmname': objParam.bmname + 'bmname': objParam.bmname, + startTime:objParam.startTime, + endTime:objParam.endTime }), }, request: { @@ -211,7 +215,9 @@ function exportExcel() { let params = { 'proName': $('#proName').val(), // 'status': $('#status').val(), - 'bmname': objParam.bmname + 'bmname': objParam.bmname, + startTime:objParam.startTime, + endTime:objParam.endTime } let url = dataUrl + "backstage/carStatistics/export2"; exportExcelUtil(url, '分公司详情', JSON.stringify(params)); @@ -220,6 +226,8 @@ function exportExcel() { // 详情 function branchSettlementProDetail(obj, type) { obj.type = type; - obj.bmname = objParam.bmname + obj.bmname = objParam.bmname; + obj.startTime = objParam.startTime; + obj.endTime = objParam.endTime; openIframeByParamObj2("branchSettlementProDetail", "工程详情", "../car_settlement/child/branch_settlement_pro_detail.html", "92%", "95%", obj); } \ No newline at end of file diff --git a/js/car_settlement/child/branch_settlement_pro_detail.js b/js/car_settlement/child/branch_settlement_pro_detail.js index 2b5f032..603c56e 100644 --- a/js/car_settlement/child/branch_settlement_pro_detail.js +++ b/js/car_settlement/child/branch_settlement_pro_detail.js @@ -58,7 +58,9 @@ function reloadTable(pageNum) { where: { encryptedData: JSON.stringify({ 'code': $('#code').val(), - 'proId': objParam.proId + 'proId': objParam.proId, + startTime:objParam.startTime, + endTime:objParam.endTime }), }, }, @@ -78,7 +80,9 @@ function initTable() { where: { encryptedData: JSON.stringify({ 'code': $('#code').val(), - 'proId': objParam.proId + 'proId': objParam.proId, + startTime:objParam.startTime, + endTime:objParam.endTime }), }, request: { @@ -218,7 +222,9 @@ function initTable() { function exportExcel() { let params = { 'code': $('#planCode').val(), - 'proId': objParam.proId + 'proId': objParam.proId, + startTime:objParam.startTime, + endTime:objParam.endTime } let url = dataUrl + "backstage/carStatistics/export3"; exportExcelUtil(url, '工程详情', JSON.stringify(params));