diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 5a5f262ec..4038d7417 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1902,7 +1902,7 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ //增加结算记录 foreach ($data['statement_info'] as $key => $value) { $objPHPExcel->getActiveSheet()->insertNewRowBefore($line,1)->mergeCells("J$line:K$line"); - $objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['statement_begin_time'] . '-' . $value['statement_end_time']); + $objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['statement_begin_time'].'-'.$value['statement_end_time']); if ($value['statement_type'] > 0) {//罚款 $product_name = $value['game_name']; $objPHPExcel->getActiveSheet()->setCellValue('F'.$line , '-'); @@ -2019,7 +2019,7 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al $objPHPExcel->getActiveSheet()->insertNewRowBefore($line,1); $objPHPExcel->getActiveSheet()->removeConditionalStyles(); - $objPHPExcel->getActiveSheet()->setCellValue('A'.$line, $value['statement_begin_time'] . '-' . $value['statement_end_time']); + $objPHPExcel->getActiveSheet()->setCellValue('A'.$line, $value['statement_begin_time'].'-'.$value['statement_end_time']); if ($value['statement_type'] > 0) {//罚款 $product_name = $value['game_name']; $objPHPExcel->getActiveSheet()->setCellValue('D'.$line, '-'); diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html index ad3b017f0..da97641cc 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html @@ -143,7 +143,7 @@ {$com['statement_info'][0]['game_name']} {$com['statement_info'][0]['game_type_name']} - {$com['statement_info'][0]['statement_begin_time']} - {$com['statement_info'][0]['statement_end_time']} + {$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']} {$com['statement_info'][0]['pay_amount']}