From 47480ed979dcdf6664c4348ab8af4e9e3b913cac Mon Sep 17 00:00:00 2001 From: zhaocheng <578322713@qq.com> Date: Tue, 5 Nov 2019 09:38:35 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=9B=9E=E5=8D=95=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/FinanceController.php | 11 +++++++++-- frontend/views/finance/receipt.php | 17 +++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php index d2bd428..f46fb33 100644 --- a/frontend/controllers/FinanceController.php +++ b/frontend/controllers/FinanceController.php @@ -213,8 +213,8 @@ class FinanceController extends \frontend\controllers\UserBaseController $data['rows'] = []; foreach($items as $item) { $row = $item->toArray(); - $row['group'] = $item->user->group->name; - $row['company_name'] = $item->order->company2->name; + $row['group'] = $item->user->group ? $item->user->group->name : ''; + $row['company_name'] = $item->order->company2 ? $item->order->company2->name : 0; $row['username'] = $item->user->getShowName(); $row['submit_date'] = $item->order->submit_date; $row['print_date'] = $item->order->print_date; @@ -222,6 +222,13 @@ class FinanceController extends \frontend\controllers\UserBaseController $data['rows'][] = $row; } + $data['rows'][] = array( + ['商业保总额', $sum_total], + ['商业净保总额', $sum_total_clear], + ['回款总额', $sum_r_total], + ['回款差额', $sum_total_dis] + ); + return $data; } public function actionReceiptImport() { diff --git a/frontend/views/finance/receipt.php b/frontend/views/finance/receipt.php index 5e5e604..aa2a1d8 100644 --- a/frontend/views/finance/receipt.php +++ b/frontend/views/finance/receipt.php @@ -23,8 +23,8 @@ use \common\libs\MyLib;
@@ -145,6 +145,19 @@ use \common\libs\MyLib; o['offset'] = params['offset']; o['limit'] = params['limit']; return o; + }, + responseHandler: function (res) { + var totals = res.rows.pop(); + var html = ''; + $.each(totals,function (i,d) { + html += '
' + + ''+ d[0] +'：' + + ''+ d[1] +'' + + '
' + }); + html += ''; + $('#listTable').append(html); + return res; } }); return false; From c405c40505b819702bfa781fe99c09aff2a50a25 Mon Sep 17 00:00:00 2001 From: zhaocheng <578322713@qq.com> Date: Wed, 6 Nov 2019 16:14:53 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=BD=A6=E9=99=A9=E6=8F=90=E6=88=90?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/libs/MyLib.php | 2 +- frontend/controllers/FinanceController.php | 92 +++++++++++++--------- frontend/controllers/FixCarController.php | 3 - frontend/controllers/InsurerController.php | 38 +++++---- frontend/views/car/info-track.php | 2 +- frontend/views/finance/budian-list.php | 15 +++- frontend/views/insurer/finance-mng.php | 13 +++ 7 files changed, 106 insertions(+), 59 deletions(-) diff --git a/common/libs/MyLib.php b/common/libs/MyLib.php index 85efc26..eb1b026 100644 --- a/common/libs/MyLib.php +++ b/common/libs/MyLib.php @@ -214,7 +214,7 @@ class MyLib { } } static public function zhifufs($cx){ - + $cn = '未知'; if($cx==1) { $cn='上门收费'; }elseif($cx==2){ diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php index 1a68846..95d9ce0 100644 --- a/frontend/controllers/FinanceController.php +++ b/frontend/controllers/FinanceController.php @@ -213,11 +213,11 @@ class FinanceController extends \frontend\controllers\UserBaseController $data['rows'] = []; foreach($items as $item) { $row = $item->toArray(); - $row['group'] = $item->user->group ? $item->user->group->name : ''; - $row['company_name'] = $item->order->company2 ? $item->order->company2->name : 0; - $row['username'] = $item->user->getShowName(); - $row['submit_date'] = $item->order->submit_date; - $row['print_date'] = $item->order->print_date; + $row['group'] = $item->user && $item->user->group ? $item->user->group->name : ''; + $row['company_name'] = $item->order && $item->order->company2 ? $item->order->company2->name : 0; + $row['username'] = $item->user ? $item->user->getShowName() : 0; + $row['submit_date'] = $item->order ? $item->order->submit_date : ''; + $row['print_date'] = $item->order ? $item->order->print_date : ''; $row['total_real'] = round($item->total_clear_real + $item->total_tax_real,2); $data['rows'][] = $row; } @@ -6550,6 +6550,7 @@ class FinanceController extends \frontend\controllers\UserBaseController $query->andWhere('order_t.print_date<="' . $end_date . '"'); } $total = $query->count(); + $sum_total1_clear = $query->sum('total1_clear'); $query->offset($offset)->limit($limit); $items = $query->all(); @@ -6568,6 +6569,10 @@ class FinanceController extends \frontend\controllers\UserBaseController $data['rows'][] = $row; } + $data['rows'][] = array( + ['商业净保总额', number_format($sum_total1_clear,2)], + ); + return $data; } @@ -6725,19 +6730,14 @@ class FinanceController extends \frontend\controllers\UserBaseController $group_ids = []; if($group_id > 0) { $items = GroupT::getTree($group_id); - $group_ids[] = $group_id; foreach($items as $group_info) { $group_ids[] = $group_info->id; } } - - $query = CaiwuT::find() ->leftJoin(OrderT::tableName(), "order_t.id=caiwu_t.order_id") - ->where('order_t.status_id>1') - ->orderBy('order_t.print_date DESC'); - + ->where('order_t.status_id>1'); if($user_names != '' && $user_names != 'null'){ $user_arr = explode(',',$user_names); $user_ids = []; @@ -6746,40 +6746,33 @@ class FinanceController extends \frontend\controllers\UserBaseController if($user) $user_ids[] = $user->id; } - $query->andWhere(['in','caiwu_t.user_id',$user_ids]); } - if( $company_id > 0) { $query->andWhere('order_t.company2_id='.$company_id); } if( $car_no != '') { $query->andWhere('order_t.car_no="'.$car_no.'"'); } - if($car_no_type == 1){ $query->andWhere('caiwu_t.car_no like "' . '京' . '%"'); }elseif($car_no_type == 2){ $query->andWhere('caiwu_t.car_no not like "' . '京' . '%"'); } - if($begin_totalclear != ''){ $query->andWhere('caiwu_t.total_clear >=' . $begin_totalclear); } if($end_totalclear != ''){ $query->andWhere('caiwu_t.total_clear <=' . $end_totalclear); } - if ($begin_date != "") { $query->andWhere('order_t.print_date>="' . $begin_date . '"'); } if ($end_date != "") { $query->andWhere('order_t.print_date<="' . $end_date . '"'); } - $user_items = $this->my->getChildren(''); $user_items[] = $this->my; - $row = array(); foreach($user_items as $user_info) { if ($group_id > 0) { @@ -6789,22 +6782,14 @@ class FinanceController extends \frontend\controllers\UserBaseController } $row[] = $user_info->id; } - //加上级别筛选 if($group_id > 0){ $query->andWhere(['in','caiwu_t.user_id',$row]); } - - $query1 = clone $query; if($insurer_type ==1){ $query->andWhere('caiwu_t.insurer_type=1'); } - - $items = $query->all(); - - $total2_clear_all = $query1->andWhere('caiwu_t.insurer_type=2')->sum('total_clear'); - $yewu_ticheng_all = 0; $total1_clear_all = 0; $yeji_ticheng_all = 0; @@ -6815,7 +6800,6 @@ class FinanceController extends \frontend\controllers\UserBaseController foreach($items as $index => $item) { $order_caiwu_info = $item->orderCaiwu; $order_info = $item->order; - $total1_clear_all += $item->total_clear; $yewu_ticheng_all += $order_caiwu_info ? $order_caiwu_info->yewu_ticheng : 0; $yeji_ticheng_all += $order_caiwu_info ? $order_caiwu_info->yeji_ticheng : 0; @@ -6827,20 +6811,42 @@ class FinanceController extends \frontend\controllers\UserBaseController $yuangong_money = $order_info->yuangong_money>0?$order_info->yuangong_money:0; } $yuangong_money_all += $yuangong_money; - } -// echo $query->createCommand()->rawSql;exit; - $total = $query->count(); - $query->offset($offset)->limit($limit); - $items = $query->all(); + $yewu_ticheng_all = 0; + $total1_clear_all = 0; + $yeji_ticheng_all = 0; + $ticheng_money_all = 0; + $lipin_all = 0; + $liquan_all = 0; + $yuangong_money_all = 0; + $query1 = clone $query; + $sums = $query1->select([ + 'sum_total1_clear' => 'sum(order_caiwi_t.total1_clear)', + 'sum_yewu_ticheng' => 'sum(order_caiwi_t.yewu_ticheng)', + 'sum_yeji_ticheng' => 'sum(order_caiwi_t.yeji_ticheng)', + 'sum_ticheng_money' => 'sum(order_caiwi_t.ticheng_money)', + 'sum_yuangong_money' => 'sum(order_caiwi_t.yuangong_money)', + ])->asArray()->one(); + $query2 = clone $query; +// $gift_sums = $query2 +// ->leftJoin(OrderGiftT::tableName(), "order_gift_t.order_id=caiwu_t.order_id") +// ->leftJoin(GiftT::tableName(), "gift_t.id=order_t.gift_id") +// ->groupBy('caiwu_t.id') +// ->select([ +// 'sum_no_free_gift' => 'sum(order_caiwi_t.total1_clear)', +// ])->asArray()->one(); + + $total = $query->count(); + $query=$query->offset($offset)->limit($limit); + $items = $query->orderBy('order_t.print_date DESC')->all(); $data = []; $data['total'] = $total; $data['rows'] = []; foreach($items as $item) { $row = $item->toArray(); - $row['company_name'] = $item->order->company2->name; + $row['company_name'] = $item->order->company2?$item->order->company2->name:''; $row['print_date'] = $item->order->print_date; $row['yeji_rate'] = $item->orderCaiwu->yeji_rate; $row['yeji_ticheng'] = $item->orderCaiwu->yeji_ticheng; @@ -6851,17 +6857,17 @@ class FinanceController extends \frontend\controllers\UserBaseController $row['yuangong_money'] = $item->order->yuangong_money; $row['yewu_ticheng'] = $item->orderCaiwu->yewu_ticheng; if($item->order->car->op2_id > 0) { - $row['op_user'] = $item->order->car->op2->showName; - $row['op_user1'] = $item->order->car->op1->showName; + $row['op_user'] = $item->order->car->op2?$item->order->car->op2->showName:''; + $row['op_user1'] = $item->order->car->op1?$item->order->car->op1->showName:''; } else { - $row['op_user'] = $item->order->car->op1->showName; + $row['op_user'] = $item->order->car->op1?$item->order->car->op1->showName:''; $row['op_user1'] = ''; } $row['first_xinbao_ticheng'] = $item->orderCaiwu->first_xinbao_ticheng; $row['hebao_ticheng'] = $item->orderCaiwu->hebao_ticheng; - $row['op1_user'] = $item->order->op1->showName; + $row['op1_user'] = $item->order->op1?$item->order->op1->showName:''; $row['zhengben_ticheng'] = $item->orderCaiwu->zhengben_ticheng; - $row['op2_user'] = $item->order->op2->showName; + $row['op2_user'] = $item->order->op2?$item->order->op2->showName:''; $row['dz_ticheng1'] = $item->orderCaiwu->dz_ticheng1; $row['dz_names1'] = $item->orderCaiwu->dz_names1; $row['dz_ticheng2'] = $item->orderCaiwu->dz_ticheng2; @@ -6874,6 +6880,16 @@ class FinanceController extends \frontend\controllers\UserBaseController $row['dz_names5'] = $item->orderCaiwu->dz_names5; $data['rows'][] = $row; } + $data['rows'][] = array( + ['保费总额', number_format($sums['sum_total1'],2)], + ['商业净保总额', number_format($sums['sum_total1_clear'],2)], + ['基本提成合计', number_format($sums['sum_yuangong_money'],2)], + ['加点提成合计', number_format($sums['sum_non_total1_dis'],2)], + ['自费礼品合计', number_format($sums['sum_total1_dis'],2)], + ['自费礼券合计', number_format($sums['sum_yuangong_money'] + $sums['sum_total1_dis'],2)], + ['自费减免合计', number_format($sums['sum_yuangong_money'] + $sums['sum_total1_dis'],2)], + ['提成合计', number_format($sums['sum_yuangong_money'] + $sums['sum_total1_dis'],2)] + ); return $data; } diff --git a/frontend/controllers/FixCarController.php b/frontend/controllers/FixCarController.php index 7f4cf26..d85d49f 100644 --- a/frontend/controllers/FixCarController.php +++ b/frontend/controllers/FixCarController.php @@ -207,9 +207,6 @@ class FixCarController extends BaseController $info->displacement_id = $car_info->displacement_id; $info->car_year = $car_info->car_year; $info->status = $status; -// var_dump($car_info->car_year); -// var_dump($info->car_year); -// die; } if($car_id == 0) { $car_id = $info->car_id; diff --git a/frontend/controllers/InsurerController.php b/frontend/controllers/InsurerController.php index 2522c73..5cce2a7 100644 --- a/frontend/controllers/InsurerController.php +++ b/frontend/controllers/InsurerController.php @@ -1122,17 +1122,14 @@ class InsurerController extends BaseController if($group_id > 0) { $items = GroupT::getTree($group_id); - foreach($items as $group_info) { $group_ids[] = $group_info->id; } } - $query = OrderT::find() ->leftJoin('order_caiwu_t','order_caiwu_t.order_id=order_t.id') - ->where('order_caiwu_t.status_id>0') - ->orderBy('order_t.print_date asc'); + ->where('order_caiwu_t.status_id>0'); if($car_man != '') { $query->andWhere('id_man="'.$car_man.'"'); } @@ -1195,9 +1192,7 @@ class InsurerController extends BaseController continue; } } - $row[] = $user_info->id; - } //加上级别筛选 @@ -1205,8 +1200,15 @@ class InsurerController extends BaseController $query = $query->andWhere(['in','order_t.user_id',$row]); } $total = $query->count(); - - $query = $query->offset($offset)->limit($limit); + $query1 = clone $query; + $sums = $query1->select([ + 'sum_total1' => 'sum(order_t.total1)', + 'sum_total1_clear' => 'sum(order_t.total1_clear)', + 'sum_yuangong_money' => 'sum(order_t.yuangong_money)', + 'sum_non_total1_dis' => 'sum(order_t.non_total1_dis)', + 'sum_total1_dis' => 'sum(order_t.total1_dis)', + ])->asArray()->one(); + $query = $query->orderBy('order_t.print_date asc')->offset($offset)->limit($limit); $items = $query->all(); $data = []; @@ -1214,18 +1216,26 @@ class InsurerController extends BaseController $data['rows'] = []; foreach($items as $item) { $row = $item->toArray(); - $row['company_name'] = $item->company2->name; - $row['path'] = ($item->user && $item->user->group) ? $item->user->group->getPath():''; - $row['user_name'] = $item->user?$item->user->getShowName():''; - $row['total_user_real'] = number_format($item->total1_dis + $item->yuangong_money,2); + $row['company_name'] = $item->company2 ? $item->company2->name : ''; + $row['path'] = ($item->user && $item->user->group) ? $item->user->group->getPath() : ''; + $row['user_name'] = $item->user ? $item->user->getShowName() : ''; + $row['total_user_real'] = number_format($item->total1_dis + $item->yuangong_money, 2); $row['transfer_date'] = $item->caiwu->transfer_date; - $row['caiwu_status_name'] = $item->caiwu->caiwuStatus->name; + $row['caiwu_status_name'] = $item->caiwu && $item->caiwu->caiwuStatus ? $item->caiwu->caiwuStatus->name : ''; $row['shoufei_name'] = MyLib::zhifufs($item->shoufei_id); - $row['status_name'] = $item->caiwu->status->name; + $row['status_name'] = $item->caiwu && $item->caiwu->status ? $item->caiwu->status->name : ''; $row['lock_man'] = $item->caiwu->lock?$item->caiwu->lock->getShowName():''; $data['rows'][] = $row; } + $data['rows'][] = array( + ['商业保总额', number_format($sums['sum_total1'],2)], + ['商业净保总额', number_format($sums['sum_total1_clear'],2)], + ['业务自付', number_format($sums['sum_yuangong_money'],2)], + ['公司代付非车险', number_format($sums['sum_non_total1_dis'],2)], + ['公司返金额', number_format($sums['sum_total1_dis'],2)], + ['实返现金额', number_format($sums['sum_yuangong_money'] + $sums['sum_total1_dis'],2)] + ); return $data; } diff --git a/frontend/views/car/info-track.php b/frontend/views/car/info-track.php index 40924d0..0564905 100644 --- a/frontend/views/car/info-track.php +++ b/frontend/views/car/info-track.php @@ -39,7 +39,7 @@ use \common\libs\MyLib; 车架号 car_frame_no?> 车辆使用性质 - carUse->name?> + carUse?$car_info->carUse->name:''?> 车主 diff --git a/frontend/views/finance/budian-list.php b/frontend/views/finance/budian-list.php index 545eb59..4cc1f29 100644 --- a/frontend/views/finance/budian-list.php +++ b/frontend/views/finance/budian-list.php @@ -40,8 +40,6 @@ use \common\libs\MyLib; id.'"'; - if($item->id == $company_id) - echo ' selected '; echo '>'.$item->name.''; } ?> @@ -126,6 +124,19 @@ use \common\libs\MyLib; o['offset'] = params['offset']; o['limit'] = params['limit']; return o; + }, + responseHandler: function (res) { + var totals = res.rows.pop(); + var html = ''; + $.each(totals,function (i,d) { + html += '
' + + ''+ d[0] +'：' + + ''+ d[1] +'' + + '
' + }); + html += ''; + $('#listTable').append(html); + return res; } }); return false; diff --git a/frontend/views/insurer/finance-mng.php b/frontend/views/insurer/finance-mng.php index 851d9e8..16152aa 100644 --- a/frontend/views/insurer/finance-mng.php +++ b/frontend/views/insurer/finance-mng.php @@ -112,6 +112,19 @@ use \common\libs\MyLib; o['limit'] = params['limit']; o['offset'] = params['offset']; return o; + }, + responseHandler: function (res) { + var totals = res.rows.pop(); + var html = ''; + $.each(totals,function (i,d) { + html += '
' + + ''+ d[0] +'：' + + ''+ d[1] +'' + + '
' + }); + html += ''; + $('#listTable').append(html); + return res; } }); return false; From 218364f3e287d6523d3e598ecc91b82c7132a366 Mon Sep 17 00:00:00 2001 From: zhaocheng <578322713@qq.com> Date: Thu, 7 Nov 2019 14:28:21 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=BD=A6=E9=99=A9=E6=8F=90=E6=88=90?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/FinanceController.php | 46 +++++++++++----------- frontend/views/finance/ticheng-jisuan.php | 13 ++++++ 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php index 95d9ce0..c47d899 100644 --- a/frontend/controllers/FinanceController.php +++ b/frontend/controllers/FinanceController.php @@ -6812,30 +6812,30 @@ class FinanceController extends \frontend\controllers\UserBaseController } $yuangong_money_all += $yuangong_money; } - - $yewu_ticheng_all = 0; - $total1_clear_all = 0; - $yeji_ticheng_all = 0; - $ticheng_money_all = 0; - $lipin_all = 0; - $liquan_all = 0; - $yuangong_money_all = 0; $query1 = clone $query; $sums = $query1->select([ 'sum_total1_clear' => 'sum(order_caiwi_t.total1_clear)', - 'sum_yewu_ticheng' => 'sum(order_caiwi_t.yewu_ticheng)', + 'sum_total2_clear' => 'sum(order_caiwi_t.total2_clear)', 'sum_yeji_ticheng' => 'sum(order_caiwi_t.yeji_ticheng)', 'sum_ticheng_money' => 'sum(order_caiwi_t.ticheng_money)', 'sum_yuangong_money' => 'sum(order_caiwi_t.yuangong_money)', + 'sum_yewu_ticheng' => 'sum(order_caiwi_t.yewu_ticheng)', ])->asArray()->one(); $query2 = clone $query; -// $gift_sums = $query2 -// ->leftJoin(OrderGiftT::tableName(), "order_gift_t.order_id=caiwu_t.order_id") -// ->leftJoin(GiftT::tableName(), "gift_t.id=order_t.gift_id") -// ->groupBy('caiwu_t.id') -// ->select([ -// 'sum_no_free_gift' => 'sum(order_caiwi_t.total1_clear)', -// ])->asArray()->one(); + $gift_sum = $query2 + ->leftJoin(OrderGiftT::tableName(), "order_gift_t.order_id=caiwu_t.order_id") + ->leftJoin(GiftT::tableName(), "gift_t.id=order_t.gift_id") + ->where('order_gift_t.gift_type=1 && order_gift_t.is_free=2') + ->select([ + 'sum_gift' => 'sum(gift_t.price)', + ])->one(); + $voucher_sum = $query2 + ->leftJoin(OrderGiftT::tableName(), "order_gift_t.order_id=caiwu_t.order_id") + ->leftJoin(GiftT::tableName(), "gift_t.id=order_t.gift_id") + ->where('order_gift_t.gift_type=2 && order_gift_t.is_free=2') + ->select([ + 'sum_gift' => 'sum(gift_t.price)', + ])->one(); $total = $query->count(); $query=$query->offset($offset)->limit($limit); @@ -6881,14 +6881,14 @@ class FinanceController extends \frontend\controllers\UserBaseController $data['rows'][] = $row; } $data['rows'][] = array( - ['保费总额', number_format($sums['sum_total1'],2)], + ['保费总额', number_format($sums['sum_total1_clear'] + $sums['sum_total2_clear'],2)], ['商业净保总额', number_format($sums['sum_total1_clear'],2)], - ['基本提成合计', number_format($sums['sum_yuangong_money'],2)], - ['加点提成合计', number_format($sums['sum_non_total1_dis'],2)], - ['自费礼品合计', number_format($sums['sum_total1_dis'],2)], - ['自费礼券合计', number_format($sums['sum_yuangong_money'] + $sums['sum_total1_dis'],2)], - ['自费减免合计', number_format($sums['sum_yuangong_money'] + $sums['sum_total1_dis'],2)], - ['提成合计', number_format($sums['sum_yuangong_money'] + $sums['sum_total1_dis'],2)] + ['基本提成合计', number_format($sums['sum_yeji_ticheng'],2)], + ['加点提成合计', number_format($sums['sum_ticheng_money'],2)], + ['自费礼品合计', number_format($sums['$gift_sum'],2)], + ['自费礼券合计', number_format($sums['$voucher_sum'],2)], + ['自费减免合计', number_format($sums['sum_yuangong_money'],2)], + ['提成合计', number_format($sums['sum_yewu_ticheng'],2)] ); return $data; } diff --git a/frontend/views/finance/ticheng-jisuan.php b/frontend/views/finance/ticheng-jisuan.php index fb6762d..7c18356 100644 --- a/frontend/views/finance/ticheng-jisuan.php +++ b/frontend/views/finance/ticheng-jisuan.php @@ -209,6 +209,19 @@ use \common\libs\MyLib; o['offset'] = params['offset']; o['limit'] = params['limit']; return o; + }, + responseHandler: function (res) { + var totals = res.rows.pop(); + var html = ''; + $.each(totals,function (i,d) { + html += '
' + + ''+ d[0] +'：' + + ''+ d[1] +'' + + '
' + }); + html += ''; + $('#listTable').append(html); + return res; } }); return false; From 8f42d2e07dba1fa0b19605f763cc566f830c29a0 Mon Sep 17 00:00:00 2001 From: zhaocheng <578322713@qq.com> Date: Thu, 7 Nov 2019 16:50:04 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E9=A1=B9=E5=90=88?= =?UTF-8?q?=E8=AE=A1=EF=BC=8C=E5=B7=AE=E5=88=A9=E6=B6=A6=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/FinanceController.php | 85 ++++++++++---------- frontend/views/finance/chuna-gongzi-list.php | 13 +++ frontend/views/finance/gongzi-all-list.php | 13 +++ frontend/views/finance/pay2-list.php | 13 +++ frontend/views/finance/ticheng-jisuan.php | 2 +- frontend/views/insurer/office-mng-edit.php | 2 +- 6 files changed, 85 insertions(+), 43 deletions(-) diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php index c47d899..00e5bba 100644 --- a/frontend/controllers/FinanceController.php +++ b/frontend/controllers/FinanceController.php @@ -5154,12 +5154,20 @@ class FinanceController extends \frontend\controllers\UserBaseController $row['is_leave'] = $item->is_leave ? '已离职':''; $pay_info = $item->getPay($pay_date); $row['status_name'] = $pay_info ? $pay_info->getStatus($pay_info->status_id) : ''; - $row['real_pay'] = $pay_info->base_real_pay; - $row['should_pay'] = $pay_info->ticheng_real_pay; - $row['is_show'] = ($pay_info->renshi_status_id > 0 && $pay_info->chuna_status_id > 0 && $pay_info->status_id != 7 && $pay_info->status_id != 8) ? 1 : 0; + $row['real_pay'] = $pay_info ? $pay_info->base_real_pay : ''; + $row['should_pay'] = $pay_info ? $pay_info->ticheng_real_pay : ''; + $row['is_show'] = $pay_info && ($pay_info->renshi_status_id > 0 && $pay_info->chuna_status_id > 0 && $pay_info->status_id != 7 && $pay_info->status_id != 8) ? 1 : 0; $data['rows'][] = $row; } + $pay_chexian = PayT::find() + ->where("pay_date='{$pay_date}'") + ->sum('ticheng_real_pay'); + + $data['rows'][] = array( + ['提成工资总额', number_format($pay_chexian,2)], + ); + return $data; } @@ -6789,53 +6797,33 @@ class FinanceController extends \frontend\controllers\UserBaseController if($insurer_type ==1){ $query->andWhere('caiwu_t.insurer_type=1'); } - $items = $query->all(); - $yewu_ticheng_all = 0; - $total1_clear_all = 0; - $yeji_ticheng_all = 0; - $ticheng_money_all = 0; - $lipin_all = 0; - $liquan_all = 0; - $yuangong_money_all = 0; - foreach($items as $index => $item) { - $order_caiwu_info = $item->orderCaiwu; - $order_info = $item->order; - $total1_clear_all += $item->total_clear; - $yewu_ticheng_all += $order_caiwu_info ? $order_caiwu_info->yewu_ticheng : 0; - $yeji_ticheng_all += $order_caiwu_info ? $order_caiwu_info->yeji_ticheng : 0; - $ticheng_money_all += $order_info ? $order_info->ticheng_money : 0; - $lipin_all += $order_info ? $order_info->getGiftPrice(1,1) : 0; - $liquan_all += $order_info ? $order_info->getGiftPrice(1,2) : 0; - $yuangong_money = 0; - if($order_info){ - $yuangong_money = $order_info->yuangong_money>0?$order_info->yuangong_money:0; - } - $yuangong_money_all += $yuangong_money; - } $query1 = clone $query; - $sums = $query1->select([ - 'sum_total1_clear' => 'sum(order_caiwi_t.total1_clear)', - 'sum_total2_clear' => 'sum(order_caiwi_t.total2_clear)', - 'sum_yeji_ticheng' => 'sum(order_caiwi_t.yeji_ticheng)', - 'sum_ticheng_money' => 'sum(order_caiwi_t.ticheng_money)', - 'sum_yuangong_money' => 'sum(order_caiwi_t.yuangong_money)', - 'sum_yewu_ticheng' => 'sum(order_caiwi_t.yewu_ticheng)', - ])->asArray()->one(); + $sums = $query1 + ->leftJoin(OrderCaiwuT::tableName(), "order_t.id=order_caiwu_t.order_id") + ->select([ + 'sum_total1_clear' => 'sum(order_t.total1_clear)', + 'sum_total2_clear' => 'sum(order_t.total2_clear)', + 'sum_yeji_ticheng' => 'sum(order_caiwu_t.yeji_ticheng)', + 'sum_ticheng_money' => 'sum(order_caiwu_t.ticheng_money)', + 'sum_yuangong_money' => 'sum(order_caiwu_t.yuangong_money)', + 'sum_yewu_ticheng' => 'sum(order_caiwu_t.yewu_ticheng)', + ])->asArray()->one(); $query2 = clone $query; $gift_sum = $query2 ->leftJoin(OrderGiftT::tableName(), "order_gift_t.order_id=caiwu_t.order_id") - ->leftJoin(GiftT::tableName(), "gift_t.id=order_t.gift_id") + ->leftJoin(GiftT::tableName(), "gift_t.id=order_gift_t.gift_id") ->where('order_gift_t.gift_type=1 && order_gift_t.is_free=2') ->select([ 'sum_gift' => 'sum(gift_t.price)', - ])->one(); + ])->asArray()->one(); + $query2 = clone $query; $voucher_sum = $query2 ->leftJoin(OrderGiftT::tableName(), "order_gift_t.order_id=caiwu_t.order_id") - ->leftJoin(GiftT::tableName(), "gift_t.id=order_t.gift_id") + ->leftJoin(GiftT::tableName(), "gift_t.id=order_gift_t.gift_id") ->where('order_gift_t.gift_type=2 && order_gift_t.is_free=2') ->select([ 'sum_gift' => 'sum(gift_t.price)', - ])->one(); + ])->asArray()->one(); $total = $query->count(); $query=$query->offset($offset)->limit($limit); @@ -6885,8 +6873,8 @@ class FinanceController extends \frontend\controllers\UserBaseController ['商业净保总额', number_format($sums['sum_total1_clear'],2)], ['基本提成合计', number_format($sums['sum_yeji_ticheng'],2)], ['加点提成合计', number_format($sums['sum_ticheng_money'],2)], - ['自费礼品合计', number_format($sums['$gift_sum'],2)], - ['自费礼券合计', number_format($sums['$voucher_sum'],2)], + ['自费礼品合计', number_format($gift_sum['sum_gift'],2)], + ['自费礼券合计', number_format($voucher_sum['sum_gift'],2)], ['自费减免合计', number_format($sums['sum_yuangong_money'],2)], ['提成合计', number_format($sums['sum_yewu_ticheng'],2)] ); @@ -7403,6 +7391,9 @@ class FinanceController extends \frontend\controllers\UserBaseController $query = $query->offset($offset)->limit($limit); $items = $query->all(); + $pay_chexian = PayOrderUserT::find() + ->where("pay_date='{$pay_date}'") + ->sum('real_pay'); $data = []; $data['total'] = $total; @@ -7418,6 +7409,10 @@ class FinanceController extends \frontend\controllers\UserBaseController $data['rows'][] = $row; } + $data['rows'][] = array( + ['提成工资总额', number_format($pay_chexian,2)], + ); + return $data; } /** @@ -7609,7 +7604,6 @@ class FinanceController extends \frontend\controllers\UserBaseController $limit = $request->get('limit', 10); $user_id = $this->my->id; -// var_dump($user_id); $query = UserT::find() ->leftJoin('pay_t','pay_t.user_id=user_t.id') ->where('group_id>0 and is_delete=0'); @@ -7650,8 +7644,17 @@ class FinanceController extends \frontend\controllers\UserBaseController $data['rows'][] = $row; } + $pay_chexian = PayT::find() + ->where("pay_date='{$pay_date}'") + ->sum('ticheng_real_pay'); + + $data['rows'][] = array( + ['提成工资总额', number_format($pay_chexian,2)], + ); + return $data; } + /** * 出纳工资-详情 * @return string diff --git a/frontend/views/finance/chuna-gongzi-list.php b/frontend/views/finance/chuna-gongzi-list.php index 4ad3eac..447e9e9 100644 --- a/frontend/views/finance/chuna-gongzi-list.php +++ b/frontend/views/finance/chuna-gongzi-list.php @@ -125,6 +125,19 @@ use \common\libs\MyLib; o['offset'] = params['offset']; o['limit'] = params['limit']; return o; + }, + responseHandler: function (res) { + var totals = res.rows.pop(); + var html = ''; + $.each(totals,function (i,d) { + html += '
' + + ''+ d[0] +'：' + + ''+ d[1] +'' + + '
' + }); + html += ''; + $('#listTable').append(html); + return res; } }); return false; diff --git a/frontend/views/finance/gongzi-all-list.php b/frontend/views/finance/gongzi-all-list.php index c7429c1..a0293da 100644 --- a/frontend/views/finance/gongzi-all-list.php +++ b/frontend/views/finance/gongzi-all-list.php @@ -128,6 +128,19 @@ use \common\libs\MyLib; o['offset'] = params['offset']; o['limit'] = params['limit']; return o; + }, + responseHandler: function (res) { + var totals = res.rows.pop(); + var html = ''; + $.each(totals,function (i,d) { + html += '
' + + ''+ d[0] +'：' + + ''+ d[1] +'' + + '
' + }); + html += ''; + $('#listTable').append(html); + return res; } }); return false; diff --git a/frontend/views/finance/pay2-list.php b/frontend/views/finance/pay2-list.php index 3f5a1d8..3a9eca6 100644 --- a/frontend/views/finance/pay2-list.php +++ b/frontend/views/finance/pay2-list.php @@ -128,6 +128,19 @@ use \common\libs\MyLib; o['offset'] = params['offset']; o['limit'] = params['limit']; return o; + }, + responseHandler: function (res) { + var totals = res.rows.pop(); + var html = ''; + $.each(totals,function (i,d) { + html += '
' + + ''+ d[0] +'：' + + ''+ d[1] +'' + + '
' + }); + html += ''; + $('#listTable').append(html); + return res; } }); return false; diff --git a/frontend/views/finance/ticheng-jisuan.php b/frontend/views/finance/ticheng-jisuan.php index 7c18356..eea1f47 100644 --- a/frontend/views/finance/ticheng-jisuan.php +++ b/frontend/views/finance/ticheng-jisuan.php @@ -212,7 +212,7 @@ use \common\libs\MyLib; }, responseHandler: function (res) { var totals = res.rows.pop(); - var html = ''; + var html = ''; $.each(totals,function (i,d) { html += '
' + ''+ d[0] +'：' + diff --git a/frontend/views/insurer/office-mng-edit.php b/frontend/views/insurer/office-mng-edit.php index f808fb0..4b6cc10 100644 --- a/frontend/views/insurer/office-mng-edit.php +++ b/frontend/views/insurer/office-mng-edit.php @@ -227,7 +227,7 @@ use common\models\PriceT; id.'"'; - if($item->id == $order_info->company_id) + if($item->id == $order_info->company2_id) echo ' selected '; echo '>'.$item->name.''; } From 8521cc78f74f15e9452d2b474dcafd638583b7fc Mon Sep 17 00:00:00 2001 From: zhaocheng <578322713@qq.com> Date: Fri, 8 Nov 2019 09:25:55 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E8=A1=A8=E6=80=BB?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/FinanceController.php | 145 ++++++++++----------- frontend/views/finance/receipt-lirun.php | 13 ++ 2 files changed, 84 insertions(+), 74 deletions(-) diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php index fae5ebf..c4f09ee 100644 --- a/frontend/controllers/FinanceController.php +++ b/frontend/controllers/FinanceController.php @@ -6812,19 +6812,14 @@ class FinanceController extends \frontend\controllers\UserBaseController $gift_sum = $query2 ->leftJoin(OrderGiftT::tableName(), "order_gift_t.order_id=caiwu_t.order_id") ->leftJoin(GiftT::tableName(), "gift_t.id=order_gift_t.gift_id") - ->where('order_gift_t.gift_type=1 && order_gift_t.is_free=2') - ->select([ - 'sum_gift' => 'sum(gift_t.price)', - ])->asArray()->one(); + ->andWhere('order_gift_t.gift_type=1 && order_gift_t.is_free=2') + ->sum('gift_t.price'); $query2 = clone $query; $voucher_sum = $query2 ->leftJoin(OrderGiftT::tableName(), "order_gift_t.order_id=caiwu_t.order_id") ->leftJoin(GiftT::tableName(), "gift_t.id=order_gift_t.gift_id") - ->where('order_gift_t.gift_type=2 && order_gift_t.is_free=2') - ->select([ - 'sum_gift' => 'sum(gift_t.price)', - ])->asArray()->one(); - + ->andWhere('order_gift_t.gift_type=2 && order_gift_t.is_free=2') + ->sum('gift_t.price'); $total = $query->count(); $query=$query->offset($offset)->limit($limit); $items = $query->orderBy('order_t.print_date DESC')->all(); @@ -6873,8 +6868,8 @@ class FinanceController extends \frontend\controllers\UserBaseController ['商业净保总额', number_format($sums['sum_total1_clear'],2)], ['基本提成合计', number_format($sums['sum_yeji_ticheng'],2)], ['加点提成合计', number_format($sums['sum_ticheng_money'],2)], - ['自费礼品合计', number_format($gift_sum['sum_gift'],2)], - ['自费礼券合计', number_format($voucher_sum['sum_gift'],2)], + ['自费礼品合计', number_format($gift_sum,2)], + ['自费礼券合计', number_format($voucher_sum,2)], ['自费减免合计', number_format($sums['sum_yuangong_money'],2)], ['提成合计', number_format($sums['sum_yewu_ticheng'],2)] ); @@ -7817,14 +7812,9 @@ class FinanceController extends \frontend\controllers\UserBaseController $zbname = $request->get('zbname'); //级别 $group_id = $request->get('group_id'); - $group_items = GroupT::getTree((int)$this->my->group_id); - if($this->my->id == 1) - $group_items = GroupT::getTree(); $group_ids[] = $group_id; - if($group_id > 0) { $items = GroupT::getTree($group_id); - foreach($items as $group_info) { $group_ids[] = $group_info->id; } @@ -7833,70 +7823,33 @@ class FinanceController extends \frontend\controllers\UserBaseController $query = CaiwuT::find() ->leftJoin(OrderT::tableName(), "order_t.id=caiwu_t.order_id") ->where('order_t.status_id>1'); - - switch ($sort_key) { - case 'total': - $sort = 'caiwu_t.total '; - break; - case 'total_clear': - $sort = 'caiwu_t.total_clear '; - break; - case 'total_rate': - $sort = 'caiwu_t.total_rate '; - break; - case 'print_date'://默认按照print_date排序 - default: - $sort = 'order_t.print_date '; - break; - } - - switch ($sort_value) { - case 'ASC': - $sort .= 'ASC'; - break; - case 'DESC': - default: - $sort .= 'DESC'; - break; - } - - $query->orderBy($sort); - if( $insurer_type != 0) { $query->andWhere('caiwu_t.insurer_type='.$insurer_type); } - if( $company_id > 0) { $query->andWhere('order_t.company2_id='.$company_id); } if ($username != "") { -// $userdata = UserT::findOne(['username'=>$username]); $userdata = UserT::find()->where('username="'.$username.'"')->andwhere('is_leave=0')->one(); if($userdata){ $query->andWhere('caiwu_t.user_id = ' . $userdata->id . ''); } } - if ($hebaoname != "") { -// $userdata = UserT::findOne(['username'=>$username]); $userdata = UserT::find()->where('username="'.$hebaoname.'"')->andwhere('is_leave=0')->one(); if($userdata){ $query->andWhere('order_t.op1_id = ' . $userdata->id . ''); } } - if ($zbname != "") { -// $userdata = UserT::findOne(['username'=>$username]); $userdata = UserT::find()->where('username="'.$zbname.'"')->andwhere('is_leave=0')->one(); if($userdata){ $query->andWhere('order_t.op2_id = ' . $userdata->id . ''); } } - if ($car_no != "") { $query->andWhere('caiwu_t.car_no like "%' . $car_no . '%"'); } - if ($insurer_no != "") { $query->andWhere('caiwu_t.insurer_no like "' . $insurer_no . '%"'); } @@ -7926,10 +7879,8 @@ class FinanceController extends \frontend\controllers\UserBaseController //找出$group_id 有多少在职的user_ids // 现在的搜索条件 $userSql = ''; - $user_items = $this->my->getChildren($userSql); $user_items[] = $this->my; - $row = array(); foreach($user_items as $user_info) { if ($group_id > 0) { @@ -7937,36 +7888,71 @@ class FinanceController extends \frontend\controllers\UserBaseController continue; } } - $row[] = $user_info->id; - } - //加上级别筛选 if($group_id > 0){ $query->andWhere(['in','caiwu_t.user_id',$row]); } - - $query1 = clone $query; - - $item1s = $query1->all(); - -// echo $query->createCommand()->rawSql; $total = $query->count(); - $sum_r_total = $query->sum('r_total'); - //商业净保费综合 - $sum_total_clear = $query->sum('total_clear'); //是错误的 - - //商业总保费 - $sum_total = $query->sum('total'); + $query1 = clone $query; + $sums = $query1->select([ + 'sum_total1' => 'sum(order_t.total1)', + 'sum_r_total' => 'sum(caiwu_t.r_total)', + 'sum_total1_clear' => 'sum(order_t.total1_clear)', + 'sum_budian' => 'sum(order_t.yuangong_money)', + 'sum_r_budian' => 'sum(ifnull(caiwu_t.budian_rate,0)*total_clear/100)', + 'sum_total1_dis' => 'sum(order_t.total1_dis)', + ])->asArray()->one(); + $query2 = clone $query; + $gift_sum = $query2 + ->leftJoin(OrderGiftT::tableName(), "order_gift_t.order_id=caiwu_t.order_id") + ->leftJoin(GiftT::tableName(), "gift_t.id=order_gift_t.gift_id") + ->andWhere('caiwu_t.insurer_type=1') + ->andWhere('order_gift_t.gift_type=1 && order_gift_t.is_free=2') + ->sum('gift_t.price'); + $query2 = clone $query; + $voucher_sum = $query2 + ->leftJoin(OrderGiftT::tableName(), "order_gift_t.order_id=caiwu_t.order_id") + ->leftJoin(GiftT::tableName(), "gift_t.id=order_gift_t.gift_id") + ->andWhere('caiwu_t.insurer_type=1') + ->andWhere('order_gift_t.gift_type=2 && order_gift_t.is_free=2') + ->sum('gift_t.price'); + $query2 = clone $query; + $gongzi_sum = $query2 + ->leftJoin(PayOrderUserT::tableName(), "pay_order_user_t.order_id=caiwu_t.order_id") + ->andWhere('caiwu_t.insurer_type=1') + ->sum('pay_order_user_t.real_pay'); - $sum_total_dis = $query->sum('total_dis'); + switch ($sort_key) { + case 'total': + $sort = 'caiwu_t.total '; + break; + case 'total_clear': + $sort = 'caiwu_t.total_clear '; + break; + case 'total_rate': + $sort = 'caiwu_t.total_rate '; + break; + case 'print_date'://默认按照print_date排序 + default: + $sort = 'order_t.print_date '; + break; + } + switch ($sort_value) { + case 'ASC': + $sort .= 'ASC'; + break; + case 'DESC': + default: + $sort .= 'DESC'; + break; + } - $query = $query->offset($offset)->limit($limit); + $query = $query->orderBy($sort)->offset($offset)->limit($limit); $items = $query->all(); -// var_dump($items); $data = []; $data['total'] = $total; $data['rows'] = []; @@ -7999,8 +7985,19 @@ class FinanceController extends \frontend\controllers\UserBaseController $data['rows'][] = $row; } - return $data; + $data['rows'][] = array( + ['商业保总额', number_format($sums['sum_total1'],2)], + ['商业净保总额', number_format($sums['sum_total1_clear'],2)], + ['回款总额', number_format($sums['sum_r_total'],2)], + ['补点总额', number_format($sums['sum_budian'],2)], + ['回款补点总额', number_format($sums['sum_r_budian'],2)], + ['减免总额', number_format($sums['sum_total1_dis'],2)], + ['礼品礼券自费总额', number_format($gift_sum + $voucher_sum,2)], + ['工资总额', number_format($gongzi_sum,2)], + ['利润总额', number_format($sums['sum_total1_clear'] + $sums['sum_budian'] - $sums['sum_total1_dis'] - $gongzi_sum - $gift_sum - $voucher_sum,2)], + ); + return $data; } public function actionGongziAllReturnSave() diff --git a/frontend/views/finance/receipt-lirun.php b/frontend/views/finance/receipt-lirun.php index 450122c..4582a22 100644 --- a/frontend/views/finance/receipt-lirun.php +++ b/frontend/views/finance/receipt-lirun.php @@ -145,6 +145,19 @@ use \common\libs\MyLib; o['offset'] = params['offset']; o['limit'] = params['limit']; return o; + }, + responseHandler: function (res) { + var totals = res.rows.pop(); + var html = ''; + $.each(totals,function (i,d) { + html += '
' + + ''+ d[0] +'：' + + ''+ d[1] +'' + + '
' + }); + html += ''; + $('#listTable').append(html); + return res; } }); return false; From 0488b0481fed7fc5157d4b95fa070c45a2e523a6 Mon Sep 17 00:00:00 2001 From: zhaocheng <578322713@qq.com> Date: Fri, 8 Nov 2019 09:37:08 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E8=A1=A8=E6=80=BB?= =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/finance/budian-list.php | 1 + frontend/views/finance/chuna-gongzi-list.php | 1 + frontend/views/finance/gongzi-all-list.php | 1 + frontend/views/finance/pay2-list.php | 1 + frontend/views/finance/receipt-lirun.php | 1 + frontend/views/finance/receipt.php | 1 + frontend/views/finance/ticheng-jisuan.php | 1 + frontend/views/insurer/finance-mng.php | 1 + 8 files changed, 8 insertions(+) diff --git a/frontend/views/finance/budian-list.php b/frontend/views/finance/budian-list.php index 21be2f5..5861f86 100644 --- a/frontend/views/finance/budian-list.php +++ b/frontend/views/finance/budian-list.php @@ -135,6 +135,7 @@ use \common\libs\MyLib; '
' }); html += ''; + $('#listTable').find('tfoot').remove(); $('#listTable').append(html); return res; } diff --git a/frontend/views/finance/chuna-gongzi-list.php b/frontend/views/finance/chuna-gongzi-list.php index 2047713..38ad88f 100644 --- a/frontend/views/finance/chuna-gongzi-list.php +++ b/frontend/views/finance/chuna-gongzi-list.php @@ -136,6 +136,7 @@ use \common\libs\MyLib; '
' }); html += ''; + $('#listTable').find('tfoot').remove(); $('#listTable').append(html); return res; } diff --git a/frontend/views/finance/gongzi-all-list.php b/frontend/views/finance/gongzi-all-list.php index 646db63..0f2f957 100644 --- a/frontend/views/finance/gongzi-all-list.php +++ b/frontend/views/finance/gongzi-all-list.php @@ -139,6 +139,7 @@ use \common\libs\MyLib; '' }); html += ''; + $('#listTable').find('tfoot').remove(); $('#listTable').append(html); return res; } diff --git a/frontend/views/finance/pay2-list.php b/frontend/views/finance/pay2-list.php index 38c3441..a1ea401 100644 --- a/frontend/views/finance/pay2-list.php +++ b/frontend/views/finance/pay2-list.php @@ -139,6 +139,7 @@ use \common\libs\MyLib; '' }); html += ''; + $('#listTable').find('tfoot').remove(); $('#listTable').append(html); return res; } diff --git a/frontend/views/finance/receipt-lirun.php b/frontend/views/finance/receipt-lirun.php index 4582a22..04fcf0c 100644 --- a/frontend/views/finance/receipt-lirun.php +++ b/frontend/views/finance/receipt-lirun.php @@ -156,6 +156,7 @@ use \common\libs\MyLib; '' }); html += ''; + $('#listTable').find('tfoot').remove(); $('#listTable').append(html); return res; } diff --git a/frontend/views/finance/receipt.php b/frontend/views/finance/receipt.php index ffab537..7d3bd69 100644 --- a/frontend/views/finance/receipt.php +++ b/frontend/views/finance/receipt.php @@ -156,6 +156,7 @@ use \common\libs\MyLib; '' }); html += ''; + $('#listTable').find('tfoot').remove(); $('#listTable').append(html); return res; } diff --git a/frontend/views/finance/ticheng-jisuan.php b/frontend/views/finance/ticheng-jisuan.php index 6e9c548..a419f19 100644 --- a/frontend/views/finance/ticheng-jisuan.php +++ b/frontend/views/finance/ticheng-jisuan.php @@ -220,6 +220,7 @@ use \common\libs\MyLib; '' }); html += ''; + $('#listTable').find('tfoot').remove(); $('#listTable').append(html); return res; } diff --git a/frontend/views/insurer/finance-mng.php b/frontend/views/insurer/finance-mng.php index 8611681..965ef94 100644 --- a/frontend/views/insurer/finance-mng.php +++ b/frontend/views/insurer/finance-mng.php @@ -134,6 +134,7 @@ use \common\libs\MyLib; '' }); html += ''; + $('#listTable').find('tfoot').remove(); $('#listTable').append(html); return res; } From 2d28f7e320821d17949ae586e3de6af778214b20 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Mon, 11 Nov 2019 15:31:29 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/InsurerController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/controllers/InsurerController.php b/frontend/controllers/InsurerController.php index 5b44fd8..a5977ad 100644 --- a/frontend/controllers/InsurerController.php +++ b/frontend/controllers/InsurerController.php @@ -3668,13 +3668,13 @@ class InsurerController extends BaseController ['quality' => 100]);//生成缩略图的质量 //图片打水印 $bianhao = '券号：' . $bianhao; - \yii\imagine\Image::text($liquanSrc, $bianhao, Yii::getAlias('@frontend/web/fonts/msyh.ttc'), [325, 85], ['color' => 'ffffff', 'size' => 14]) + \yii\imagine\Image::text($liquanSrc, $bianhao, Yii::getAlias('@frontend/web/fonts/msyh.ttc'), [27, 25], ['color' => '000000', 'size' => 14]) ->save(Yii::getAlias($imgstr)); - \yii\imagine\Image::text($imgstr, $car_no, Yii::getAlias('@frontend/web/fonts/msyh.ttc'), [900, 400], ['color' => 'ffffff', 'size' => 16]) + \yii\imagine\Image::text($imgstr, $car_no, Yii::getAlias('@frontend/web/fonts/msyh.ttc'), [425, 222], ['color' => '000000', 'size' => 16]) ->save(Yii::getAlias($imgstr)); - $panduan = \yii\imagine\Image::text($imgstr, $endDate, Yii::getAlias('@frontend/web/fonts/msyh.ttc'), [850, 440], ['color' => 'ffffff', 'size' => 16]) + $panduan = \yii\imagine\Image::text($imgstr, $endDate, Yii::getAlias('@frontend/web/fonts/msyh.ttc'), [425, 245], ['color' => '000000', 'size' => 16]) ->save(Yii::getAlias($imgstr)); }