From eaa7e4a524880cf0472a1628d15261e8b5101dd5 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Wed, 23 Oct 2019 15:10:08 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/InsurerController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/controllers/InsurerController.php b/frontend/controllers/InsurerController.php index dddef3c..5a84ca6 100644 --- a/frontend/controllers/InsurerController.php +++ b/frontend/controllers/InsurerController.php @@ -3718,10 +3718,10 @@ class InsurerController extends BaseController } if($status > 0) { if($status == 1) { - $query->andWhere('status>1 and status<10'); + $query->andWhere('status_id>1 and status_id<10'); } if($status == 2) { - $query->andWhere('status=10'); + $query->andWhere('status_id=10'); } } $total = $query->count(); From c0228652198b8159325dd8ae43291c1e2eb31d22 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Wed, 23 Oct 2019 15:12:10 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/insurer/search.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/views/insurer/search.php b/frontend/views/insurer/search.php index 7317720..8f49852 100644 --- a/frontend/views/insurer/search.php +++ b/frontend/views/insurer/search.php @@ -35,7 +35,7 @@ use \common\libs\MyLib;
-
+
-
@@ -43,7 +43,7 @@ use \common\libs\MyLib;
-
+
-
@@ -51,7 +51,7 @@ use \common\libs\MyLib;
-
+
-
@@ -140,6 +140,12 @@ use \common\libs\MyLib; $(function() { search(); + + $('.input-daterange').datepicker({ + keyboardNavigation: false, + forceParse: false, + autoclose: true + }); }); endBlock(); ?> From 373d6e2dacc28da7fb5a5663b1b08d50cc2ae8ac Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Thu, 24 Oct 2019 12:58:33 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=97=B6=E7=9A=84=E8=AE=A1=E7=AE=97=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/CarController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/controllers/CarController.php b/frontend/controllers/CarController.php index 23b1e7a..1bbc011 100644 --- a/frontend/controllers/CarController.php +++ b/frontend/controllers/CarController.php @@ -4255,7 +4255,7 @@ class CarController extends BaseController $msg .= '交强、'; if($total3 > 0) { $msg .= '车船税、'; - $tmp_total += $total3; +// $tmp_total += $total3; } // $msg .= '商业'.$total1.'元'; // $msg .= '总计'.($total_all).'元，'; From 6381ce9d6c84aa887e963fcf7842472fd1840d28 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Thu, 24 Oct 2019 16:54:14 +0800 Subject: [PATCH 4/9] test --- common/models/CarT.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/models/CarT.php b/common/models/CarT.php index b82eecf..3dbef78 100644 --- a/common/models/CarT.php +++ b/common/models/CarT.php @@ -62,7 +62,7 @@ class CarT extends \common\models\Base public function rules() { return [ - [['user_id', 'car_use_id'], 'required'], + [['user_id'], 'required'], [['user_id', 'car_type_id', 'car_use_id','seats','brand_id','series_id','displacement_id','location','invalid_id','invalid_flag','is_track','times','biaozhu','hiddenes'], 'integer'], [['register_date', 'insurer1_date', 'insurer2_date','id_man','id_number','print_date','car_man_number', 'created_at', 'updated_at'], 'safe'], [['car_no', 'factory_model', 'car_model', 'engine_no', 'car_frame_no','old_user','id_phone'], 'string', 'max' => 50], From d5ea21656350eaff467ea6d3e10c4295bf4a97fd Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Fri, 25 Oct 2019 10:06:42 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=AF=9D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=92=8C=E9=80=9A=E6=97=B6=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=B8=8D?= =?UTF-8?q?=E8=B5=B7=E4=BD=9C=E7=94=A8BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/phone-center/call-records.php | 18 ++++++++---------- frontend/views/phone-center/usercall-index.php | 18 ++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/frontend/views/phone-center/call-records.php b/frontend/views/phone-center/call-records.php index 13dc9e1..8d16853 100644 --- a/frontend/views/phone-center/call-records.php +++ b/frontend/views/phone-center/call-records.php @@ -120,6 +120,7 @@ use \common\libs\MyLib;