Skip to content

T
tl_estate
Commit 1d456731 authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents 6432659d e9f84010
Expand all Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 5 deletions
application/index/controller/Finance.php
View file @ 1d456731
...@@ -659,7 +659,7 @@ class Finance extends Basic ...@@ -659,7 +659,7 @@ class Finance extends Basic
$partial_commission[$k2]['income_time_add'] = $income_time_add; $partial_commission[$k2]['income_time_add'] = $income_time_add;
} }
} else { } else {
$income_time = $m_real->getBargainIncome($this->params['id'], 'id,income_time'); $income_time = $m_real->getIncome(['id'=>$v2['real_income_id']], 'id,income_time');
if (empty($income_time)) { if (empty($income_time)) {
$partial_commission[$k2]['income_time'] = []; $partial_commission[$k2]['income_time'] = [];
} else { } else {
......
application/index/view/finance/daily_details.html
View file @ 1d456731
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
<div class="tip-con text-danger"> <div class="tip-con text-danger">
Tips: 1、 财务日报所展示账目是 财务日报日期当天提交的收款入账和调整出账&nbsp;&nbsp;2、财务审核前，店长都可以进行修改，财务开始审核后，只有财务能修改。 注: 1、 财务日报的账目由当天的正常收款、调整收款、调整出账构成。当日的财务日报里 调整收款+调整出账=0<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2、当日的财务日报 显示当日 属于本门店的所有经纪人操作账目。即 账目的 操作人是属于本门店的，操作时间是当天。<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;3、前端开发控制 财务审核前，店长都可以进行修改，财务开始审核后，只有财务可以修改。
</div> </div>
<span class="manager-title ld-Marheight">杭州同联- 九部一组周小雨</span> <span class="manager-title ld-Marheight">杭州同联- 九部一组周小雨</span>
<input class="btn4-pk ld-Marheight input-pk-style" value="" data-rule-phoneus="false" data-rule-required="false" id="create_time_start" name="start_date1" type="date"> <input class="btn4-pk ld-Marheight input-pk-style" value="" data-rule-phoneus="false" data-rule-required="false" id="create_time_start" name="start_date1" type="date">
......
application/model/ORealIncome.php
View file @ 1d456731
...@@ -52,6 +52,21 @@ class ORealIncome extends BaseModel ...@@ -52,6 +52,21 @@ class ORealIncome extends BaseModel
->find(); ->find();
} }
/**
* @param int $bargain_id
* @param string $field
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getIncome($where, $field = 'id as fee_id,money,income_time') {
$where['is_del'] = 0;
return $this->field($field)
->where($where)
->find();
}
/** /**
* @param int $field * @param int $field
* @param array $where * @param array $where
......
application/task/controller/UpdateActivityTask.php
View file @ 1d456731
...@@ -48,7 +48,7 @@ class UpdateActivityTask ...@@ -48,7 +48,7 @@ class UpdateActivityTask
} }
/** /**
* 对活动列表筛查，设置过期领完 * 对活动列表筛查，设置过期
*/ */
public function updateActivityStatus() public function updateActivityStatus()
{ {
......
public/app/dist/index.html
View file @ 1d456731
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
if(!doc.addEventListener) return; if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false); win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false); doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.1d9082cf8bc2e7babd7a5d566509e563.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.802fee86aaed78281518.js></script></body></html> })(document, window);</script><link href=./static/css/app.54541c055ae1c7d7d44b9d68247b2596.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.134f726fb701517042ba.js></script></body></html>
\ 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