Skip to content

T
tl_estate
Commit 6ed8d845 authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents b25d9d7a 196beebe
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 14 deletions
application/index/controller/Finance.php
View file @ 6ed8d845
......@@ -701,18 +701,38 @@ class Finance extends Basic
$where['a.is_del'] = $select = 0;
if (!empty($this->params['create_time']) && empty($this->params['end_time'])) {
$where['f.income_time'] = [ '>= time', $this->params['create_time'] . ' 00:00:00' ];
$select = 1;
$income_where['income_time'] = [ '>= time', $this->params['create_time'] . ' 00:00:00' ];
}
if (!empty($this->params['end_time']) && empty($this->params['create_time'])) {
$where['f.income_time'] = [ '<= time', $this->params['end_time'] . ' 23:59:59' ];
$select = 1;
$income_where['income_time'] = [ '<= time', $this->params['end_time'] . ' 23:59:59' ];
}
if (!empty($this->params['end_time']) && !empty($this->params['create_time'])) {
$where['f.income_time'] = [ 'between time', [ $this->params['create_time'] . ' 00:00:00', $this->params['end_time'] . ' 23:59:59' ] ];
$select = 1;
$income_where['income_time'] = [ 'between time', [ $this->params['create_time'] . ' 00:00:00', $this->params['end_time'] . ' 23:59:59' ] ];
}
if (!empty($income_where)) {
$m_real = new ORealIncome();
$bargain_arr = $m_real->getRealIncomeBargain('bargain_id', $income_where);
if ($bargain_arr['status'] == 'successful') {
if (empty($bargain_arr['data'])) {
return $this->response(200, '');
}
foreach ($bargain_arr['data'] as $v) {
$bargain_id[] = $v['bargain_id'];
}
if (!empty($bargain_id)) {
$bargain_id_string = implode(',', $bargain_id);
$where[] = ['EXP', 'b.id in ('.$bargain_id_string.') or b.father_id in ('.$bargain_id_string.')'];
}
} else {
return $this->response(101, '内部错误：'.$bargain_arr['msg']);
}
}
if (!empty($this->params['internal_address'])) {
......@@ -832,6 +852,14 @@ class Finance extends Basic
$where[] = [ 'EXP', 'b.id =' . $this->params['bargain_id'] . ' or father_id=' . $this->params['bargain_id'] ];
}
if (!empty($this->params['store_id'])) {
$where['e.store_id'] = $this->params['store_id'];
}
if (!empty($this->params['district_id'])) {
$where['e.district_id'] = $this->params['district_id'];
}
$field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,cash,service_charge,charity_fund,real_fee,a.real_income_id,a.should_commission';
$m_commission = new OPartialCommission();
......
application/index/view/finance/commission.html
View file @ 6ed8d845
......@@ -128,7 +128,7 @@
<th class="text-center">业务员</th>
<th class="text-center">商铺地址</th>
<th class="text-center">商铺号</th>
<th class="text-center">应收佣金（元）</th>
<th class="text-center">应分佣金（元）</th>
<th class="text-center">实收佣金（元）</th>
<th class="text-center">操作</th>
</tr>
......@@ -237,7 +237,7 @@
<th class="text-center">所属部门/门店</th>
<th class="text-center">分佣比例</th>
<th class="text-center">应分佣金(元)</th>
<th class="text-center">实分佣金(元)</th>
<th class="text-center">预分佣金(元)</th>
<th class="text-center">手续费(元)</th>
<th class="text-center">慈善基金(元)</th>
<th class="text-center">现金奖(元)</th>
......
application/index/view/finance/commission_total.html
View file @ 6ed8d845
......@@ -73,7 +73,7 @@
<div class="panel panel-default">
<div class="panel-heading breadcrumb">
<li>
<a href="#">分佣提成汇总表</a>
<a href="#">实收汇总</a>
</li>
</div>
......
application/index/view/finance/tax.html
View file @ 6ed8d845
......@@ -218,7 +218,7 @@
<th class="text-center">所属部门/门店</th>
<th class="text-center">分佣比例</th>
<th class="text-center">应分佣金(元)</th>
<th class="text-center">实分佣金(元)</th>
<th class="text-center">预分佣金(元)</th>
<th class="text-center">手续费(元)</th>
<th class="text-center">慈善基金(元)</th>
<th class="text-center">现金奖(元)</th>
......
application/index/view/global/footer_tpl.html
View file @ 6ed8d845
<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=12121268' charset='utf-8'></script>
\ No newline at end of file
<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=12121269' charset='utf-8'></script>
\ No newline at end of file
public/app/js/detaila_tl.js
View file @ 6ed8d845
......@@ -52,7 +52,7 @@
$(".b3_span").html("街铺");
$('.pu_area_type').html('建筑面积');
$('.b3_span_build_type').html('建筑面积'+'：');
$('.has-housed').html('当前商铺业态'+':');
$('.has-housed').html('当前经营'+':');
}
......
public/resource/js/RemarkFollowIndex.js
View file @ 6ed8d845
......@@ -575,6 +575,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
}else{
alert('提交成功');
_genjinModal.hide();
_btnSaveTemp.hide();
_btnSave.css('display','block');
user.getGenjincon();
};
}else {
......
public/resource/js/callPhoneIndex.js
View file @ 6ed8d845
......@@ -582,6 +582,8 @@ define(['doT', 'text!temp/callPhone_template_tpl.html', 'css!style/home.css', 'c
}else{
alert('提交成功');
_genjinModal.hide();
_btnSaveTemp.hide();
_btnSave.css('display','block');
user.getGenjincon();
};
}else {
......
public/resource/js/myCollectionUserList.js
View file @ 6ed8d845
......@@ -595,6 +595,8 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'css!style/home
}else{
alert('提交成功');
_genjinModal.hide();
_btnSaveTemp.hide();
_btnSave.css('display','block');
user.getGenjincon();
};
}else {
......
public/resource/js/user.js
View file @ 6ed8d845
......@@ -735,6 +735,8 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
}else{
alert('提交成功');
_genjinModal.hide();
_btnSaveTemp.hide();
_btnSave.css('display','block');
user.getGenjincon();
};
}else {
......
public/resource/template/real_time_performance_template_tpl.html
View file @ 6ed8d845
......@@ -230,6 +230,7 @@
<!--个人-业绩 -->
<script id="performance_details_tpl" type="text/template">
[% var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); %]
[% var sw=function(s){switch(Number(s)){case 10:return"出租";case 20:return"增佣";case 30:return"代理";case 40:return"好处费";default:return s}}; %]
[% if(it[0]) { %]
<tr>
<th class="text-center">成交报告ID</th>
......@@ -249,7 +250,7 @@
<tr data-id="[%= it[item]['id'] %]" data-orderid="[%= it[item]['order_id'] %]">
<td class="text-center">[%= it[item]['id'] %]</td>
<td class="text-center">[%= it[item]['create_time'] %]</td>
<td class="text-center">[%= it[item]['trade_type'] %]</td>
<td class="text-center">[%= sw(it[item]['trade_type']) %]</td>
<td class="text-left">[%= hideStr(it[item]['landmark']) %]</td>
<td class="text-center">[%= it[item]['house_id'] %]</td>
<td class="text-center">[%= it[item]['name'] %]</td>
......
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