Merge branch 'wanfang' into dev

dev
曾超新 5 years ago
commit 4dc56e2b12
  1. 2
      common/models/CarT.php
  2. 2
      frontend/controllers/CarController.php
  3. 4
      frontend/controllers/InsurerController.php
  4. 4
      frontend/controllers/PhoneCenterController.php
  5. 12
      frontend/views/insurer/search.php
  6. 22
      frontend/views/phone-center/call-records.php
  7. 22
      frontend/views/phone-center/usercall-index.php

@ -65,7 +65,7 @@ class CarT extends \common\models\Base
public function rules() public function rules()
{ {
return [ 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'], [['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'], [['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','phone1','id_phone'], 'string', 'max' => 50], [['car_no', 'factory_model', 'car_model', 'engine_no', 'car_frame_no','old_user','phone1','id_phone'], 'string', 'max' => 50],

@ -4255,7 +4255,7 @@ class CarController extends BaseController
$msg .= '交强、'; $msg .= '交强、';
if($total3 > 0) { if($total3 > 0) {
$msg .= '车船税、'; $msg .= '车船税、';
$tmp_total += $total3; // $tmp_total += $total3;
} }
// $msg .= '商业'.$total1.'元'; // $msg .= '商业'.$total1.'元';
// $msg .= '总计'.($total_all).'元,'; // $msg .= '总计'.($total_all).'元,';

@ -3718,10 +3718,10 @@ class InsurerController extends BaseController
} }
if($status > 0) { if($status > 0) {
if($status == 1) { if($status == 1) {
$query->andWhere('status>1 and status<10'); $query->andWhere('status_id>1 and status_id<10');
} }
if($status == 2) { if($status == 2) {
$query->andWhere('status=10'); $query->andWhere('status_id=10');
} }
} }
$total = $query->count(); $total = $query->count();

@ -80,10 +80,10 @@ class PhoneCenterController extends BaseController
$query->andWhere('user_t.id="'.$this->my->id.'"'); $query->andWhere('user_t.id="'.$this->my->id.'"');
} }
if($begin_time != ''){ if($begin_time != ''){
$query->andWhere('network_phone_t.begin_date>="'.$begin_time.'"'); $query->andWhere('network_phone_t.begin_time>="'.$begin_time.'"');
} }
if($end_time != ''){ if($end_time != ''){
$query->andWhere('network_phone_t.begin_date<="'.$end_time.'"'); $query->andWhere('network_phone_t.begin_time<="'.$end_time.'"');
} }
if($caller != ''){ if($caller != ''){
$query->andWhere('network_phone_t.caller='.$caller); $query->andWhere('network_phone_t.caller='.$caller);

@ -35,7 +35,7 @@ use \common\libs\MyLib;
</div> </div>
<div class="form-group" style="margin-bottom: 8px;"> <div class="form-group" style="margin-bottom: 8px;">
<label for="datepicker1">初登日期</label> <label for="datepicker1">初登日期</label>
<div class="input-group" id="datepicker1"> <div class="input-group input-daterange" id="datepicker1">
<input type="text" class="form-control" id="date_begin" name="date_begin" autocomplete="off" /> <input type="text" class="form-control" id="date_begin" name="date_begin" autocomplete="off" />
<div class="input-group-addon">-</div> <div class="input-group-addon">-</div>
<input type="text" class="form-control" id="date_end" name="date_end" autocomplete="off" /> <input type="text" class="form-control" id="date_end" name="date_end" autocomplete="off" />
@ -43,7 +43,7 @@ use \common\libs\MyLib;
</div> </div>
<div class="form-group" style="margin-bottom: 8px;"> <div class="form-group" style="margin-bottom: 8px;">
<label for="datepicker3">正本日期</label> <label for="datepicker3">正本日期</label>
<div class="input-group" id="datepicker3"> <div class="input-group input-daterange" id="datepicker3">
<input type="text" class="form-control" id="date2_begin" name="date2_begin" autocomplete="off" /> <input type="text" class="form-control" id="date2_begin" name="date2_begin" autocomplete="off" />
<div class="input-group-addon">-</div> <div class="input-group-addon">-</div>
<input type="text" class="form-control" id="date2_end" name="date2_end" autocomplete="off" /> <input type="text" class="form-control" id="date2_end" name="date2_end" autocomplete="off" />
@ -51,7 +51,7 @@ use \common\libs\MyLib;
</div> </div>
<div class="form-group" style="margin-bottom: 8px;"> <div class="form-group" style="margin-bottom: 8px;">
<label for="datepicker2">起保日期</label> <label for="datepicker2">起保日期</label>
<div class="input-group" id="datepicker2"> <div class="input-group input-daterange" id="datepicker2">
<input type="text" class="form-control" id="date3_begin" name="date3_begin" autocomplete="off" /> <input type="text" class="form-control" id="date3_begin" name="date3_begin" autocomplete="off" />
<div class="input-group-addon">-</div> <div class="input-group-addon">-</div>
<input type="text" class="form-control" id="date3_end" name="date3_end" autocomplete="off" /> <input type="text" class="form-control" id="date3_end" name="date3_end" autocomplete="off" />
@ -140,6 +140,12 @@ use \common\libs\MyLib;
$(function() { $(function() {
search(); search();
$('.input-daterange').datepicker({
keyboardNavigation: false,
forceParse: false,
autoclose: true
});
}); });
</script> </script>
<?php $this->endBlock(); ?> <?php $this->endBlock(); ?>

@ -16,7 +16,7 @@ use \common\libs\MyLib;
</div> </div>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<form role="form" class="form-inline" onsubmit="return search();"> <form role="form" id="searchFrm" class="form-inline" onsubmit="return search();">
<input type="hidden" name="company_type" id="company_type" value="<?=$company_type?>"> <input type="hidden" name="company_type" id="company_type" value="<?=$company_type?>">
<?php if($company_type == 3) { ?> <?php if($company_type == 3) { ?>
<div class="form-group" style="margin-bottom: 8px;"> <div class="form-group" style="margin-bottom: 8px;">
@ -120,6 +120,7 @@ use \common\libs\MyLib;
<script src="/assets/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script> <script src="/assets/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
<script src="/assets/js/plugins/layer/laydate/laydate.js"></script> <script src="/assets/js/plugins/layer/laydate/laydate.js"></script>
<script> <script>
var o = {};
function opFormatter(value, row, index) { function opFormatter(value, row, index) {
var opStr = []; var opStr = [];
if(row.record_file_url !== null) { if(row.record_file_url !== null) {
@ -150,23 +151,20 @@ use \common\libs\MyLib;
} }
function search() { function search() {
o = {};
var params = $("#searchFrm").serializeArray();
$.each(params, function(index) {
o[this['name']] = this['value'];
});
$('#listTable').bootstrapTable('destroy'); $('#listTable').bootstrapTable('destroy');
$('#listTable').bootstrapTable({ $('#listTable').bootstrapTable({
url: "/phone-center/call-records-json", url: "/phone-center/call-records-json",
pagination: true, pagination: true,
sidePagination: 'server', sidePagination: 'server',
queryParams: function(params) { queryParams: function(params) {
params.username = $('#username').val(); o['offset'] = params['offset'];
params.begin_time = $('#begin_time').val(); o['limit'] = params['limit'];
params.end_time = $('#end_time').val(); return o;
params.caller = $('#caller').val();
params.called = $('#called').val();
params.call_result = $('#call_result').val();
params.duration_begin = $('#duration_begin').val();
params.duration_end = $('#duration_end').val();
params.is_called = $('#is_called').val();
params.company_type = $('#company_type').val();
return params;
} }
}); });
return false; return false;

@ -16,7 +16,7 @@ use \common\libs\MyLib;
</div> </div>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<form role="form" class="form-inline" onsubmit="return search();"> <form role="form" id="searchFrm" class="form-inline" onsubmit="return search();">
<input type="hidden" name="company_type" id="company_type" value="<?=$company_type?>"> <input type="hidden" name="company_type" id="company_type" value="<?=$company_type?>">
<?php if($company_type == 3) { ?> <?php if($company_type == 3) { ?>
<div class="form-group" style="margin-bottom: 8px;"> <div class="form-group" style="margin-bottom: 8px;">
@ -66,6 +66,7 @@ use \common\libs\MyLib;
<script src="/assets/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script> <script src="/assets/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
<script src="/assets/js/plugins/layer/laydate/laydate.js"></script> <script src="/assets/js/plugins/layer/laydate/laydate.js"></script>
<script> <script>
var o = {};
function opFormatter(value, row, index) { function opFormatter(value, row, index) {
var opStr = []; var opStr = [];
opStr.push('<a href="javascript:void(0);" onclick="play(' + row.record_file_url + ')">'); opStr.push('<a href="javascript:void(0);" onclick="play(' + row.record_file_url + ')">');
@ -79,23 +80,20 @@ use \common\libs\MyLib;
} }
function search() { function search() {
o = {};
var params = $("#searchFrm").serializeArray();
$.each(params, function(index) {
o[this['name']] = this['value'];
});
$('#listTable').bootstrapTable('destroy'); $('#listTable').bootstrapTable('destroy');
$('#listTable').bootstrapTable({ $('#listTable').bootstrapTable({
url: "/phone-center/usercall-index-json", url: "/phone-center/usercall-index-json",
pagination: true, pagination: true,
sidePagination: 'server', sidePagination: 'server',
queryParams: function(params) { queryParams: function(params) {
params.username = $('#username').val(); o['offset'] = params['offset'];
params.begin_time = $('#begin_time').val(); o['limit'] = params['limit'];
params.end_time = $('#end_time').val(); return o;
params.caller = $('#caller').val();
params.called = $('#called').val();
params.call_result = $('#call_result').val();
params.duration_begin = $('#duration_begin').val();
params.duration_end = $('#duration_end').val();
params.is_called = $('#is_called').val();
params.company_type = $('#company_type').val();
return params;
} }
}); });
return false; return false;

Loading…
Cancel
Save