Skip to content

T
tl_estate
Commit beaedab1 authored by clone's avatar clone
Browse files
Options

Merge branch 'test-v1.9' into test

parents 58e503ec 91df5942
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 11 deletions
application/index/extend/Basic.php
View file @ beaedab1
......@@ -72,7 +72,12 @@ class Basic extends Controller
$this->params = $this->request->param() != null ? $this->request->param() : null;
}
// $requestPath = $this->request->routeInfo()["rule"][0] . "/" . $this->request->routeInfo()["rule"][1];
if (isset($this->request->routeInfo()["var"]["check_status"])) {
$requestPath = $this->request->routeInfo()["rule"][0] . "/" . $this->request->routeInfo()["rule"][1]. "/" . $this->request->routeInfo()["var"]["check_status"];
} else {
$requestPath = $this->request->routeInfo()["rule"][0] . "/" . $this->request->routeInfo()["rule"][1];
}
if (!in_array($requestPath, $this->filterVerify)) {
$this->userVerify();
......
public/resource/js/commissionTotal.js
View file @ beaedab1
......@@ -324,7 +324,7 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
params.deal_end_date = $('#end_dealtime').val();
params.operation_start_date = $('#create_ticketTime').val();
params.operation_end_date = $('#end_ticketTime').val();
params.district_id= $("#qx-store option:selected").val();//部门id 添加字段
params.district_id = $("#qx-store option:selected").val(); //部门id 添加字段
params.store_name = $('#store_name').val();
$.ajax({
......@@ -350,13 +350,15 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
url: '/index/getDistrictListByName',
type: 'GET',
async: true,
data: {"pageSize":50},
data: {
"pageSize": 50
},
dataType: 'json',
success: function(data) {
if(data.code == 200) {
var _html = '';
$.each(data.data, function(i, n) {
if (n.district_name == name && (typeof name != undefined)) {
if(n.district_name == name && (typeof name != undefined)) {
_html += '<option value="' + n.id + '">' + n.district_name + '</option>';
} else {
_html += '<option value="' + n.id + '">' + n.district_name + '</option>';
......@@ -365,7 +367,7 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
$("#ss-store").html(_html);
$("#qx-store").append(_html);
// $("#qx-store").html(_html);
// $("#qx-store").html(_html);
} else {
alert('获取部门信息失败');
......@@ -385,13 +387,11 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
var deal_end_date = $('#end_dealtime').val();
var operation_start_date = $('#create_ticketTime').val();
var operation_end_date = $('#end_ticketTime').val();
// var district_id = $('#user_phone').val();
var district_id= $("#qx-store option:selected").val();//部门id 添加字段
var district_id = $("#qx-store option:selected").val(); //部门id 添加字段
var store_name = $('#store_name').val();
window.open('/index/getCommissionTotalList?'+
'excel = '+ excel_two +' &name = ' + name + ' &phone = ' + phone + ' &commission_start_date = ' + commission_start_date + '& commission_end_date = ' + commission_end_date + ' &deal_start_date = ' + deal_start_date + ' &deal_end_date = ' + deal_end_date+ ' &operation_start_date = ' + operation_start_date+ ' &operation_end_date = ' + operation_end_date+ ' &district_id = ' + district_id+ ' &store_name = ' + store_name);
window.open('/index/getCommissionTotalList?' +
'excel=' + excel_two + '&name=' + name + '&phone=' + phone + '&commission_start_date=' + commission_start_date + '&commission_end_date=' + commission_end_date + '&deal_start_date=' + deal_start_date + '&deal_end_date=' + deal_end_date + '&operation_start_date=' + operation_start_date + '&operation_end_date=' + operation_end_date + '&district_id=' + district_id + '&store_name=' + store_name);
},
};
return business;
});
\ No newline at end of file
});
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment