diff --git a/common/models/PayT.php b/common/models/PayT.php
index c010eac..5179f7e 100644
--- a/common/models/PayT.php
+++ b/common/models/PayT.php
@@ -154,14 +154,18 @@ 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;
}
@@ -208,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..b45c493 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;
- }
- $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();
+ if(!$pay_order->save()) {
+ throw new \Exception(print_r($pay_order->getErrors(), true));
}
- $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,59 +5469,17 @@ 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();
- }
- $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();
+ if(!$pay_order->save()) {
+ throw new \Exception(print_r($pay_order->getErrors(), true));
}
- $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;
$pay_info->bonus = $bonus;
@@ -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,6 +7526,40 @@ 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
diff --git a/frontend/controllers/PersonnelController.php b/frontend/controllers/PersonnelController.php
index 43cd827..5ec1d89 100644
--- a/frontend/controllers/PersonnelController.php
+++ b/frontend/controllers/PersonnelController.php
@@ -42,10 +42,8 @@ class PersonnelController extends \frontend\controllers\UserBaseController
*/
public function actionPayList() {
$group_items = GroupT::getTree();
- $company_items = CompanyT::find()->all();
return $this->render('pay-list',[
- 'group_items' => $group_items,
- 'company_items' => $company_items
+ 'group_items' => $group_items
]);
}
@@ -57,7 +55,6 @@ class PersonnelController extends \frontend\controllers\UserBaseController
$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');
$is_leave = $request->get('is_leave',0);
$status_id = $request->get('status_id',0);
@@ -76,9 +73,6 @@ class PersonnelController extends \frontend\controllers\UserBaseController
if($is_leave != ''){
$query->andWhere(['user_t.is_leave' => $is_leave]);
}
- if($company_id > 0) {
- $query->andWhere('user_t.company_id='.$company_id);
- }
if($group_id > 0) {
$query->andWhere('user_t.group_id='.$group_id);
}
@@ -91,10 +85,8 @@ class PersonnelController extends \frontend\controllers\UserBaseController
$query->offset($offset)->limit($limit);
$items = $query->all();
- $group_items = GroupT::getTree();
-
$data = [];
- $data['total'] = count($items);
+ $data['total'] = $total;
$data['rows'] = [];
foreach($items as $item) {
$row = $item->toArray();
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/pay2-info.php b/frontend/views/finance/pay2-info.php
index 7852fab..49e4262 100644
--- a/frontend/views/finance/pay2-info.php
+++ b/frontend/views/finance/pay2-info.php
@@ -1,694 +1,630 @@
-
-
+
+
+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;
-