diff --git a/common/models/OrderT.php b/common/models/OrderT.php
index 0eef000..a164d1d 100644
--- a/common/models/OrderT.php
+++ b/common/models/OrderT.php
@@ -35,16 +35,6 @@ use Yii;
* @property string $insurer2_begin_date
* @property string $insurer2_end_date
* @property string $send_date
- * @property string $direction_id
- * @property string $range1_id
- * @property string $city1_id
- * @property string $district1_id
- * @property string $send_address1
- * @property string $direction2_id
- * @property string $range2_id
- * @property string $city2_id
- * @property string $district2_id
- * @property string $send_address2
* @property integer $pay_type_id
* @property string $pay_no
* @property string $remark
@@ -110,9 +100,9 @@ class OrderT extends \common\models\Base
public function rules()
{
return [
- [['car_id', 'user_id', 'company_id', 'company2_id', 'status_id', 'pay_type_id','lock_id','range1_id','send_city_id','send_district_id','direction2_id','range2_id','city2_id','district2_id','success_id','return_status_id','return_time','first_send','send_times','check_gift','gift_type1_id','gift_type8_id','gift_type2_id','gift_type3_id','gift_type4_id','gift_type5_id','gift_type6_id','gift_type7_id','business_group_id','op1_id','op2_id','shoufei_id','payer','payee_id','hk_status','payment_id','account_status','insurance_status','el_insurance','ord_scheme_id','non_num','addr_id'], 'integer'],
+ [['car_id', 'user_id', 'company_id', 'company2_id', 'status_id', 'pay_type_id','lock_id','send_city_id','send_district_id','success_id','return_status_id','return_time','first_send','send_times','check_gift','gift_type1_id','gift_type8_id','gift_type2_id','gift_type3_id','gift_type4_id','gift_type5_id','gift_type6_id','gift_type7_id','business_group_id','op1_id','op2_id','shoufei_id','payer','payee_id','hk_status','payment_id','account_status','insurance_status','el_insurance','ord_scheme_id','non_num','addr_id'], 'integer'],
[['submit_date', 'insurer1_begin_date', 'insurer1_end_date', 'insurer2_begin_date', 'insurer2_end_date', 'send_date','print_date','zhifu_date', 'created_at', 'updated_at','insurer_date_start','insurer_date_end'], 'safe'],
- [['gift_other', 'id_man', 'id_man_number', 'id_man_type', 'id_man_phone', 'link_man', 'link_man_phone', 'link_man_type', 'link_man_number', 'send_address','send_address2','car_frame_no','car_man','total1','total1_clear','total1_real','total1_dis','total1_percent','total1_rate','total2','total2_clear','total2_rate','total3','total_all','total_real','price_remark','money_no','money_bank','email','return_remark','piao_header','photo_back','photo_face','tijiang'], 'string', 'max' => 100],
+ [['gift_other', 'id_man', 'id_man_number', 'id_man_type', 'id_man_phone', 'link_man', 'link_man_phone', 'link_man_type', 'link_man_number', 'send_address','car_frame_no','car_man','total1','total1_clear','total1_real','total1_dis','total1_percent','total1_rate','total2','total2_clear','total2_rate','total3','total_all','total_real','price_remark','money_no','money_bank','email','return_remark','piao_header','photo_back','photo_face','tijiang'], 'string', 'max' => 100],
[['car_no','engine_no','pay_no','insurer1_no','insurer2_no','identifying_code','money_man','insurer_non_no'], 'string', 'max' => 50],
[['remark'], 'string', 'max' => 200],
];
@@ -153,7 +143,6 @@ class OrderT extends \common\models\Base
'range2_id' => 'Range 2 ID',
'city2_id' => 'City 2 ID',
'district2_id' => 'District 2 ID',
- 'send_address2' => 'Send Address 2',
'pay_type_id' => 'Pay Type ID',
'pay_no' => 'Pay No',
'remark' => 'Remark',
diff --git a/common/models/PayT.php b/common/models/PayT.php
index 5602672..5179f7e 100644
--- a/common/models/PayT.php
+++ b/common/models/PayT.php
@@ -154,33 +154,23 @@ class PayT extends \common\models\Base
}else{
$this->should_pay = 0;
$this->real_pay = 0;
- $this->save();
+ if(!$this->save()) {
+ throw new \Exception(print_r($this->getErrors(), true));
+ }
return;
}
if($worktype == 0){
$this->should_pay = 0;
$this->real_pay = 0;
- $this->save();
+ if(!$this->save()) {
+ throw new \Exception(print_r($this->getErrors(), true));
+ }
return;
}
$ext_day_pay = 0;
-// if($group_info) {
-// $ext_day_pay = ($group_info->base_pay + $group_info->job_pay + $group_info->station_pay + $user_info->ext_pay)/$worktype;
-// } else {
-// $ext_day_pay = $user_info->ext_pay / $worktype;
-// }
$ext_day_pay = $this->formal_pay / $worktype;
-// var_dump($workday);
-// var_dump($this->formal_pay);
-// var_dump($worktype);
-// var_dump($this->attendance_days);
-
-
-
-// die;
-// $try_day_pay = $user_info->try_pay / $worktype;
$try_day_pay = $this->try_pay / $worktype;
$should_pay = 0;
@@ -196,12 +186,6 @@ class PayT extends \common\models\Base
$should_pay += $this->bonus;
$should_pay += $this->get_pass_time_pay;
$should_pay += $this->get_full_attendance_pay;
-//echo $should_pay;
-// $should_pay += $this->turnover;
-
-// if($group_info){
-// $should_pay += $group_info->base_pay + $group_info->job_pay + $group_info->station_pay;
-// }
$this->should_pay = $should_pay;
$real_pay = $should_pay - $this->late_pay;
@@ -228,7 +212,10 @@ class PayT extends \common\models\Base
$this->real_pay = $real_pay;
- $this->save();
+ if(!$this->save()) {
+ throw new \Exception(print_r($this->getErrors(), true));
+ }
+ return true;
}
/**
diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php
index aead6db..d2bd428 100644
--- a/frontend/controllers/FinanceController.php
+++ b/frontend/controllers/FinanceController.php
@@ -57,7 +57,7 @@ class FinanceController extends \frontend\controllers\UserBaseController
public $layout = 'blue-main';
public function actionReceipt() {
- $insurer_company_items = InsurerCompanyT::find()->all();
+ $insurer_company_items = InsurerCompany2T::find()->all();
return $this->render('receipt',[
'insurer_company_items' => $insurer_company_items
@@ -127,7 +127,7 @@ class FinanceController extends \frontend\controllers\UserBaseController
$query = $query->orderBy($sort);
if( $company_id > 0) {
- $query->andWhere('order_t.company_id='.$company_id);
+ $query->andWhere('order_t.company2_id='.$company_id);
}
if ($username != "") {
$userdata = UserT::findOne(['username'=>$username]);
@@ -5098,57 +5098,62 @@ class FinanceController extends \frontend\controllers\UserBaseController
* 财务工资列表
* @return string
*/
- public function actionPay2List()
+ public function actionPay2List() {
+ $group_items = GroupT::getTree();
+ return $this->render('pay2-list',[
+ 'group_items' => $group_items
+ ]);
+ }
+ public function actionPay2ListJson()
{
+ Yii::$app->response->format = Response::FORMAT_JSON;
$request = Yii::$app->request;
$username = $request->get('username');
$name = $request->get('name');
$pay_date = $request->get('pay_date', date('Y-m'));
$group_id = $request->get('group_id', 0);
- $page = $request->get('page', 1);
+ $is_leave = $request->get('is_leave');
+ $offset = $request->get('offset', 0);
+ $limit = $request->get('limit', 10);
+
$user_id = $this->my->id;
-// var_dump($user_id);
$query = UserT::find()
->where('group_id>0 and is_delete=0');
if ($username != '') {
- $query = $query->andWhere('username like "' . $username . '"');
+ $query->andWhere('username like "' . $username . '"');
}
if ($name != '') {
- $query = $query->andWhere('name like "' . $name . '"');
+ $query->andWhere('name like "' . $name . '"');
}
if ($group_id > 0) {
- $query = $query->andWhere('group_id=' . $group_id);
+ $query->andWhere('group_id=' . $group_id);
}
- $query = $query->orderBy('username ASC,id ASC');
- $total = $query->count();
- $total_real_pay = 0;
- foreach ($query->each() as $item) {
- $pay_info = $item->getPay($pay_date);
- if ($pay_info)
- $total_real_pay += $pay_info->real_pay;
+ if($is_leave != '' ) {
+ $query->andWhere('is_leave='.$is_leave);
}
+ $query->orderBy('username ASC,id ASC');
+ $total = $query->count();
- $pagination = new Pagination(['totalCount' => $total, 'pageSize' => 20]);
- $pagination->setPage($page - 1);
-
- $query = $query->offset($pagination->offset)->limit($pagination->limit);
+ $query->offset($offset)->limit($limit);
$items = $query->all();
- $page_info = MyLib::getPageInfo($pagination);
-
- $group_items = GroupT::getTree();
+ $data = [];
+ $data['total'] = $total;
+ $data['rows'] = [];
+ foreach($items as $item) {
+ $row = $item->toArray();
+ $row['pay_date'] = $pay_date;
+ $row['group_name'] = $item->group ? $item->group->path : '';
+ $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;
+ $data['rows'][] = $row;
+ }
- return $this->render('pay2-list', [
- 'group_items' => $group_items,
- 'items' => $items,
- 'page_info' => $page_info,
- 'page' => $page,
- 'username' => $username,
- 'name' => $name,
- 'pay_date' => $pay_date,
- 'group_id' => $group_id,
- 'total_real_pay' => $total_real_pay
- ]);
+ return $data;
}
/**
@@ -5210,7 +5215,10 @@ class FinanceController extends \frontend\controllers\UserBaseController
->where('pay_date="' . $pay_date . '" and is_own=2 and type=8 and user_id=' . $user_id)
->orderBy('created_at asc');
-
+//原新保
+ $my_type0_query = PayOrderUserT::find()
+ ->where('pay_date="' . $pay_date . '" and type=1 and user_id=' . $user_id.' and is_own =0')
+ ->orderBy('created_at asc');
@@ -5237,6 +5245,7 @@ class FinanceController extends \frontend\controllers\UserBaseController
'user_info' => $user_info,
'group_info' => $group_info,
'pay_info' => $pay_info,
+ 'my_type0_query' => $my_type0_query,
'my_type1_query' => $my_type1_query,
'my_type3_query' => $my_type3_query,
'my_type5_query' => $my_type5_query,
@@ -5249,6 +5258,33 @@ class FinanceController extends \frontend\controllers\UserBaseController
'pay_order_users' => $pay_order_users
]);
}
+ public function actionPay2ReturnSave()
+ {
+ Yii::$app->response->format = Response::FORMAT_JSON;
+ $request = Yii::$app->request;
+ $result = array();
+ $result['success'] = false;
+ $result['msg'] = '保存失败';
+
+ $id = $request->post('id',0);
+ $status_id = $request->post('status_id',0);
+ $remark = $request->post('remark','');
+
+ $pay_info = PayT::findOne($id);
+
+ $pay_info->status_id = $status_id + 6;
+
+
+ $content = '财务:'.$this->my->showName.'退回'.$pay_info->pay_date.'工资';
+ $this->addUserLog($pay_info->id, $content,$remark);
+
+ if($pay_info->save()){
+ $result['success'] = true;
+ $result['msg'] = '保存成功';
+ }
+ return $result;
+ }
+
/**
* 工资管理详情保存
* @return array
@@ -5287,26 +5323,10 @@ class FinanceController extends \frontend\controllers\UserBaseController
$neqi_payids = $request->post('neqi_payids', array());
$should_pays5 = $request->post('should_pays5', array());
$rate5 = $request->post('rate5', array());
-// var_dump($rate5);
-//
-// var_dump($should_pays5);
-// die;
-// echo '
';
//内勤正本
$zhengben = $request->post('zhengben', array());
$should_pays6 = $request->post('should_pays6', array());
$rate6 = $request->post('rate6', array());
- //非车险销售
- $non_xiaoshou = $request->post('non_xiaoshou', array());
- $should_pays7 = $request->post('should_pays7', array());
- $rate7 = $request->post('rate7', array());
- //非车险核保
- $non_hebao = $request->post('non_hebao', array());
- $should_pays8 = $request->post('should_pays8', array());
- $rate8 = $request->post('rate8', array());
-// var_dump($zhengben);
-// var_dump($should_pays6);
-// die;
@@ -5337,11 +5357,15 @@ class FinanceController extends \frontend\controllers\UserBaseController
if ($caiwu_info) {
$caiwu_info->rate1 = $rate;
$caiwu_info->money1 = $my_should_pays1[$index];
- $caiwu_info->save();
+ if(!$caiwu_info->save()) {
+ throw new \Exception(print_r($caiwu_info->getErrors(), true));
+ }
}
$pay_order->should_pay = $my_should_pays1[$index];
$pay_order->real_pay = $my_real_pays1[$index];
- $pay_order->save();
+ if(!$pay_order->save()) {
+ throw new \Exception(print_r($pay_order->getErrors(), true));
+ }
}
//我的续保
foreach ($tc_my_payids_2 as $index => $id) {
@@ -5356,11 +5380,15 @@ class FinanceController extends \frontend\controllers\UserBaseController
if ($caiwu_info) {
$caiwu_info->rate3 = $rate;
$caiwu_info->money3 = $my_should_pays2[$index];
- $caiwu_info->save();
+ if(!$caiwu_info->save()) {
+ throw new \Exception(print_r($caiwu_info->getErrors(), true));
+ }
}
$pay_order->should_pay = $my_should_pays2[$index];
$pay_order->real_pay = $my_real_pays2[$index];
- $pay_order->save();
+ if(!$pay_order->save()) {
+ throw new \Exception(print_r($pay_order->getErrors(), true));
+ }
}
//我的提成
foreach ($tc_payids_1 as $index => $id) {
@@ -5374,11 +5402,15 @@ class FinanceController extends \frontend\controllers\UserBaseController
if ($caiwu_info) {
$caiwu_info->rate1 = $rate1[$index];
$caiwu_info->money1 = $should_pays1[$index];
- $caiwu_info->save();
+ if(!$caiwu_info->save()) {
+ throw new \Exception(print_r($caiwu_info->getErrors(), true));
+ }
}
$pay_order->should_pay = $should_pays1[$index];
$pay_order->real_pay = $real_pays1[$index];
- $pay_order->save();
+ if(!$pay_order->save()) {
+ throw new \Exception(print_r($pay_order->getErrors(), true));
+ }
}
foreach ($tc_payids_2 as $index => $id) {
$pay_order = PayOrderUserT::findOne(['id' => $id]);
@@ -5391,36 +5423,16 @@ class FinanceController extends \frontend\controllers\UserBaseController
if ($caiwu_info) {
$caiwu_info->rate2 = $rate2[$index];
$caiwu_info->money2 = $should_pays2[$index];
- $caiwu_info->save();
+ if(!$caiwu_info->save()) {
+ throw new \Exception(print_r($caiwu_info->getErrors(), true));
+ }
}
$pay_order->should_pay = $should_pays2[$index];
$pay_order->real_pay = $real_pays2[$index];
- $pay_order->save();
- }
- //送单提成
- foreach ($tc_send_payids as $index => $id) {
- $send_money = $send_moneys[$index];
- $pay_order = PayOrderUserT::findOne(['id' => $id]);
- if (!$pay_order) {
- $result['msg'] = '送单提成错误:' . $id . '=>' . $send_money;
- return $result;
+ if(!$pay_order->save()) {
+ throw new \Exception(print_r($pay_order->getErrors(), true));
}
- $order_info = $pay_order->order;
- $caiwu_info = $order_info->caiwu;
- if ($caiwu_info) {
- if ($order_info->total1_clear == 0) {
- $caiwu_info->send_rate = 0;
- } else {
- $caiwu_info->send_rate = round($send_money / $order_info->total1_clear * 100, 2);
- }
- $caiwu_info->send_money = $send_money;
- $caiwu_info->save();
- }
- $pay_order->should_pay = $send_money;
- $pay_order->real_pay = $send_money;
- $pay_order->save();
}
-
//核保
foreach ($neqi_payids as $index => $id) {
$pay_order = PayOrderUserT::findOne(['id' => $id]);
@@ -5434,11 +5446,15 @@ class FinanceController extends \frontend\controllers\UserBaseController
if(!isset($rate5[$index])) continue;
$caiwu_info->rate4 = $rate5[$index];
$caiwu_info->money4 = $should_pays5[$index];
- $caiwu_info->save();
+ if(!$caiwu_info->save()) {
+ throw new \Exception(print_r($caiwu_info->getErrors(), true));
+ }
}
$pay_order->should_pay = $should_pays5[$index];
$pay_order->real_pay = $should_pays5[$index];
- $pay_order->save();
+ if(!$pay_order->save()) {
+ throw new \Exception(print_r($pay_order->getErrors(), true));
+ }
}
//正本$neqi_payids1
foreach ($zhengben as $index => $id) {
@@ -5453,58 +5469,16 @@ class FinanceController extends \frontend\controllers\UserBaseController
if(!isset($rate6[$index])) continue;
$caiwu_info->rate5 = $rate6[$index];
$caiwu_info->money5 = $should_pays6[$index];
- $caiwu_info->save();
+ if(!$caiwu_info->save()) {
+ throw new \Exception(print_r($caiwu_info->getErrors(), true));
+ }
}
$pay_order->should_pay = $should_pays6[$index];
$pay_order->real_pay = $should_pays6[$index];
- $pay_order->save();
- }
- //非车险销售
-
- foreach ($non_xiaoshou as $index => $id) {
- $pay_order = PayOrderUserT::findOne(['id' => $id]);
- if (!$pay_order) {
- $result['msg'] = '我的提成错误2:' . $id . '=>' . $rate7[$index];
- return $result;
- }
- $order_info = $pay_order->order;
- $caiwu_info = $order_info->caiwu1;
- if ($caiwu_info) {
- if(!isset($rate7[$index])) continue;
- $caiwu_info->rate1 = $rate7[$index];
- $caiwu_info->money1 = $should_pays7[$index];
- $caiwu_info->save();
+ if(!$pay_order->save()) {
+ throw new \Exception(print_r($pay_order->getErrors(), true));
}
- $pay_order->should_pay = $should_pays7[$index];
- $pay_order->real_pay = $should_pays7[$index];
- $pay_order->save();
}
-// dd($non_hebao);
- foreach ($non_hebao as $index => $id) {
- $pay_order = PayOrderUserT::findOne(['id' => $id]);
- if (!$pay_order) {
- $result['msg'] = '我的提成错误2:' . $id . '=>' . $rate8[$index];
- return $result;
- }
- $order_info = $pay_order->order;
- $caiwu_info = $order_info->caiwu1;
- if ($caiwu_info) {
- if(!isset($rate8[$index])) continue;
- $caiwu_info->rate4 = $rate8[$index];
- $caiwu_info->money4 = $should_pays8[$index];
- $caiwu_info->save();
- }
- $pay_order->should_pay = $should_pays8[$index];
- $pay_order->real_pay = $should_pays8[$index];
- $pay_order->save();
- }
-
-
-
-
-
-
-
$pay_info->calls = $calls;
$pay_info->bus = $bus;
@@ -5515,7 +5489,11 @@ class FinanceController extends \frontend\controllers\UserBaseController
$pay_info->fix_total = $fix_total;
$pay_info->fix_rate = $fix_rate;
$pay_info->tax = $tax;
- $pay_info->save();
+ $pay_info->caiwu_status_id = 1;
+ $pay_info->status_id = $pay_info->renshi_status_id + $pay_info->chuna_status_id + $pay_info->caiwu_status_id;
+ if(!$pay_info->save()) {
+ throw new \Exception(print_r($pay_info->getErrors(), true));
+ }
$pay_info->calPay();
// $pay_info->save();
@@ -5525,7 +5503,7 @@ class FinanceController extends \frontend\controllers\UserBaseController
$tran->commit();
} catch (\Exception $e) {
$tran->rollBack();
- throw $e;
+ $result['msg'] = $e->getMessage();
}
$result['success'] = true;
@@ -7356,16 +7334,26 @@ class FinanceController extends \frontend\controllers\UserBaseController
* 出纳工资列表
* @return string
*/
- public function actionChunaGongziList()
+ public function actionChunaGongziList() {
+ $group_items = GroupT::getTree();
+ return $this->render('chuna-gongzi-list',[
+ 'group_items' => $group_items
+ ]);
+ }
+
+ public function actionChunaGongziListJson()
{
+ Yii::$app->response->format = Response::FORMAT_JSON;
$request = Yii::$app->request;
$username = $request->get('username');
$name = $request->get('name');
$pay_date = $request->get('pay_date', date('Y-m'));
$group_id = $request->get('group_id', 0);
- $page = $request->get('page', 1);
-
$status_id = $request->get('status_id',0);
+ $is_leave = $request->get('is_leave',0);
+
+ $offset = $request->get('offset', 0);
+ $limit = $request->get('limit', 10);
$user_id = $this->my->id;
// var_dump($user_id);
@@ -7373,56 +7361,41 @@ class FinanceController extends \frontend\controllers\UserBaseController
->leftJoin('pay_t','pay_t.user_id=user_t.id')
->where('group_id>0 and is_delete=0');
if ($username != '') {
- $query = $query->andWhere('username like "' . $username . '"');
+ $query->andWhere('username like "' . $username . '"');
}
if ($name != '') {
- $query = $query->andWhere('name like "' . $name . '"');
+ $query->andWhere('name like "' . $name . '"');
+ }
+ if($is_leave != ''){
+ $query->andWhere(['is_leave' => $is_leave]);
}
if ($group_id > 0) {
- $query = $query->andWhere('group_id=' . $group_id);
+ $query->andWhere('group_id=' . $group_id);
}
if($status_id > 0) {
- $query = $query->andWhere('pay_t.status_id='.$status_id);
+ $query->andWhere('pay_t.status_id='.$status_id);
}
- $query = $query->orderBy('username ASC,id ASC');
+ $query->orderBy('username ASC,id ASC');
$total = $query->count();
- $total_real_pay = 0;
- foreach ($query->each() as $item) {
- $pay_info = $item->getPay($pay_date);
- if ($pay_info)
- $total_real_pay += $pay_info->real_pay;
- }
- $pagination = new Pagination(['totalCount' => $total, 'pageSize' => 20]);
- $pagination->setPage($page - 1);
-
- $query = $query->offset($pagination->offset)->limit($pagination->limit);
+ $query = $query->offset($offset)->limit($limit);
$items = $query->all();
- $page_info = MyLib::getPageInfo($pagination);
-
- $group_items = GroupT::getTree();
-
- $return_count = UserT::find()
- ->leftJoin('pay_t','pay_t.user_id=user_t.id')
- ->where('user_t.group_id>0 and is_delete=0')
- ->andWhere('pay_t.pay_date="'.$pay_date.'"')
- ->andWhere('pay_t.status_id=8')
- ->count();
+ $data = [];
+ $data['total'] = $total;
+ $data['rows'] = [];
+ foreach($items as $item) {
+ $row = $item->toArray();
+ $row['pay_date'] = $pay_date;
+ $row['group_name'] = $item->group ? $item->group->path : '';
+ $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['should_pay'] = $item->getChunaShouldPay($pay_date);
+ $data['rows'][] = $row;
+ }
- return $this->render('chuna-gongzi-list', [
- 'group_items' => $group_items,
- 'items' => $items,
- 'page_info' => $page_info,
- 'page' => $page,
- 'username' => $username,
- 'name' => $name,
- 'pay_date' => $pay_date,
- 'group_id' => $group_id,
- 'total_real_pay' => $total_real_pay,
- 'status_id'=>$status_id,
- 'return_count' => $return_count
- ]);
+ return $data;
}
/**
* 出纳工资-详情
@@ -7433,7 +7406,6 @@ class FinanceController extends \frontend\controllers\UserBaseController
$request = Yii::$app->request;
$user_id = $request->get('id', 0);
$pay_date = $request->get('pay_date', date('Y-m'));
- $back_params = $request->get('back_params');
$user_info = UserT::findOne(['id' => $user_id]);
$group_info = $user_info->group;
@@ -7554,70 +7526,112 @@ class FinanceController extends \frontend\controllers\UserBaseController
'pay_dz' => $pay_dz
]);
}
+
+ public function actionChunaGongziSave()
+ {
+ Yii::$app->response->format = Response::FORMAT_JSON;
+ $request = Yii::$app->request;
+ $result = array();
+ $result['success'] = false;
+ $result['msg'] = '保存失败';
+
+ $id = $request->post('id',0);
+ $pay_chexian = $request->post('pay_chexian',0);
+ $pay_nochexian = $request->post('pay_nochexian',0);
+ $pay_dz = $request->post('pay_dz',0);
+
+ $pay_info = PayT::findOne($id);
+ $pay_dz = $pay_dz?$pay_dz:0;
+ $pay_nochexian = $pay_nochexian?$pay_nochexian:0;
+ $pay_chexian = $pay_chexian?$pay_chexian:0;
+
+ $pay_info->ticheng_real_pay = $pay_chexian + $pay_nochexian + $pay_dz;
+ $pay_info->chuna_status_id = 2;
+ $pay_info->status_id = $pay_info->renshi_status_id + 2;
+
+ $content = '出纳:'.$this->my->showName.'提交'.$pay_info->pay_date.'工资';
+ $this->addUserLog($pay_info->id, $content);
+
+
+ if($pay_info->save()){
+ $result['success'] = true;
+ $result['msg'] = '保存成功';
+ }
+ return $result;
+ }
+
/**
* 财务工资列表
* @return string
*/
- public function actionGongziAllList()
+ public function actionGongziAllList() {
+ $group_items = GroupT::getTree();
+ return $this->render('gongzi-all-list',[
+ 'group_items' => $group_items
+ ]);
+ }
+
+ public function actionGongziAllListJson()
{
+ Yii::$app->response->format = Response::FORMAT_JSON;
$request = Yii::$app->request;
$username = $request->get('username');
$name = $request->get('name');
$pay_date = $request->get('pay_date', date('Y-m'));
$group_id = $request->get('group_id', 0);
- $page = $request->get('page', 1);
-
+ $is_leave = $request->get('is_leave');
$status_id = $request->get('status_id',0);
+ $offset = $request->get('offset', 0);
+ $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');
if ($username != '') {
- $query = $query->andWhere('username like "' . $username . '"');
+ $query->andWhere('username like "' . $username . '"');
}
if ($name != '') {
- $query = $query->andWhere('name like "' . $name . '"');
+ $query->andWhere('name like "' . $name . '"');
}
if ($group_id > 0) {
- $query = $query->andWhere('group_id=' . $group_id);
+ $query->andWhere('group_id=' . $group_id);
+ }
+ if($is_leave != '') {
+ $query->andWhere('is_leave='.$is_leave);
}
-
if($status_id > 0) {
- $query = $query->andWhere(['IN','pay_t.status_id',[7,8,9]]);
+ $query->andWhere(['IN','pay_t.status_id',[7,8,9]]);
}
$query = $query->orderBy('username ASC,id ASC');
$total = $query->count();
- $total_real_pay = 0;
- foreach ($query->each() as $item) {
- $pay_info = $item->getPay($pay_date);
- if ($pay_info)
- $total_real_pay += $pay_info->real_pay;
- }
- $pagination = new Pagination(['totalCount' => $total, 'pageSize' => 20]);
- $pagination->setPage($page - 1);
-
- $query = $query->offset($pagination->offset)->limit($pagination->limit);
+ $query->offset($offset)->limit($limit);
$items = $query->all();
$page_info = MyLib::getPageInfo($pagination);
$group_items = GroupT::getTree();
- return $this->render('gongzi-all-list', [
- 'group_items' => $group_items,
- 'items' => $items,
- 'page_info' => $page_info,
- 'page' => $page,
- 'username' => $username,
- 'name' => $name,
- 'pay_date' => $pay_date,
- 'group_id' => $group_id,
- 'total_real_pay' => $total_real_pay,
- 'status_id' => $status_id
- ]);
+ $data = [];
+ $data['total'] = $total;
+ $data['rows'] = [];
+ foreach($items as $item) {
+ $row = $item->toArray();
+ $row['pay_date'] = $pay_date;
+ $row['group_name'] = $item->group ? $item->group->path : '';
+ $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;
+ $data['rows'][] = $row;
+ }
+
+ return $data;
}
/**
* 出纳工资-详情
@@ -7682,6 +7696,10 @@ class FinanceController extends \frontend\controllers\UserBaseController
->orderBy('created_at asc');
+//原新保
+ $my_type0_query = PayOrderUserT::find()
+ ->where('pay_date="' . $pay_date . '" and type=1 and user_id=' . $user_id.' and is_own =0')
+ ->orderBy('created_at asc');
@@ -7724,6 +7742,7 @@ class FinanceController extends \frontend\controllers\UserBaseController
'user_info' => $user_info,
'group_info' => $group_info,
'pay_info' => $pay_info,
+ 'my_type0_query' => $my_type0_query,
'my_type1_query' => $my_type1_query,
'my_type3_query' => $my_type3_query,
'my_type5_query' => $my_type5_query,
@@ -8002,4 +8021,54 @@ class FinanceController extends \frontend\controllers\UserBaseController
'r_bu_dian_all'=>$r_bu_dian_all
]);
}
+
+ public function actionGongziAllReturnSave()
+ {
+ Yii::$app->response->format = Response::FORMAT_JSON;
+ $request = Yii::$app->request;
+ $result = array();
+ $result['success'] = false;
+ $result['msg'] = '保存失败';
+
+ $id = $request->post('id',0);
+ $remark = $request->post('remark','');
+ $status_id = 4;
+
+ $pay_info = PayT::findOne($id);
+ $pay_info->status_id = $status_id + 6;
+
+ $content = '老板:'.$this->my->showName.'退回'.$pay_info->pay_date.'工资';
+ $this->addUserLog($pay_info->id, $content,$remark);
+
+ if($pay_info->save()){
+ $result['success'] = true;
+ $result['msg'] = '保存成功';
+ }
+ return $result;
+ }
+
+ public function actionGongziAllSave()
+ {
+ Yii::$app->response->format = Response::FORMAT_JSON;
+ $request = Yii::$app->request;
+ $result = array();
+ $result['success'] = false;
+ $result['msg'] = '保存失败';
+
+ $id = $request->post('id',0);
+
+ $pay_info = PayT::findOne($id);
+ $pay_info->status_id = 5;
+
+ $content = '老板:'.$this->my->showName.'同意本条记录'.$pay_info->pay_date.'工资';
+ $this->addUserLog($pay_info->id, $content);
+
+
+ if($pay_info->save()){
+ $result['success'] = true;
+ $result['msg'] = '保存成功';
+ }
+ return $result;
+ }
+
}
diff --git a/frontend/controllers/PersonnelController.php b/frontend/controllers/PersonnelController.php
index e7294be..5ec1d89 100644
--- a/frontend/controllers/PersonnelController.php
+++ b/frontend/controllers/PersonnelController.php
@@ -17,6 +17,8 @@ use common\models\CompanyT;
class PersonnelController extends \frontend\controllers\UserBaseController
{
public $my = null;
+ public $enableCsrfValidation = false;
+ public $layout = 'blue-main';
public function init()
{
@@ -38,79 +40,66 @@ class PersonnelController extends \frontend\controllers\UserBaseController
* 人事工资列表
* @return string
*/
- public function actionPayList()
+ public function actionPayList() {
+ $group_items = GroupT::getTree();
+ return $this->render('pay-list',[
+ 'group_items' => $group_items
+ ]);
+ }
+
+ public function actionPayListJson()
{
+ Yii::$app->response->format = Response::FORMAT_JSON;
$request = Yii::$app->request;
$username = $request->get('username');
$name = $request->get('name');
$pay_date = $request->get('pay_date',date('Y-m'));
$group_id = $request->get('group_id',0);
- $company_id = $request->get('company_id');
- $page = $request->get('page',1);
$is_leave = $request->get('is_leave',0);
-
$status_id = $request->get('status_id',0);
+ $offset = $request->get('offset', 0);
+ $limit = $request->get('limit', 10);
+
$query = UserT::find()
->leftJoin('pay_t','pay_t.user_id=user_t.id')
->where('user_t.group_id>0 and is_delete=0');
if($username != '') {
- $query = $query->andWhere('user_t.username like "'.$username.'"');
+ $query->andWhere('user_t.username like "'.$username.'"');
}
if($name != '') {
- $query = $query->andWhere('user_t.name like "'.$name.'"');
+ $query->andWhere('user_t.name like "'.$name.'"');
}
if($is_leave != ''){
- $query = $query->andWhere(['user_t.is_leave' => $is_leave]);
- }
- if($company_id > 0) {
- $query = $query->andWhere('user_t.company_id='.$company_id);
+ $query->andWhere(['user_t.is_leave' => $is_leave]);
}
if($group_id > 0) {
- $query = $query->andWhere('user_t.group_id='.$group_id);
+ $query->andWhere('user_t.group_id='.$group_id);
}
if($status_id > 0) {
- $query = $query->andWhere('pay_t.status_id='.$status_id);
+ $query->andWhere('pay_t.status_id='.$status_id);
}
- $query = $query->orderBy('user_t.username ASC,user_t.id ASC');
+ $query->orderBy('user_t.username ASC,user_t.id ASC');
$total = $query->count();
- $pagination = new Pagination(['totalCount' => $total,'pageSize'=>20]);
- $pagination->setPage($page-1);
-
- $query = $query->offset($pagination->offset)->limit($pagination->limit);
+ $query->offset($offset)->limit($limit);
$items = $query->all();
- $page_info = MyLib::getPageInfo($pagination);
-
- $group_items = GroupT::getTree();
-
- $return_count = UserT::find()
- ->leftJoin('pay_t','pay_t.user_id=user_t.id')
- ->where('user_t.group_id>0 and is_delete=0')
- ->andWhere('pay_t.pay_date="'.$pay_date.'"')
- ->andWhere('pay_t.status_id=7')
- ->count();
-
-
- $company_items = CompanyT::find()->all();
-
- return $this->render('pay-list',[
- 'group_items' => $group_items,
- 'items' => $items,
- 'page_info' => $page_info,
- 'page' => $page,
- 'username' => $username,
- 'name' => $name,
- 'pay_date' => $pay_date,
- 'group_id' => $group_id,
- 'company_id' => $company_id,
- 'status_id' => $status_id,
- 'is_leave' => $is_leave,
- 'company_items' => $company_items,
+ $data = [];
+ $data['total'] = $total;
+ $data['rows'] = [];
+ foreach($items as $item) {
+ $row = $item->toArray();
+ $row['pay_date'] = $pay_date;
+ $row['group_name'] = $item->group ? $item->group->path : '';
+ $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 ? $pay_info->base_real_pay : 0 ;
+ $data['rows'][] = $row;
+ }
- 'return_count' => $return_count
- ]);
+ return $data;
}
/**
diff --git a/frontend/views/car/order-add.php b/frontend/views/car/order-add.php
index 43e2c26..9da71fe 100644
--- a/frontend/views/car/order-add.php
+++ b/frontend/views/car/order-add.php
@@ -52,7 +52,7 @@ use common\models\PriceT;
证件号码 |
|
联系电话 |
- |
+ |
被保险人 |
@@ -65,9 +65,9 @@ use common\models\PriceT;
证件号码 |
- |
+ |
联系电话 |
- |
+ |
投保人 |
diff --git a/frontend/views/finance/chuna-gongzi-info.php b/frontend/views/finance/chuna-gongzi-info.php
index 91007ab..19365da 100644
--- a/frontend/views/finance/chuna-gongzi-info.php
+++ b/frontend/views/finance/chuna-gongzi-info.php
@@ -1,769 +1,470 @@
-
-
+
+
+beginBlock('footer_js'); ?>
+endBlock('footer_js'); ?>
diff --git a/frontend/views/finance/chuna-gongzi-list.php b/frontend/views/finance/chuna-gongzi-list.php
index eba8793..4ad3eac 100644
--- a/frontend/views/finance/chuna-gongzi-list.php
+++ b/frontend/views/finance/chuna-gongzi-list.php
@@ -1,155 +1,146 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
- 工号 |
- 真实姓名 |
- 工资月份 |
- 所属岗位 |
- 提成工资 |
- 状态 |
- 操作 |
-
-
-
- |
- |
- |
- |
- =number_format($total_real_pay,2)?> |
- |
- |
-
-
- =$page_info?> |
-
-
+endBlock(); ?>
diff --git a/frontend/views/finance/gongzi-all-info.php b/frontend/views/finance/gongzi-all-info.php
index 079bff4..78e7d3e 100644
--- a/frontend/views/finance/gongzi-all-info.php
+++ b/frontend/views/finance/gongzi-all-info.php
@@ -1,724 +1,639 @@
-
-
+
+
+beginBlock('footer_js'); ?>
+endBlock('footer_js'); ?>
+
diff --git a/frontend/views/finance/gongzi-all-list.php b/frontend/views/finance/gongzi-all-list.php
index cca18ce..c7429c1 100644
--- a/frontend/views/finance/gongzi-all-list.php
+++ b/frontend/views/finance/gongzi-all-list.php
@@ -1,159 +1,149 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
- 工号 |
- 真实姓名 |
- 工资月份 |
- 所属岗位 |
-
- 基本工资 |
- 提成工资 |
- 状态 |
- 操作 |
-
-
- $item) {
- $pay_info = $item->getPay($pay_date);
- $base_real_pay = 0;
- $ticheng_real_pay = 0;
- $is_begin = 0;
- if($pay_info){
- $is_begin = 1;
- $base_real_pay = $pay_info->base_real_pay;
- $ticheng_real_pay = $pay_info->ticheng_real_pay;
- }
- ?>
-
- =$item->username?> |
- =$item->name?> |
- =$pay_date?> |
- =$item->group?$item->group->name:''?> |
-
-
- =number_format($base_real_pay,2)?>元
- |
-
- =number_format($ticheng_real_pay,2)?>元
- |
-
-
-
- =$pay_info->getStatus($pay_info->status_id)?>
-
-
- |
-
-
-
- [详情]
-
- |
-
-
-
-
- |
- |
- |
- |
- |
- =number_format($total_real_pay,2)?> |
- |
-
-
- =$page_info?> |
-
-
+endBlock(); ?>
diff --git a/frontend/views/finance/pay2-info.php b/frontend/views/finance/pay2-info.php
index 7852fab..2119530 100644
--- a/frontend/views/finance/pay2-info.php
+++ b/frontend/views/finance/pay2-info.php
@@ -1,694 +1,630 @@
-
-
-
-
- =date("Y年m月",strtotime($pay_date.'-01'))?>财务工资
- 应发工资:=number_format($pay_info->ticheng_should_pay + $pay_info->base_should_pay,2)?> 元 实发工资:=number_format($pay_info->ticheng_real_pay + $pay_info->base_real_pay,2)?> 元
-
-
- 基本工资
- renshi_status_id == 1):?>
-
-
-
- 基本工资 |
- 补助工资 |
- 扣除工资 |
- 合计 |
-
-
-
- =$pay_info->day_formal_pay + $pay_info->day_try_pay?> |
- =$pay_info->buzhu_pay?> |
- =$pay_info->kouchu_pay?> |
- =$pay_info->base_real_pay?> |
-
-
-
-
-
-
-
- 提成工资
- chuna_status_id == 2):?>
-
-
-
-
-
- 保单提成 |
- 团队长提成 |
- 非车险提成 |
- 维修提成 |
- 合计 |
-
-
- =$pay_chexian?> |
- =$pay_dz?> |
- =$pay_nochexian?> |
- |
- =$pay_chexian + $pay_nochexian + $pay_dz?> |
-
-
-
-
-
-
-
- chuna_status_id == 2 && $pay_info->renshi_status_id == 1):?>
-
-
-
-
-
-
-
- renshi_status_id == 1):?>
-
-
-
-
-
-
- 基本工资
-
-
- 补助工资
-
-
- 应扣工资
-
- |
-
-
-
- chuna_status_id == 2):?>
-
-
-
-
-
-
- 保单提成
- count() > 0) { ?>
-
-
- 我的新保 |
-
-
- 序号 |
- 车牌号 |
- 正本日期 |
- 商业净保费 |
- 提奖 |
- 应提金额 |
- 原新保提成 |
- 优惠金额 |
- 自费礼券 |
- 自费礼品 |
- 自付减免 |
- 实提金额 |
- 详情 |
-
- each() as $index=>$pay_order) {
- $order_info = $pay_order->order;
- $caiwu_info = $order_info->caiwu;//carwuordert
- $money = $caiwu_info->money1;
- $should_pay += $pay_order->should_pay;
- $real_pay += $pay_order->real_pay;
- $total1_clear += $order_info->total1_clear;
- $total1_dis += $order_info->total1_dis;
- ?>
-
-
-
- =$index+1?>
- |
- =$order_info->car_no?> |
- =$order_info->print_date?> |
- =$order_info->total1_clear?> |
-
- =$caiwu_info->ticheng_zong_rate?> |
- =$pay_order->should_pay?> |
- =$pay_order->first_xinbao_ticheng?> |
- =$order_info->total1_dis?> |
- =$order_info->getGiftPrice(1,1)?> |
- =$order_info->getGiftPrice(1,0)?> |
- =$order_info->yuangong_money?> |
- =$pay_order->real_pay?> |
- [详情] |
-
-
-
- |
- |
- |
- =number_format($total1_clear,2)?> |
- |
- =number_format($should_pay,2)?> |
- |
- =number_format($total1_dis,2)?> |
- |
- |
- |
- =number_format($real_pay,2)?> |
- |
-
-
-
- count() > 0) { ?>
-
-
- 我的续保 |
-
-
- 序号 |
- 车牌号 |
- 正本日期 |
- 商业净保费 |
- 提奖 |
- 应提金额 |
- 优惠金额 |
- 自费礼券 |
- 自费礼品 |
- 自付减免 |
- 实提金额 |
- 详情 |
-
- each() as $index=>$pay_order) {
- $order_info = $pay_order->order;
- $caiwu_info = $order_info->caiwu;//carwuordert
- $money = $caiwu_info->money1;
- $should_pay += $pay_order->should_pay;
- $real_pay += $pay_order->real_pay;
- $total1_clear += $order_info->total1_clear;
- $total1_dis += $order_info->total1_dis;
- ?>
-
-
-
- =$index+1?>
- |
- =$order_info->car_no?> |
- =$order_info->print_date?> |
- =$order_info->total1_clear?> |
-
- =$caiwu_info->ticheng_zong_rate?> |
- =$pay_order->should_pay?> |
- =$order_info->total1_dis?> |
- =$order_info->getGiftPrice(1,1)?> |
- =$order_info->getGiftPrice(1,0)?> |
- =$order_info->yuangong_money?> |
- =$pay_order->real_pay?> |
- [详情] |
-
-
-
- |
- |
- |
- =number_format($total1_clear,2)?> |
- |
- =number_format($should_pay,2)?> |
- =number_format($total1_dis,2)?> |
- |
- |
- |
- =number_format($real_pay,2)?> |
- |
-
-
-
-
- count() > 0) { ?>
-
-
-
-
- count() > 0) { ?>
-
-
- 核保统计 |
-
-
- 序号 |
- 车牌号 |
- 被保险人 |
- 核保比例 |
- 正本日期 |
- 核保提成 |
- 详情 |
-
-
- each() as $index=>$pay_order) {
- $order_info = $pay_order->order;
- $caiwu_info = $order_info->caiwu;
- $rate = $caiwu_info->hebao_ticheng;
+beginBlock('header_css'); ?>
+
+endBlock(); ?>
+
+
+
+
+ renshi_status_id == 1) { ?>
+
+
+ chuna_status_id == 2) { ?>
+
+
+ 提成工资
+
+
+
+
+
+
+ status_id < 4 || $pay_info->status_id == 8 || $pay_info->status_id == 10) { ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ renshi_status_id == 1) {?>
+
+
+ chuna_status_id == 2) { ?>
+
+
+ 提成工资详情
+
+
+
+
+ count() > 0) { ?>
+
+
+
+ 我的新保 |
+
+
+ 序号 |
+ 车牌号 |
+ 正本日期 |
+ 商业净保费 |
+ 加点比例 |
+ 基本比例 |
+ 应提金额 |
+
+ 减免金额 |
+ 自费礼品 |
+ 自费礼券 |
+ 业务自付 |
+ 实提金额 |
+ 详情 |
+
+
+
+ each() as $index=>$pay_order) {
+ $order_info = $pay_order->order;
+ $caiwu_info = $order_info->caiwu;//carwuordert
+ $money = $caiwu_info->money1;
+ $ticket = $order_info->getGiftPrice(1,1);
+ $gift = $order_info->getGiftPrice(1,0);
+ $should_pay += $pay_order->should_pay;
+ $real_pay += $pay_order->real_pay;
+ $total1_clear += $order_info->total1_clear;
+ $total1_dis += $order_info->total1_dis;
+ $ticket_all += $ticket;
+ $gift_all += $gift;
+ if($order_info->yuangong_money > 0){
+ $zifu_all += $order_info->yuangong_money;
+ }
+ ?>
+
+
+
+ =$index+1?>
+ |
+ =$order_info->car_no?> |
+ =$order_info->print_date?> |
+ =$order_info->total1_clear?> |
+
+ =$caiwu_info->ticheng_zong_rate?> |
+ =$caiwu_info->yeji_rate?> |
+ =$pay_order->should_pay?> |
+ =$order_info->total1_dis?> |
+ =$ticket?> |
+ =$gift?> |
+ =$order_info->yuangong_money?> |
+ =$pay_order->real_pay?> |
+ [详情] |
+
+
+
+
+
+ |
+ |
+ |
+ =number_format($total1_clear,2)?> |
+ |
+ |
+ =number_format($should_pay,2)?> |
+ =number_format($total1_dis,2)?> |
+ =number_format($ticket_all,2)?> |
+ =number_format($gift_all,2)?> |
+ =number_format($zifu_all,2)?> |
+ =number_format($real_pay,2)?> |
+ |
+
+
+
+
+ count() > 0) { ?>
+
+
+
+ 我的续保 |
+
+
+ 序号 |
+ 车牌号 |
+ 正本日期 |
+ 商业净保费 |
+ 加点比例 |
+ 基本比例 |
+ 应提金额 |
+ 优惠金额 |
+ 自费礼品 |
+ 自费礼券 |
+ 自付减免 |
+ 实提金额 |
+ 详情 |
+
+
+
+ each() as $index=>$pay_order) {
+ $order_info = $pay_order->order;
+ $caiwu_info = $order_info->caiwu;//carwuordert
+ $money = $caiwu_info->money1;
+ $ticket = $order_info->getGiftPrice(1,1);
+ $gift = $order_info->getGiftPrice(1,0);
+ $should_pay += $pay_order->should_pay;
+ $real_pay += $pay_order->real_pay;
+ $total1_clear += $order_info->total1_clear;
+ $total1_dis += $order_info->total1_dis;
+ $ticket_all += $ticket;
+ $gift_all += $gift;
+ if($order_info->yuangong_money > 0){
+ $zifu_all += $order_info->yuangong_money;
+ }
+
+ ?>
+
+
+
+ =$index+1?>
+ |
+ =$order_info->car_no?> |
+ =$order_info->print_date?> |
+ =$order_info->total1_clear?> |
+
+ =$caiwu_info->ticheng_zong_rate?> |
+ =$caiwu_info->yeji_rate?> |
+ =$pay_order->should_pay?> |
+ =$order_info->total1_dis?> |
+ =$order_info->getGiftPrice(1,1)?> |
+ =$order_info->getGiftPrice(1,0)?> |
+ =$order_info->yuangong_money?> |
+ =$pay_order->real_pay?> |
+ [详情] |
+
+
+
+
+
+ |
+ |
+ |
+ =number_format($total1_clear,2)?> |
+ |
+ |
+ =number_format($should_pay,2)?> |
+ =number_format($total1_dis,2)?> |
+ =number_format($ticket_all,2)?> |
+ =number_format($gift_all,2)?> |
+ =number_format($zifu_all,2)?> |
+ =number_format($real_pay,2)?> |
+ |
+
+
+
+
+ count() > 0) { ?>
+
+
+
+ 我的原新保 |
+
+
+ 序号 |
+ 车牌号 |
+ 正本日期 |
+ 商业净保费 |
+ 基本比例 |
+ 应提金额 |
+ 原新保提成 |
+ 实提金额 |
+ 详情 |
+
+
+
+ each() as $index=>$pay_order) {
+ $order_info = $pay_order->order;
+ $caiwu_info = $order_info->caiwu;//carwuordert
+// $money = $caiwu_info->money1;
+ $should_pay += $pay_order->should_pay;
+ $real_pay += $pay_order->real_pay;
+ $total1_clear += $order_info->total1_clear;
+// $total1_dis += $order_info->total1_dis;
+ ?>
+
+
+
+ =$index+1?>
+ |
+ =$order_info->car_no?> |
+ =$order_info->print_date?> |
+ =$order_info->total1_clear?> |
+
+ =$caiwu_info->first_xinbao_rate?> |
+ =$pay_order->should_pay?> |
+ =$pay_order->first_xinbao_ticheng?> |
+ =$pay_order->real_pay?> |
+ [详情] |
+
+
+
+
+
+ |
+ |
+ |
+ =number_format($total1_clear,2)?> |
+ |
+ =number_format($should_pay,2)?> |
+ |
+ =number_format($real_pay,2)?> |
+ |
+
+
+
+
+
+ count() > 0) { ?>
+
+
+
+ 核保统计 |
+
+
+ 序号 |
+ 车牌号 |
+ 正本日期 |
+ 被保险人 |
+ 核保比例 |
+ 核保提成 |
+ 详情 |
+
+
+
+ each() as $index=>$pay_order) {
+ $order_info = $pay_order->order;
+ $caiwu_info = $order_info->caiwu;
+ $rate = $caiwu_info->hebao_ticheng;
// $money = $caiwu_info->money4;
- $send_info = $order_info->sendLog;
- $real_pay += $pay_order->real_pay;
- ?>
-
-
-
- =$index+1?>
- |
- =$order_info->car_no?> |
- =MyLib::substr_cut($order_info->id_man,15)?> |
- =$rate?>元 |
- =$send_info?date('Y-m-d H:i:s',$send_info->send_time):''?> |
- =$pay_order->real_pay?>元 |
- [详情] |
-
-
-
- |
- |
- |
- |
- |
- =number_format($real_pay,2)?> |
- |
-
-
-
-
-
-
-
- count() > 0) { ?>
-
-
- 正本统计 |
-
-
- 序号 |
- 车牌号 |
- 被保险人 |
- 正本比例 |
- 时间 |
- 正本提成 |
- 详情 |
-
- each() as $index=>$pay_order) {
- $order_info = $pay_order->order;
- $caiwu_info = $order_info->caiwu;
- $rate = $caiwu_info->zhengben_ticheng;
- $send_info = $order_info->sendLog;
- $real_pay += $pay_order->real_pay;
- ?>
-
-
-
- =$index+1?>
- |
- =$order_info->car_no?> |
- =MyLib::substr_cut($order_info->id_man,15)?> |
- =$rate?>元 |
- =$send_info?date('Y-m-d H:i:s',$send_info->send_time):''?> |
- =$pay_order->real_pay?> |
- [详情] |
-
-
-
- |
- |
- |
- |
- |
- =number_format($real_pay,2)?> |
- |
-
-
-
-
- 非车险提成
-
- count() > 0) { ?>
-
-
- 非车险销售统计 |
-
-
- 序号 |
-
- 被保险人 |
- 提成比例 |
- 核保日期 |
- 提成 |
- 详情 |
-
- each() as $index=>$pay_order) {
- $order_info = $pay_order->nonOrder;
- $non_info = $order_info->nonInsurance;
- $caiwu_info = $order_info->caiwu1;//ordercarwut
-
- $real_pay += $pay_order->real_pay;
- ?>
-
-
-
- =$index+1?>
- |
-
- =MyLib::substr_cut($non_info->insurant_name,15)?> |
- =$order_info->non_rate?> |
-
- =$order_info->print_date?> |
- =$pay_order->real_pay?> |
- [详情] |
-
-
-
- |
- |
- |
- |
- =number_format($real_pay,2)?> |
- |
-
-
-
-
- count() > 0) { ?>
-
-
- 非车险核保统计 |
-
-
- 序号 |
-
- 被保险人 |
- 提成比例 |
- 核保日期 |
- 提成 |
- 详情 |
-
- each() as $index=>$pay_order) {
- $order_info = $pay_order->nonOrder;
- $non_info = $order_info->nonInsurance;
- $caiwu_info = $order_info->caiwu1;//ordercarwut
- $rate = $caiwu_info->rate4;
-
- $real_pay += $pay_order->real_pay;
- ?>
-
-
-
- =$index+1?>
- |
-
- =MyLib::substr_cut($non_info->insurant_name,15)?> |
- =$order_info->non_rate?> |
-
- =$order_info->print_date?> |
- =$caiwu_info->hebao_ticheng?> |
-
- [详情] |
-
-
-
- |
- |
- |
- |
- =number_format($real_pay,2)?> |
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ $send_info = $order_info->sendLog;
+ $real_pay += $pay_order->real_pay;
+ ?>
+ |
+
+
+ =$index+1?>
+ |
+ =$order_info->car_no?> |
+ =$order_info->print_date?> |
+ =MyLib::substr_cut($order_info->id_man,15)?> |
+ =$rate?>元 |
+ =$pay_order->real_pay?>元 |
+ [详情] |
+
+
+
+
+
+ |
+ |
+ |
+ |
+ |
+ =number_format($real_pay,2)?> |
+ |
+
+
+
+
+
+ count() > 0) { ?>
+
+
+
+ 正本统计 |
+
+
+ 序号 |
+ 车牌号 |
+ 正本时间 |
+ 被保险人 |
+ 正本比例 |
+ 正本提成 |
+ 详情 |
+
+
+
+ each() as $index=>$pay_order) {
+ $order_info = $pay_order->order;
+ $caiwu_info = $order_info->caiwu;
+ $rate = $caiwu_info->zhengben_ticheng;
+ $send_info = $order_info->sendLog;
+ $real_pay += $pay_order->real_pay;
+ ?>
+
+
+
+ =$index+1?>
+ |
+ =$order_info->car_no?> |
+ =$order_info->print_date?> |
+ =MyLib::substr_cut($order_info->id_man,15)?> |
+ =$rate?>元 |
+ =$pay_order->real_pay?> |
+ [详情] |
+
+
+
+
+
+ |
+ |
+ |
+ |
+ |
+ =number_format($real_pay,2)?> |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+beginBlock('footer_js'); ?>
+endBlock('footer_js'); ?>
diff --git a/frontend/views/finance/pay2-list.php b/frontend/views/finance/pay2-list.php
index 55bbfbc..3f5a1d8 100644
--- a/frontend/views/finance/pay2-list.php
+++ b/frontend/views/finance/pay2-list.php
@@ -1,161 +1,149 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
- 工号 |
- 真实姓名 |
- 工资月份 |
- 所属岗位 |
-
- 基本工资 |
- 提成工资 |
- 状态 |
- 操作 |
-
-
- $item) {
- $pay_info = $item->getPay($pay_date);
- $base_real_pay = 0;
- $ticheng_real_pay = 0;
- $is_begin = 0;
- if($pay_info) {
- $is_begin = 1;
- $base_real_pay = $pay_info->base_real_pay;
- $ticheng_real_pay = $pay_info->ticheng_real_pay;
- }
- ?>
-
- =$item->username?> |
- =$item->name?> |
- =$pay_date?> |
- =$item->group?$item->group->name:''?> |
-
-
- =number_format($base_real_pay,2)?>元
- |
-
- =number_format($ticheng_real_pay,2)?>元
- |
-
-
-
- =$pay_info->getStatus($pay_info->status_id)?>
-
-
- |
-
-
-
- [详情]
-
- |
-
-
-
-
- |
- |
- |
- |
- |
- =number_format($total_real_pay,2)?> |
- |
-
-
- =$page_info?> |
-
-
+endBlock(); ?>
diff --git a/frontend/views/finance/receipt2.php b/frontend/views/finance/receipt2.php
index 90b2514..b627a58 100644
--- a/frontend/views/finance/receipt2.php
+++ b/frontend/views/finance/receipt2.php
@@ -22,7 +22,7 @@ use \common\libs\MyLib;