From a7d0396a968e93a23240dc498bf1bc6325ab9ae7 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Mon, 4 Nov 2019 16:52:59 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/models/CarT.php | 6 +----- frontend/controllers/FinanceController.php | 12 ++++++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/common/models/CarT.php b/common/models/CarT.php index c972f75..c4f9d57 100644 --- a/common/models/CarT.php +++ b/common/models/CarT.php @@ -175,11 +175,7 @@ class CarT extends \common\models\Base switch($this->location) { case 1: $car=CarT::findOne(['id'=>$this->id]); - if($car->qiyong==2){ - $name = 'A库(永不启用)'; - }else{ - $name = 'A库'; - } + $name = 'A库'; break; case 2: $carb=CarBT::findOne(['id'=>$this->id]); diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php index d2bd428..606a512 100644 --- a/frontend/controllers/FinanceController.php +++ b/frontend/controllers/FinanceController.php @@ -3264,18 +3264,18 @@ class FinanceController extends \frontend\controllers\UserBaseController for ($i = 7; $i <= $rowCount; $i++) { $cell = $currentSheet->getCellByColumnAndRow(1, $i); - $insurer_no = $cell->getValue();//$data[$i][1]; + $insurer_no = $cell->getFormattedValue();//$data[$i][1]; // var_dump($insurer_no); $cell = $currentSheet->getCellByColumnAndRow(2, $i); - $policy_man = $cell->getValue();//$data[$i][2]; + $policy_man = $cell->getFormattedValue();//$data[$i][2]; $cell = $currentSheet->getCellByColumnAndRow(3, $i); - $total_real = $cell->getValue();//$data[$i][3]; + $total_real = $cell->getFormattedValue();//$data[$i][3]; $cell = $currentSheet->getCellByColumnAndRow(4, $i); - $total_rate = $cell->getValue();//$data[$i][4]; + $total_rate = $cell->getFormattedValue();//$data[$i][4]; $cell = $currentSheet->getCellByColumnAndRow(5, $i); - $pay_total = $cell->getValue();//$data[$i][5]; + $pay_total = $cell->getFormattedValue();//$data[$i][5]; $cell = $currentSheet->getCellByColumnAndRow(6, $i); - $insurer_total = $cell->getValue();//$data[$i][6]; + $insurer_total = $cell->getFormattedValue();//$data[$i][6]; $cell = $currentSheet->getCellByColumnAndRow(7, $i); $insurer_date = $cell->getFormattedValue(); // var_dump($insurer_date); From 3568b60012a5596266b31933cd6d08e7f99e31da Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Mon, 4 Nov 2019 16:54:58 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9id=5Fnumber?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/DatabaseController.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/controllers/DatabaseController.php b/frontend/controllers/DatabaseController.php index 2a26daa..010f73f 100644 --- a/frontend/controllers/DatabaseController.php +++ b/frontend/controllers/DatabaseController.php @@ -647,10 +647,10 @@ class DatabaseController extends BaseController $order_row->user_id = $user_id; $order_row->status_id = 1; $order_row->id_man = $b_info->car->car_man; - $order_row->id_man_number = $b_info->car->id_number; + $order_row->id_man_number = $b_info->car->id_man_number; $order_row->link_man = $b_info->car->car_man; $order_row->link_man_phone = $b_info->car->car_man_phone; - $order_row->link_man_number = $b_info->car->id_number; + $order_row->link_man_number = $b_info->car->id_man_number; if(!$order_row->save()) { throw new \Exception(print_r($order_row->getErrors(),true)); } @@ -824,7 +824,7 @@ class DatabaseController extends BaseController $order_row->id_man = $b_info->car->car_man; $order_row->link_man = $b_info->car->car_man; $order_row->link_man_phone = $b_info->car->car_man_phone; - $order_row->link_man_number = $b_info->car->id_number; + $order_row->link_man_number = $b_info->car->id_man_number; $order_row->return_status_id = 0; $order_row->return_remark = ''; if(!$order_row->save()) { @@ -1214,10 +1214,10 @@ class DatabaseController extends BaseController $order_row->user_id = $user_id; $order_row->status_id = 1; $order_row->id_man = $c_info->car->car_man; - $order_row->id_man_number = $c_info->car->id_number; + $order_row->id_man_number = $c_info->car->id_man_number; $order_row->link_man = $c_info->car->car_man; $order_row->link_man_phone = $c_info->car->car_man_phone; - $order_row->link_man_number = $c_info->car->id_number; + $order_row->link_man_number = $c_info->car->id_man_number; if(!$order_row->save()) { throw new \Exception(print_r($order_row->getErrors(),true)); } @@ -1388,10 +1388,10 @@ class DatabaseController extends BaseController $order_row->user_id = $c_info->user_id; $order_row->status_id = 1; $order_row->id_man = $c_info->car->car_man; - $order_row->id_man_number = $c_info->car->id_number; + $order_row->id_man_number = $c_info->car->id_man_number; $order_row->link_man = $c_info->car->car_man; $order_row->link_man_phone = $c_info->car->car_man_phone; - $order_row->link_man_number = $c_info->car->id_number; + $order_row->link_man_number = $c_info->car->id_man_number; if(!$order_row->save()) { throw new \Exception(print_r($order_row->getErrors(),true)); } @@ -1889,10 +1889,10 @@ class DatabaseController extends BaseController $order_row->user_id = $user_id; $order_row->status_id = 1; $order_row->id_man = $d_info->car->car_man; - $order_row->id_man_number = $d_info->car->id_number; + $order_row->id_man_number = $d_info->car->id_man_number; $order_row->link_man = $d_info->car->car_man; $order_row->link_man_phone = $d_info->car->car_man_phone; - $order_row->link_man_number = $d_info->car->id_number; + $order_row->link_man_number = $d_info->car->id_man_number; if(!$order_row->save()) { throw new \Exception(print_r($order_row->getErrors(),true)); } @@ -2060,7 +2060,7 @@ class DatabaseController extends BaseController $order_row->user_id = $d_info->user_id; $order_row->status_id = 1; $order_row->id_man = $d_info->car->car_man; - $order_row->id_man_number = $d_info->car->id_number; + $order_row->id_man_number = $d_info->car->id_man_number; $order_row->link_man = $d_info->car->car_man; $order_row->link_man_phone = $d_info->car->car_man_phone; $order_row->link_man_number = $d_info->car->id_man_number; From f9f4e90003433fdbe218c8d5dfdcc31279d5328a Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Mon, 4 Nov 2019 17:03:31 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MarketingStrategyController.php | 25 +++++++++++++++++++ frontend/views/marketing-strategy/index.php | 4 ++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/frontend/controllers/MarketingStrategyController.php b/frontend/controllers/MarketingStrategyController.php index fb21ba7..d345860 100644 --- a/frontend/controllers/MarketingStrategyController.php +++ b/frontend/controllers/MarketingStrategyController.php @@ -110,6 +110,31 @@ class MarketingStrategyController extends UserBaseController return $result; } + public function actionDelete() { + Yii::$app->response->format = Response::FORMAT_JSON; + $request = Yii::$app->request; + $result = array(); + $result['success'] = false; + $result['msg'] = '删除失败'; + + $id = $request->post('id',0); + + if($id == 0) + return $result; + + $tichengTypeT = ZhongjiYingxiao::findOne(['id'=>$id]); + if($tichengTypeT) { + $tichengTypeT->is_delete = 1; + $tichengTypeT->save(); + } + + + $result['success'] = true; + $result['msg'] = '删除成功'; + + return $result; + } + public function actionUsers() { $request = Yii::$app->request; $id = $request->get('id'); diff --git a/frontend/views/marketing-strategy/index.php b/frontend/views/marketing-strategy/index.php index 60db931..c3f44bb 100644 --- a/frontend/views/marketing-strategy/index.php +++ b/frontend/views/marketing-strategy/index.php @@ -71,7 +71,9 @@ use \common\libs\MyLib; }, function(){ $.post('/marketing-strategy/delete',{id:id},function(data) { parent.layer.msg(data.msg); - refreshList(); + if(data.success) { + refreshList(); + } }, 'json'); }, function(){ // From cce2d9170b7a63cb363b108095551bc6150a36a6 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Mon, 4 Nov 2019 17:24:01 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/MarketingStrategyController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/controllers/MarketingStrategyController.php b/frontend/controllers/MarketingStrategyController.php index d345860..878b92a 100644 --- a/frontend/controllers/MarketingStrategyController.php +++ b/frontend/controllers/MarketingStrategyController.php @@ -518,7 +518,7 @@ class MarketingStrategyController extends UserBaseController } $items = ZhongjiTiaojian::find() ->where('celuo_id=:celuo_id and type=1',[':celuo_id'=>$yingxiao_item->id]) - ->andWhere(['<','baofei', $total1_clear]) + ->andWhere(['<=','baofei', $total1_clear]) ->all(); $ids = []; foreach($items as $item) { From dfcf3545b4e65091a19bbafb976e745ae3b7801d Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Mon, 4 Nov 2019 17:25:39 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/MarketingStrategyController.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frontend/controllers/MarketingStrategyController.php b/frontend/controllers/MarketingStrategyController.php index 878b92a..ce49943 100644 --- a/frontend/controllers/MarketingStrategyController.php +++ b/frontend/controllers/MarketingStrategyController.php @@ -531,6 +531,8 @@ class MarketingStrategyController extends UserBaseController $tmp_type_id = 2; if(in_array($tmp_type_id, $car_type_ids)) { $flag = true; + } else { + $flag = false; } } //保险公司 @@ -538,6 +540,8 @@ class MarketingStrategyController extends UserBaseController $company_ids = explode(',',$item->company_ids); if(in_array($company2_id, $company_ids)) { $flag = true; + } else { + $flag = false; } } //车辆使用类型 @@ -545,6 +549,8 @@ class MarketingStrategyController extends UserBaseController $car_use_ids = explode(',',$item->car_use_id); if(in_array($car_use_id, $car_use_ids)) { $flag = true; + } else { + $flag = false; } } //新保、续保 @@ -555,6 +561,8 @@ class MarketingStrategyController extends UserBaseController $tmp_type_id = 2; if(in_array($tmp_type_id, $type_ids)) { $flag = true; + } else { + $flag = false; } } if($flag) { From 954171133a8a26c31a1818c5cd3a106c6640d4aa Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Mon, 4 Nov 2019 17:29:37 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E5=8B=A4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AF=A6=E6=83=85=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/insurer/office-mng-edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/views/insurer/office-mng-edit.php b/frontend/views/insurer/office-mng-edit.php index 78ed214..9b4c0e5 100644 --- a/frontend/views/insurer/office-mng-edit.php +++ b/frontend/views/insurer/office-mng-edit.php @@ -225,7 +225,7 @@ use common\models\PriceT; +
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+
+
+ + + + + + + +beginBlock('footer_js'); ?> + +endBlock('footer_js'); ?> diff --git a/frontend/views/system/ip.php b/frontend/views/system/ip.php index 99ca925..0066e48 100644 --- a/frontend/views/system/ip.php +++ b/frontend/views/system/ip.php @@ -1,76 +1,98 @@ - - - - + + + - - - - - - -
- 名称： - - -
- - - - - - - - - $item){ - ?> - - - - - - - - - 没有查到数据 - -
序列号城市IP操作
city_name ?>ip ?> - [修改] - [删除] -
+ + $(function() { + search(); + }); + +endBlock(); ?> From 6264d23980e06245a38ff1301742a6616c31dbf7 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Tue, 5 Nov 2019 00:18:02 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E5=8D=95=E6=97=B6=EF=BC=8C=E4=B8=8D=E7=94=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E7=A4=BC=E5=93=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8F=90=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/insurer/my-list-info.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/views/insurer/my-list-info.php b/frontend/views/insurer/my-list-info.php index 1cb3302..789a7ea 100644 --- a/frontend/views/insurer/my-list-info.php +++ b/frontend/views/insurer/my-list-info.php @@ -264,7 +264,7 @@ use common\models\PriceT; html += ''; $('#gifts').html(html); } else { - parent.layer.msg(obj.msg); + //parent.layer.msg(obj.msg); } }, 'json'); $.get('/marketing-strategy/get-gifts?type=2&order_id=id?>&fanxian_id=' + fanxian_id, function(obj){ @@ -303,7 +303,7 @@ use common\models\PriceT; html += ''; $('#quans').html(html); } else { - parent.layer.msg(obj.msg); + //parent.layer.msg(obj.msg); } }, 'json'); }