Skip to content

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

Merge branch '0618-v3.3.2' of https://gitee.com/zwyjjc/tl_estate into 0618-v3.3.2

parents 82bfb71f 4cbf3054
Expand all Show whitespace changes
Inline Side-by-side
Showing with 194 additions and 161 deletions
application/api_broker/service/OfficePerformanceService.php
View file @ 654aff77
...@@ -758,7 +758,8 @@ class OfficePerformanceService ...@@ -758,7 +758,8 @@ class OfficePerformanceService
$params = $this->getAgentIdPcInfo($id, $type, $start_time, $end_time); $params = $this->getAgentIdPcInfo($id, $type, $start_time, $end_time);
if (!$params) if (!$params)
return [ "code" => 101, "date" => "传入的参数错误" ]; return [ "code" => 101, "date" => "传入的参数错误" ];
$field = "a.id,a.create_time,a.money,a.type,a.pay_type,c.user_name,c.user_phone,c.predict_see_time,b.id as order_id,b.house_title,h.internal_address"; $field = "a.id,a.create_time,a.money,a.type,a.pay_type,c.user_name,c.user_phone,c.predict_see_time,
b.id as order_id,s.title as house_title,s.address as internal_address";
$payLogList = $this->payLogModel->getAddPayLogListPcInfo($params, $field, $page_no, $page_size); $payLogList = $this->payLogModel->getAddPayLogListPcInfo($params, $field, $page_no, $page_size);
//获取图片信息 //获取图片信息
foreach ($payLogList as $key => $val) { foreach ($payLogList as $key => $val) {
......
application/index/controller/Finance.php
View file @ 654aff77
...@@ -2760,9 +2760,9 @@ class Finance extends Basic ...@@ -2760,9 +2760,9 @@ class Finance extends Basic
if (!empty($where)) { if (!empty($where)) {
//获取被修改人信息 //获取被修改人信息
$m_agent = new AAgents(); $m_agent = new AAgents();
$agent_data = $m_agent->agentBargainAll('a.id,a.store_id,a.district_id,b.create_time', $where); $agent_data = $m_agent->agentBargainAll('a.id,a.store_id,a.district_id,d.income_time', $where);
foreach ($agent_data as $k=>$v) { foreach ($agent_data as $k=>$v) {
$create_time = date('Y-m-d', strtotime($v['create_time'])); $create_time = date('Y-m-d', strtotime($v['income_time']));
$this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $create_time); $this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $create_time);
} }
$data['status'] = 'successful'; $data['status'] = 'successful';
...@@ -2832,7 +2832,7 @@ class Finance extends Basic ...@@ -2832,7 +2832,7 @@ class Finance extends Basic
$where_bargain['agent_id'] = $agent_id; $where_bargain['agent_id'] = $agent_id;
$where_bargain['create_time'] = ['BETWEEN', [$date.' 00:00:00', $date.' 23:59:59']]; $where_bargain['create_time'] = ['BETWEEN', [$date.' 00:00:00', $date.' 23:59:59']];
//实收 //实收
$receivedSum = $this->m_bargain->getAddBargainNumGroupTimeNew($where_bargain, 2); //1表示业绩 2表示实收 $receivedSum = $this->m_bargain->getReceivedGroupTimeNew($where_bargain); //1表示业绩 2表示实收
$received_sum = empty($receivedSum[0]["num"]) ? 0 : $receivedSum[0]["num"]; $received_sum = empty($receivedSum[0]["num"]) ? 0 : $receivedSum[0]["num"];
//业绩 //业绩
......
application/index/controller/OfficeBargain.php
View file @ 654aff77
...@@ -24,6 +24,7 @@ use app\model\OfficeTAgentTotalModel; ...@@ -24,6 +24,7 @@ use app\model\OfficeTAgentTotalModel;
use app\model\TAgentTotalModel; use app\model\TAgentTotalModel;
use app\model\Users; use app\model\Users;
use app\task\controller\ResultsSummaryNewTask; use app\task\controller\ResultsSummaryNewTask;
use app\task\controller\ResultsSummaryOfficeTask;
use think\Request; use think\Request;
class OfficeBargain extends Basic class OfficeBargain extends Basic
...@@ -483,10 +484,10 @@ class OfficeBargain extends Basic ...@@ -483,10 +484,10 @@ class OfficeBargain extends Basic
*/ */
public function editRecordLog(int $bargain_id, string $step_content = '', int $type = 1, string $house_number = '', $is_open = 0) public function editRecordLog(int $bargain_id, string $step_content = '', int $type = 1, string $house_number = '', $is_open = 0)
{ {
$house_number_table = $this->m_bargain->getCheckBargain('a.house_number,c.internal_address', (int)$bargain_id, '10,11,12,13,20,21,30'); $house_number_table = $this->m_bargain->getCheckBargain('a.house_number,e.address', (int)$bargain_id, '10,11,12,13,20,21,30');
if (!empty($house_number_table['internal_address'])) { if (!empty($house_number_table['address'])) {
$step_content .= "[{$house_number_table['internal_address']}]"; $step_content .= "[{$house_number_table['address']}]";
} }
if (empty($house_number)) { if (empty($house_number)) {
...@@ -646,7 +647,7 @@ class OfficeBargain extends Basic ...@@ -646,7 +647,7 @@ class OfficeBargain extends Basic
*/ */
private function updatePerformanceData($id, $create_time, $store_id, $district_id) { private function updatePerformanceData($id, $create_time, $store_id, $district_id) {
//更新业绩统计 //更新业绩统计
$sum = new ResultsSummaryNewTask(); $sum = new ResultsSummaryOfficeTask();
$date = date('Y-m-d', strtotime($create_time)); $date = date('Y-m-d', strtotime($create_time));
$sum->updateTotalByAgentId($id, $store_id, $district_id, $date, $this->siteId); //被修改的人 $sum->updateTotalByAgentId($id, $store_id, $district_id, $date, $this->siteId); //被修改的人
} }
...@@ -770,7 +771,7 @@ class OfficeBargain extends Basic ...@@ -770,7 +771,7 @@ class OfficeBargain extends Basic
$where_bargain['agent_id'] = $agent_id; $where_bargain['agent_id'] = $agent_id;
$where_bargain['create_time'] = ['BETWEEN', [$date.' 00:00:00', $date.' 23:59:59']]; $where_bargain['create_time'] = ['BETWEEN', [$date.' 00:00:00', $date.' 23:59:59']];
//实收 //实收
$receivedSum = $this->m_bargain->getAddBargainNumGroupTimeNew($where_bargain, 2); //1表示业绩 2表示实收 $receivedSum = $this->m_bargain->getReceivedGroupTimeNew($where_bargain); //1表示业绩 2表示实收
$received_sum = empty($receivedSum[0]["num"]) ? 0 : $receivedSum[0]["num"]; $received_sum = empty($receivedSum[0]["num"]) ? 0 : $receivedSum[0]["num"];
//业绩 //业绩
...@@ -829,9 +830,9 @@ class OfficeBargain extends Basic ...@@ -829,9 +830,9 @@ class OfficeBargain extends Basic
if (!empty($where)) { if (!empty($where)) {
//获取被修改人信息 //获取被修改人信息
$m_agent = new AAgents(); $m_agent = new AAgents();
$agent_data = $m_agent->agentBargainAll('a.id,a.store_id,a.district_id,b.create_time', $where); $agent_data = $m_agent->agentBargainOfficeAll('a.id,a.store_id,a.district_id,d.income_time', $where);
foreach ($agent_data as $k=>$v) { foreach ($agent_data as $k=>$v) {
$create_time = date('Y-m-d', strtotime($v['create_time'])); $create_time = date('Y-m-d', strtotime($v['income_time']));
$this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $create_time); $this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $create_time);
} }
$data['status'] = 'successful'; $data['status'] = 'successful';
......
application/index/service/OfficeRoomService.php
View file @ 654aff77
...@@ -1059,17 +1059,17 @@ class OfficeRoomService ...@@ -1059,17 +1059,17 @@ class OfficeRoomService
/*创建时间*/ /*创建时间*/
if (isset($params['create_time_start'])) { if (isset($params['create_time_start'])) {
$where['a.create_time'] = $params['create_time_start']; $where['a.create_time'] = $params['create_time_start'] . ' 00:00:00';
} }
/*创建时间*/ /*创建时间*/
if (isset($params['create_time_end'])) { if (isset($params['create_time_end'])) {
$where['a.create_time'] = $params['create_time_end']; $where['a.create_time'] = $params['create_time_end']. ' 23:59:59';
} }
/*创建时间*/ /*创建时间*/
if (isset($params['create_time_start']) && isset($params['create_time_end'])) { if (isset($params['create_time_start']) && isset($params['create_time_end'])) {
$where['a.create_time'] = ['between', [$params['create_time_start'], $params['create_time_end']]]; $where['a.create_time'] = ['between', [$params['create_time_start'] . ' 00:00:00', $params['create_time_end']. ' 23:59:59']];
} }
//是否对客户展示 0是1否显示在c端用户 //是否对客户展示 0是1否显示在c端用户
......
application/index/view/officeBuilding/account_statement_office.html
View file @ 654aff77
...@@ -1393,15 +1393,6 @@ ...@@ -1393,15 +1393,6 @@
</tr> </tr>
<!--中介费--> <!--中介费-->
<tr class="zhongjiefei"> <tr class="zhongjiefei">
<td>
<span class="span-width-90">是否开业：</span>
<!--<span class="shop-is-open">是</span>-->
<select class="shop-is-open">
<option value="3">请选择</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</td>
<td> <td>
<span class="span-width-90">是否分红：</span> <span class="span-width-90">是否分红：</span>
<select class="commission-type-zhongjie"> <select class="commission-type-zhongjie">
...@@ -1410,6 +1401,14 @@ ...@@ -1410,6 +1401,14 @@
<option value="2">否</option> <option value="2">否</option>
</select> </select>
</td> </td>
<td>
<!--<span class="span-width-90">是否开业：</span>
<select class="shop-is-open">
<option value="3">请选择</option>
<option value="1">是</option>
<option value="0">否</option>
</select>-->
</td>
</tr> </tr>
<tr class="zhongjiefei"> <tr class="zhongjiefei">
<td> <td>
......
application/index/view/officeBuilding/getCollectionOffice.html
View file @ 654aff77
...@@ -593,13 +593,13 @@ ...@@ -593,13 +593,13 @@
</div> </div>
<div class="col-xs-6 choose_topic_1"> <div class="col-xs-6 choose_topic_1">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">是否开业:</span></strong> <!--<strong><span class="col-xs-4 ld-Marheight">是否开业:</span></strong>-->
<div class="col-xs-6"> <div class="col-xs-6">
<select class="form-control " id="change_kaiye"> <!--<select class="form-control " id="change_kaiye">
<option value="3">请选择</option> <option value="3">请选择</option>
<option value="0">否</option> <option value="0">否</option>
<option value="1">是</option> <option value="1">是</option>
</select> </select>-->
</div> </div>
</div> </div>
</div> </div>
...@@ -928,19 +928,6 @@ ...@@ -928,19 +928,6 @@
</div> </div>
</div> </div>
<div class="col-xs-12"> <div class="col-xs-12">
<div class="col-xs-6 ky">
<div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">是否开业:</span></strong>
<div class="col-xs-6">
<!--<span id="running" class="col-xs-6 ld-Marheight"></span>-->
<select class="form-control" id="running" disabled="disabled">
<option value="3">请选择</option>
<option value="0">否</option>
<option value="1">是</option>
</select>
</div>
</div>
</div>
<div class="col-xs-6 xqac"> <div class="col-xs-6 xqac">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">是否分红:</span></strong> <strong><span class="col-xs-3 ld-Marheight">是否分红:</span></strong>
...@@ -953,13 +940,27 @@ ...@@ -953,13 +940,27 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-6 ky">
<div class="form-group">
<!--<strong><span class="col-xs-3 ld-Marheight">是否开业:</span></strong>-->
<div class="col-xs-6">
<!--<span id="running" class="col-xs-6 ld-Marheight"></span>-->
<!--<select class="form-control" id="running" disabled="disabled">
<option value="3">请选择</option>
<option value="0">否</option>
<option value="1">是</option>
</select>-->
</div>
</div>
</div>
</div> </div>
<div class="col-xs-12"> <div class="col-xs-12">
<div class="col-xs-6 ky"> <div class="col-xs-6 ky">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">开业确定时间:</span></strong> <!--<strong><span class="col-xs-3 ld-Marheight">开业确定时间:</span></strong>-->
<!--<div class="col-xs-6">--> <!--<div class="col-xs-6">-->
<span id="open_time" class="col-xs-6 ld-Marheight"></span> <!--<span id="open_time" class="col-xs-6 ld-Marheight"></span>-->
<!--</div>--> <!--</div>-->
</div> </div>
</div> </div>
......
application/model/AAgents.php
View file @ 654aff77
...@@ -1346,6 +1346,28 @@ class AAgents extends BaseModel ...@@ -1346,6 +1346,28 @@ class AAgents extends BaseModel
$data = $this->alias('a') $data = $this->alias('a')
->field($field) ->field($field)
->join('o_bargain b', 'a.id = b.agent_id', 'left') ->join('o_bargain b', 'a.id = b.agent_id', 'left')
->join("o_partial_commission c", "b.id = c.bargain_id", "left")
->join('o_real_income d', 'c.real_income_id = d.id', 'left')
->where($where)
->select();
} catch (\Exception $e) {
$data = [];
}
return $data;
}
/**
* @param $field
* @param $where
* @return array|false|\PDOStatement|string|\think\Model
*/
public function agentBargainOfficeAll($field, $where) {
try {
$data = $this->alias('a')
->field($field)
->join('office_o_bargain b', 'a.id = b.agent_id', 'left')
->join("office_o_partial_commission c", "b.id = c.bargain_id", "left")
->join('office_o_real_income d', 'c.real_income_id = d.id', 'left')
->where($where) ->where($where)
->select(); ->select();
} catch (\Exception $e) { } catch (\Exception $e) {
......
application/model/OBargainModel.php
View file @ 654aff77
...@@ -640,7 +640,7 @@ class OBargainModel extends Model ...@@ -640,7 +640,7 @@ class OBargainModel extends Model
if (isset($params["create_time"])) { if (isset($params["create_time"])) {
$where_["c.income_time"] = $params["create_time"]; $where_["c.income_time"] = $params["create_time"];
} }
$where_["a.status"] = array( "in", "10,11,13" );
return Db::table($this->table) return Db::table($this->table)
->field($field) ->field($field)
->alias("a") ->alias("a")
......
application/model/OfficeOBargainModel.php
View file @ 654aff77
...@@ -147,7 +147,7 @@ class OfficeOBargainModel extends Model ...@@ -147,7 +147,7 @@ class OfficeOBargainModel extends Model
$data = $this->db_ $data = $this->db_
->field("a.id,a.industry_type") ->field("a.id,a.industry_type")
->alias("a") ->alias("a")
->join("o_order b", "a.order_id=b.id", "left") ->join("office_o_order b", "a.order_id=b.id", "left")
->where($params) ->where($params)
->select(); ->select();
$str = ""; $str = "";
...@@ -216,7 +216,7 @@ class OfficeOBargainModel extends Model ...@@ -216,7 +216,7 @@ class OfficeOBargainModel extends Model
return Db::table($this->table) return Db::table($this->table)
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_order b", "a.order_id = b.id", "left") ->join("office_o_order b", "a.order_id = b.id", "left")
->join("a_agents c", "a.agent_id = c.id", "left") ->join("a_agents c", "a.agent_id = c.id", "left")
->join("a_store d", "c.store_id = d.id", "left") ->join("a_store d", "c.store_id = d.id", "left")
->where($where_) ->where($where_)
...@@ -494,8 +494,8 @@ class OfficeOBargainModel extends Model ...@@ -494,8 +494,8 @@ class OfficeOBargainModel extends Model
public function getBargainOrderList($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field, $params) public function getBargainOrderList($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field, $params)
{ {
$data = $this->field($field)->alias('a') $data = $this->field($field)->alias('a')
->join('o_report b', 'a.report_id = b.id', 'left') ->join('office_o_report b', 'a.report_id = b.id', 'left')
->join('o_order c', 'a.order_id = c.id', 'left') ->join('office_o_order c', 'a.order_id = c.id', 'left')
->join('g_houses d', 'c.house_id = d.id', 'left') ->join('g_houses d', 'c.house_id = d.id', 'left')
->where($params) ->where($params)
->order($order_) ->order($order_)
...@@ -571,6 +571,7 @@ class OfficeOBargainModel extends Model ...@@ -571,6 +571,7 @@ class OfficeOBargainModel extends Model
if (isset($params["create_time"])) { if (isset($params["create_time"])) {
$where_["c.income_time"] = $params["create_time"]; $where_["c.income_time"] = $params["create_time"];
} }
$where_["a.status"] = array( "in", "10,11,13" );
return Db::table($this->table) return Db::table($this->table)
->field($field) ->field($field)
...@@ -687,7 +688,7 @@ class OfficeOBargainModel extends Model ...@@ -687,7 +688,7 @@ class OfficeOBargainModel extends Model
if (isset($params["is_case"]) && $params["is_case"] == 2) { if (isset($params["is_case"]) && $params["is_case"] == 2) {
$where_["a.father_id"] = 0; $where_["a.father_id"] = 0;
} }
array_push($join, [ ' o_report c', 'a.report_id=c.id', 'left' ]); array_push($join, [ ' office_o_report c', 'a.report_id=c.id', 'left' ]);
} }
if (isset($params["agent_id"])) { if (isset($params["agent_id"])) {
...@@ -703,7 +704,7 @@ class OfficeOBargainModel extends Model ...@@ -703,7 +704,7 @@ class OfficeOBargainModel extends Model
if (isset($params["house_ids"])) { if (isset($params["house_ids"])) {
$where_["b.house_id"] = array( "in", $params["house_ids"] ); $where_["b.house_id"] = array( "in", $params["house_ids"] );
array_push($join, [ ' o_order b', 'a.order_id = b.id', 'left' ]); array_push($join, [ ' office_o_order b', 'a.order_id = b.id', 'left' ]);
} }
if (isset($params["status"])) { if (isset($params["status"])) {
...@@ -745,7 +746,7 @@ class OfficeOBargainModel extends Model ...@@ -745,7 +746,7 @@ class OfficeOBargainModel extends Model
if (isset($params["house_ids"])) { if (isset($params["house_ids"])) {
$where_["b.house_id"] = array( "in", $params["house_ids"] ); $where_["b.house_id"] = array( "in", $params["house_ids"] );
array_push($join, [ ' o_order b', 'a.order_id = b.id', 'left' ]); array_push($join, [ ' office_o_order b', 'a.order_id = b.id', 'left' ]);
} }
$return = Db::table($this->table) $return = Db::table($this->table)
...@@ -920,8 +921,8 @@ class OfficeOBargainModel extends Model ...@@ -920,8 +921,8 @@ class OfficeOBargainModel extends Model
$data = Db::table($this->table) $data = Db::table($this->table)
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_order b", "a.order_id = b.id", "left") ->join("office_o_order b", "a.order_id = b.id", "left")
->join("o_report c", "b.f_id = c.id", "left") ->join("office_o_report c", "b.f_id = c.id", "left")
//->join('g_houses d', 'b.house_id = d.id', 'left') //->join('g_houses d', 'b.house_id = d.id', 'left')
->where($where_) ->where($where_)
->select(); ->select();
...@@ -1294,8 +1295,9 @@ class OfficeOBargainModel extends Model ...@@ -1294,8 +1295,9 @@ class OfficeOBargainModel extends Model
public function getCheckBargain(string $field, int $id, $status = '10,11') public function getCheckBargain(string $field, int $id, $status = '10,11')
{ {
return $this->field($field)->alias('a') return $this->field($field)->alias('a')
->join('o_order b', 'a.order_id=b.id', 'left') ->join('office_o_order b', 'a.order_id=b.id', 'left')
->join('g_houses c', 'b.house_id=c.id', 'left') ->join('office_g_room c', 'b.house_id=c.id', 'left')
->join('office_g_building e', 'c.building_id=e.id', 'left')
->join('a_agents d', 'a.agent_id=d.id','left') ->join('a_agents d', 'a.agent_id=d.id','left')
->where('a.status', 'in', $status) ->where('a.status', 'in', $status)
->where('a.id', $id) ->where('a.id', $id)
...@@ -1389,14 +1391,14 @@ class OfficeOBargainModel extends Model ...@@ -1389,14 +1391,14 @@ class OfficeOBargainModel extends Model
$result = $this->db_ $result = $this->db_
->field($filed) ->field($filed)
->alias("Obargain") ->alias("Obargain")
->join("o_report Oreport", "Obargain.report_id = Oreport.id", "left") ->join("office_o_report Oreport", "Obargain.report_id = Oreport.id", "left")
->join("o_order Oorder", "Obargain.order_id = Oorder.id", "left") ->join("office_o_order Oorder", "Obargain.order_id = Oorder.id", "left")
->join("office_g_room Room", "Oorder.house_id = Room.id", "left") ->join("office_g_room Room", "Oorder.house_id = Room.id", "left")
->join("office_g_building Houses", "Room.building_id = Houses.id", "left") ->join("office_g_building Houses", "Room.building_id = Houses.id", "left")
->join("a_agents Agent", "Obargain.agent_id = Agent.id", "left") ->join("a_agents Agent", "Obargain.agent_id = Agent.id", "left")
// ->join('a_store Store', 'Agent.store_id = Store.id', 'left') //->join('a_store Store', 'Agent.store_id = Store.id', 'left')
// ->join('a_district District', 'Agent.district_id = District.id', 'left') //->join('a_district District', 'Agent.district_id = District.id', 'left')
->join('o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left') ->join('o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left')
->where($where) ->where($where)
...@@ -1413,13 +1415,13 @@ class OfficeOBargainModel extends Model ...@@ -1413,13 +1415,13 @@ class OfficeOBargainModel extends Model
$result = $this->db_ $result = $this->db_
->field($filed) ->field($filed)
->alias("Obargain") ->alias("Obargain")
->join("o_report Oreport", "Obargain.report_id = Oreport.id", "left") ->join("office_o_report Oreport", "Obargain.report_id = Oreport.id", "left")
->join("o_order Oorder", "Obargain.order_id = Oorder.id", "left") ->join("office_o_order Oorder", "Obargain.order_id = Oorder.id", "left")
->join("office_g_room Room", "Oorder.house_id = Room.id", "left") ->join("office_g_room Room", "Oorder.house_id = Room.id", "left")
->join("office_g_building Houses", "Room.building_id = Houses.id", "left") ->join("office_g_building Houses", "Room.building_id = Houses.id", "left")
->join("a_agents Agent", "Obargain.agent_id = Agent.id", "left") ->join("a_agents Agent", "Obargain.agent_id = Agent.id", "left")
// ->join('a_store Store', 'Agent.store_id = Store.id', 'left') //->join('a_store Store', 'Agent.store_id = Store.id', 'left')
// ->join('a_district District', 'Agent.district_id = District.id', 'left') //->join('a_district District', 'Agent.district_id = District.id', 'left')
->join('o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left') ->join('o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left')
->where($where) ->where($where)
->order("Obargain.create_time desc") ->order("Obargain.create_time desc")
...@@ -1433,8 +1435,8 @@ class OfficeOBargainModel extends Model ...@@ -1433,8 +1435,8 @@ class OfficeOBargainModel extends Model
$result = $this->db_ $result = $this->db_
->field($filed) ->field($filed)
->alias("Obargain") ->alias("Obargain")
->join("o_report Oreport", "Obargain.report_id = Oreport.id", "left") ->join("office_o_report Oreport", "Obargain.report_id = Oreport.id", "left")
->join("o_order Oorder", "Obargain.order_id = Oorder.id", "left") ->join("office_o_order Oorder", "Obargain.order_id = Oorder.id", "left")
->join("g_houses Houses", "Oorder.house_id = Houses.id", "left") ->join("g_houses Houses", "Oorder.house_id = Houses.id", "left")
->join("a_agents Agent", "Obargain.agent_id = Agent.id", "left") ->join("a_agents Agent", "Obargain.agent_id = Agent.id", "left")
// ->join('a_store Store', 'Agent.store_id = Store.id', 'left') // ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
...@@ -1457,8 +1459,8 @@ class OfficeOBargainModel extends Model ...@@ -1457,8 +1459,8 @@ class OfficeOBargainModel extends Model
$result = $this->db_ $result = $this->db_
->field($filed) ->field($filed)
->alias("Obargain") ->alias("Obargain")
->join("o_report Oreport", "Obargain.report_id = Oreport.id", "left") ->join("office_o_report Oreport", "Obargain.report_id = Oreport.id", "left")
->join("o_order Oorder", "Obargain.order_id = Oorder.id", "left") ->join("office_o_order Oorder", "Obargain.order_id = Oorder.id", "left")
->join("g_houses Houses", "Oorder.house_id = Houses.id", "left") ->join("g_houses Houses", "Oorder.house_id = Houses.id", "left")
->join("a_agents Agent", "Obargain.agent_id = Agent.id", "left") ->join("a_agents Agent", "Obargain.agent_id = Agent.id", "left")
// ->join('a_store Store', 'Agent.store_id = Store.id', 'left') // ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
...@@ -1513,10 +1515,10 @@ class OfficeOBargainModel extends Model ...@@ -1513,10 +1515,10 @@ class OfficeOBargainModel extends Model
$result = $this->db_ $result = $this->db_
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_order b", "a.order_id = b.id", "left") ->join("office_o_order b", "a.order_id = b.id", "left")
->join("office_o_report d", "a.report_id = d.id", "left")
->join("office_g_room c", "b.house_id = c.id", "left") ->join("office_g_room c", "b.house_id = c.id", "left")
->join("o_report d", "a.report_id = d.id", "left") ->join("office_g_building e", "c.building_id = e.id", "left")
->join("office_g_building e", "e.id = c.building_id", "left")
->where($where_) ->where($where_)
->limit($page_size) ->limit($page_size)
...@@ -1538,7 +1540,7 @@ class OfficeOBargainModel extends Model ...@@ -1538,7 +1540,7 @@ class OfficeOBargainModel extends Model
$return = Db::table($this->table) $return = Db::table($this->table)
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_order b", "a.order_id = b.id", "left") ->join("office_o_order b", "a.order_id = b.id", "left")
->join("g_houses c", "b.house_id = c.id", "left") ->join("g_houses c", "b.house_id = c.id", "left")
->where($params) ->where($params)
->select(); ->select();
...@@ -1554,8 +1556,8 @@ class OfficeOBargainModel extends Model ...@@ -1554,8 +1556,8 @@ class OfficeOBargainModel extends Model
*/ */
public function sumField($field, $where) { public function sumField($field, $where) {
return $this->field($field)->alias('a') return $this->field($field)->alias('a')
->join('o_report b', 'a.report_id = b.id', 'left') ->join('office_o_report b', 'a.report_id = b.id', 'left')
->join('o_order c', 'a.order_id = c.id', 'left') ->join('office_o_order c', 'a.order_id = c.id', 'left')
->join('g_houses d', 'c.house_id = d.id', 'left') ->join('g_houses d', 'c.house_id = d.id', 'left')
->where($where) ->where($where)
->group('a.id') ->group('a.id')
......
application/model/OfficeOMarchInModel.php
View file @ 654aff77
...@@ -348,8 +348,8 @@ class OfficeOMarchInModel extends Model ...@@ -348,8 +348,8 @@ class OfficeOMarchInModel extends Model
->field($field) ->field($field)
->alias('a') ->alias('a')
->join('a_agents b', 'a.reception_id = b.id', 'left') ->join('a_agents b', 'a.reception_id = b.id', 'left')
->join('office_office_o_order c', 'a.order_id = c.id', 'left') ->join('office_o_order c', 'a.order_id = c.id', 'left')
->join('office_office_o_report d', 'a.report_id = d.id', 'left') ->join('office_o_report d', 'a.report_id = d.id', 'left')
->join('a_store e', 'd.report_store_id = e.id', 'left') ->join('a_store e', 'd.report_store_id = e.id', 'left')
->join('office_g_room f', 'c.house_id = f.id', 'left') ->join('office_g_room f', 'c.house_id = f.id', 'left')
->join('office_g_building g', 'f.building_id = g.id', 'left') ->join('office_g_building g', 'f.building_id = g.id', 'left')
...@@ -372,8 +372,8 @@ class OfficeOMarchInModel extends Model ...@@ -372,8 +372,8 @@ class OfficeOMarchInModel extends Model
return $this->field($field) return $this->field($field)
->alias('a') ->alias('a')
->join('a_agents b', 'a.reception_id = b.id', 'left') ->join('a_agents b', 'a.reception_id = b.id', 'left')
->join('office_office_o_order c', 'a.order_id = c.id', 'left') ->join('office_o_order c', 'a.order_id = c.id', 'left')
->join('office_office_o_report d', 'a.report_id = d.id', 'left') ->join('office_o_report d', 'a.report_id = d.id', 'left')
->join('a_store e', 'd.report_store_id = e.id', 'left') ->join('a_store e', 'd.report_store_id = e.id', 'left')
->join('office_g_room f', 'c.house_id = f.id', 'left') ->join('office_g_room f', 'c.house_id = f.id', 'left')
->join('office_g_building g', 'f.building_id = g.id', 'left') ->join('office_g_building g', 'f.building_id = g.id', 'left')
...@@ -411,7 +411,7 @@ class OfficeOMarchInModel extends Model ...@@ -411,7 +411,7 @@ class OfficeOMarchInModel extends Model
public function getMaxMarchInAgent($field, $where) { public function getMaxMarchInAgent($field, $where) {
return $this->alias('a') return $this->alias('a')
->field($field) ->field($field)
->join('office_office_o_order b', 'a.order_id = b.id', 'left') ->join('office_o_order b', 'a.order_id = b.id', 'left')
->where($where) ->where($where)
->group('a.reception_id ') ->group('a.reception_id ')
->find(); ->find();
......
application/model/OfficeOPayLogModel.php
View file @ 654aff77
...@@ -148,7 +148,7 @@ class OfficeOPayLogModel extends Model ...@@ -148,7 +148,7 @@ class OfficeOPayLogModel extends Model
return Db::table($this->table) return Db::table($this->table)
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_order b", "a.order_id = b.id", "left") ->join("office_o_order b", "a.order_id = b.id", "left")
->join("a_agents c", "a.agent_id = c.id", "left") ->join("a_agents c", "a.agent_id = c.id", "left")
->join("a_store d", "c.store_id = d.id", "left") ->join("a_store d", "c.store_id = d.id", "left")
->where($where_) ->where($where_)
...@@ -229,7 +229,7 @@ class OfficeOPayLogModel extends Model ...@@ -229,7 +229,7 @@ class OfficeOPayLogModel extends Model
return Db::table($this->table) return Db::table($this->table)
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_order b", "a.order_id = b.id", "left") ->join("office_o_order b", "a.order_id = b.id", "left")
->where($where_) ->where($where_)
->select(); ->select();
} }
...@@ -257,8 +257,8 @@ class OfficeOPayLogModel extends Model ...@@ -257,8 +257,8 @@ class OfficeOPayLogModel extends Model
return Db::table($this->table) return Db::table($this->table)
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_order b", "a.order_id = b.id", "left") ->join("office_o_order b", "a.order_id = b.id", "left")
->join("o_report c", "b.f_id = c.id", "left") ->join("office_o_report c", "b.f_id = c.id", "left")
->where($where_) ->where($where_)
->limit($page_size) ->limit($page_size)
->page($page_no) ->page($page_no)
...@@ -281,9 +281,11 @@ class OfficeOPayLogModel extends Model ...@@ -281,9 +281,11 @@ class OfficeOPayLogModel extends Model
return Db::table($this->table) return Db::table($this->table)
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_order b", "a.order_id = b.id", "left") ->join("office_o_order b", "a.order_id = b.id", "left")
->join("g_houses h", "b.house_id = h.id", "left") // ->join("g_houses h", "b.house_id = h.id", "left")
->join("o_report c", "b.f_id = c.id", "left") ->join("office_o_report c", "b.f_id = c.id", "left")
->join("office_g_room r", "b.house_id = r.id", "left")
->join("office_g_building s", "r.building_id = s.id", "left")
->where($where_) ->where($where_)
->limit($page_size) ->limit($page_size)
->page($page_no) ->page($page_no)
...@@ -315,8 +317,8 @@ class OfficeOPayLogModel extends Model ...@@ -315,8 +317,8 @@ class OfficeOPayLogModel extends Model
return Db::table($this->table) return Db::table($this->table)
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_order b", "a.order_id = b.id", "left") ->join("office_o_order b", "a.order_id = b.id", "left")
->join("o_report c", "b.f_id = c.id", "left") ->join("office_o_report c", "b.f_id = c.id", "left")
//->join('g_houses d','b.house_id = d.id','left') //->join('g_houses d','b.house_id = d.id','left')
->where($where_) ->where($where_)
->group("a.id") ->group("a.id")
...@@ -388,7 +390,7 @@ class OfficeOPayLogModel extends Model ...@@ -388,7 +390,7 @@ class OfficeOPayLogModel extends Model
$data = Db::table($this->table) $data = Db::table($this->table)
->alias("a") ->alias("a")
->join("o_order b", "a.order_id = b.id", "left") ->join("office_o_order b", "a.order_id = b.id", "left")
->join('g_houses d', 'b.house_id = d.id', 'left') ->join('g_houses d', 'b.house_id = d.id', 'left')
->join('a_agents e', 'a.agent_id=e.id', 'left') ->join('a_agents e', 'a.agent_id=e.id', 'left')
->join('o_bargain f', 'a.bargain_id=f.id', 'left') ->join('o_bargain f', 'a.bargain_id=f.id', 'left')
...@@ -397,7 +399,7 @@ class OfficeOPayLogModel extends Model ...@@ -397,7 +399,7 @@ class OfficeOPayLogModel extends Model
} else { } else {
$data = Db::table($this->table) $data = Db::table($this->table)
->alias("a") ->alias("a")
->join("o_order b", "a.order_id = b.id", "left") ->join("office_o_order b", "a.order_id = b.id", "left")
->join('g_houses d', 'b.house_id = d.id', 'left') ->join('g_houses d', 'b.house_id = d.id', 'left')
->join('a_agents e', 'a.agent_id=e.id', 'left') ->join('a_agents e', 'a.agent_id=e.id', 'left')
->join('o_bargain f', 'a.bargain_id=f.id', 'left') ->join('o_bargain f', 'a.bargain_id=f.id', 'left')
...@@ -627,7 +629,7 @@ class OfficeOPayLogModel extends Model ...@@ -627,7 +629,7 @@ class OfficeOPayLogModel extends Model
return $this->db_ return $this->db_
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_report b", "a.report_id = b.id", "left") ->join("office_o_report b", "a.report_id = b.id", "left")
->where($where_) ->where($where_)
->order('a.create_time asc') ->order('a.create_time asc')
->find(); ->find();
......
application/model/OfficeOReportModel.php
View file @ 654aff77
This diff is collapsed.
application/task/controller/ResultsSummaryOfficeTask.php
View file @ 654aff77
...@@ -365,7 +365,7 @@ class ResultsSummaryOfficeTask ...@@ -365,7 +365,7 @@ class ResultsSummaryOfficeTask
} }
if (!empty($where)) { if (!empty($where)) {
//获取被修改人信息 //获取被修改人信息
$agent_data = $this->agentsModel->agentBargainAll('a.id,a.store_id,a.district_id,b.create_time', $where); $agent_data = $this->agentsModel->agentBargainOfficeAll('a.id,a.store_id,a.district_id,b.create_time', $where);
foreach ($agent_data as $k => $v) { foreach ($agent_data as $k => $v) {
$create_time = date('Y-m-d', strtotime($v['create_time'])); $create_time = date('Y-m-d', strtotime($v['create_time']));
$this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $create_time); $this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $create_time);
......
public/resource/js/financial_manager_daily_list.js
View file @ 654aff77
...@@ -1867,7 +1867,12 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -1867,7 +1867,12 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
if (!params) { if (!params) {
return false ; return false ;
} }
$.post('/index/refundPayLog',params,function(data){ if(bargain.isOffice == 1){
bargain.isOfficeUrl = '/index/refundPayLog';//商铺
}else{
bargain.isOfficeUrl = '/office_index/refundPayLog';//办公楼
}
$.post(bargain.isOfficeUrl,params,function(data){
if(data.code == 200) { if(data.code == 200) {
$('#modal-back').modal("hide") $('#modal-back').modal("hide")
bargain.getList(); bargain.getList();
...@@ -2112,7 +2117,7 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -2112,7 +2117,7 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
return params ; return params ;
}, },
getReportDataByDetail : function(val){//调整页面 搜索成交报告id相关 getReportDataByDetail : function(val){//调整页面 搜索成交报告id相关
$.post('/index/getCollection',{'val':val},function(data){ $.post('/office_index/getCollection',{'val':val},function(data){
if(data.code == 200) { if(data.code == 200) {
return data ; return data ;
} else { } else {
......
public/resource/js/getCollectionOffice.js
View file @ 654aff77
...@@ -1032,11 +1032,11 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home ...@@ -1032,11 +1032,11 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home
var params = { var params = {
'order_id' : that.order_id , 'order_id' : that.order_id ,
'order_no' : that.order_no, 'order_no' : that.order_no,
// 'agent_id' : that.agent_id, 'AuthToken' : JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))).AuthToken,
'agent_id' : JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))).id, 'agent_id' : JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))).id,
'report_id' : that.report_id, 'report_id' : that.report_id,
'industry_type' : that.yetai ? that.yetai : '' , 'industry_type' : that.yetai ? that.yetai : '' ,
'income_time' : that.income_time , 'income_time' : (new Date(that.income_time)).getTime()*0.001,
'pay_id' : that.pay_id , 'pay_id' : that.pay_id ,
'transfer_name' : that.transfer_name, 'transfer_name' : that.transfer_name,
}; };
...@@ -1091,19 +1091,20 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home ...@@ -1091,19 +1091,20 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home
params.house_number = $('#shop_id_change_shop').val() params.house_number = $('#shop_id_change_shop').val()
if ( $('#change_type').val() == 10 || $('#change_type').val() == 30 ){ if ( $('#change_type').val() == 10 || $('#change_type').val() == 30 ){
if ($('#change_time').val()){//最后转定时间 if ($('#change_time').val()){//最后转定时间
params.last_transfer_time = $('#change_time').val() params.last_transfer_time = (new Date($('#change_time').val())).getTime()*0.001;
}; };
} else { } else {
if($('#change_fenhong').text()){//分红 if($('#change_fenhong').text()){//分红
params.is_dividend = $('#change_fenhong').val() params.is_dividend = $('#change_fenhong').val()
}; };
if($('#change_kaiye').val() == 3){//中介费 案场费 // if($('#change_kaiye').val() == 3){//中介费 案场费
alert('请选择是否开业'); // alert('请选择是否开业');
return; // return;
}else{ // }else{
params.is_open = $('#change_kaiye').val(); // params.is_open = $('#change_kaiye').val();
} // }
} }
...@@ -1160,8 +1161,9 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home ...@@ -1160,8 +1161,9 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home
$.post('/office_index/getCollectionEdit',params,function(data){ $.post('/office_index/getCollectionEdit',params,function(data){
if(data.code == 200) { if(data.code == 200) {
$('#modal-addPic').modal('hide');//操作成功后 在隐藏弹窗
if(receiv.is_baocun_bargainID*1 == 0){//判断点击的是哪个 保存详情的按钮 if(receiv.is_baocun_bargainID*1 == 0){//判断点击的是哪个 保存详情的按钮
$('#modal-addPic').modal('hide');//操作成功后 在隐藏弹窗
that.getList(that.pageNo); that.getList(that.pageNo);
}else{ }else{
that.getMoneyDetail(receiv.collection_id_liu); that.getMoneyDetail(receiv.collection_id_liu);
...@@ -1211,7 +1213,7 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home ...@@ -1211,7 +1213,7 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home
if ($('#payNo').val()){//支付户名 if ($('#payNo').val()){//支付户名
params.transfer_name = $('#payNo').val() params.transfer_name = $('#payNo').val()
}; };
params.is_open = $('#running').val() // params.is_open = $('#running').val()
if ($('#fenhong').val()){//分红 if ($('#fenhong').val()){//分红
params.is_dividend = $('#fenhong').val() params.is_dividend = $('#fenhong').val()
}; };
...@@ -1493,7 +1495,7 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home ...@@ -1493,7 +1495,7 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home
doc.find("#tijiaoren").text(data.agent_name); doc.find("#tijiaoren").text(data.agent_name);
doc.find("#address").text(data.address); doc.find("#address").text(data.address);
doc.find("#comit_time").text(data.create_time); doc.find("#comit_time").text(data.create_time);
doc.find("#open_time").text(data.open_time);//开业确定时间 // doc.find("#open_time").text(data.open_time);//开业确定时间
//判断收款详情的类型 //判断收款详情的类型
if(data.type == 91){ if(data.type == 91){
...@@ -1565,7 +1567,7 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home ...@@ -1565,7 +1567,7 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home
doc.find("#payType").val(data.pay_type); doc.find("#payType").val(data.pay_type);
doc.find("#payNo").val(data.transfer_name); doc.find("#payNo").val(data.transfer_name);
// doc.find("#running").text(data.is_open == 1 ? "是":"否");//收款页面 是否开业变成可编辑的 // doc.find("#running").text(data.is_open == 1 ? "是":"否");//收款页面 是否开业变成可编辑的
doc.find("#running").val(data.is_open);//收款页面 是否开业变成可编辑的 // doc.find("#running").val(data.is_open);//收款页面 是否开业变成可编辑的
doc.find("#fenhong").val(data.is_dividend); doc.find("#fenhong").val(data.is_dividend);
doc.find('#pinpai').text(data.industry_type); doc.find('#pinpai').text(data.industry_type);
var source_id = data.source_id ; var source_id = data.source_id ;
......
public/resource/js/realtimePerformance.js
View file @ 654aff77
...@@ -760,7 +760,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'text!temp/r ...@@ -760,7 +760,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'text!temp/r
var params = { var params = {
'district_id': realtime.district_id, 'district_id': realtime.district_id,
'store_id': realtime.store_id, 'store_id': realtime.store_id,
'agents_id': realtime.agents_id, 'partial_id': realtime.agents_id,
'create_time': realtime.time_search_start, 'create_time': realtime.time_search_start,
'end_time': realtime.time_search_end, 'end_time': realtime.time_search_end,
'pageNo':1, 'pageNo':1,
......
public/resource/js/realtimePerformanceOffice.js
View file @ 654aff77
...@@ -760,7 +760,7 @@ define(['doT', 'text!temp/real_time_performance_office_template_tpl.html', 'text ...@@ -760,7 +760,7 @@ define(['doT', 'text!temp/real_time_performance_office_template_tpl.html', 'text
var params = { var params = {
'district_id': realtime.district_id, 'district_id': realtime.district_id,
'store_id': realtime.store_id, 'store_id': realtime.store_id,
'agents_id': realtime.agents_id, 'partial_id': realtime.agents_id,
'create_time': realtime.time_search_start, 'create_time': realtime.time_search_start,
'end_time': realtime.time_search_end, 'end_time': realtime.time_search_end,
'pageNo':1, 'pageNo':1,
...@@ -1029,17 +1029,23 @@ define(['doT', 'text!temp/real_time_performance_office_template_tpl.html', 'text ...@@ -1029,17 +1029,23 @@ define(['doT', 'text!temp/real_time_performance_office_template_tpl.html', 'text
//部门-新增房源-弹出框-详情 //部门-新增房源-弹出框-详情
getnewshopNumberDetails: function(pageNo){ getnewshopNumberDetails: function(pageNo){
var params = { var params = {
'id': realtime.district_store_agent_id, 'create_time_start': realtime.time_search_start,
'type': realtime.switchType, 'create_time_end': realtime.time_search_end,
'start_time': realtime.time_search_start, 'pageNo':1,
'end_time': realtime.time_search_end, 'pageSize':9999
'AuthToken':user_info_obj.AuthToken,
'page_no':1,
'page_size':9999
}; };
if(realtime.district_id){
params.dish_district_id = realtime.district_id;
}
if(realtime.store_id){
params.dish_store_id = realtime.store_id;
}
if(realtime.agents_id){
params.dish_id = realtime.agents_id;
}
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: '/office/housingResourcePcInfo', url: '/office_index/getRoomList',
data: params, data: params,
timeout: 30000, timeout: 30000,
dataType: 'json', dataType: 'json',
...@@ -1048,7 +1054,7 @@ define(['doT', 'text!temp/real_time_performance_office_template_tpl.html', 'text ...@@ -1048,7 +1054,7 @@ define(['doT', 'text!temp/real_time_performance_office_template_tpl.html', 'text
if(typeof data === 'object') { if(typeof data === 'object') {
if(data.code == 200) { if(data.code == 200) {
var doTtmpl = doT.template(document.getElementById('newshop_number_details_tpl').innerHTML); var doTtmpl = doT.template(document.getElementById('newshop_number_details_tpl').innerHTML);
$("#newshop_number_details_list").html(doTtmpl(data.data)); $("#newshop_number_details_list").html(doTtmpl(data.data.list));
//获取统计时间 //获取统计时间
$('#newshop_details_time_start').html(realtime.time_search_start); $('#newshop_details_time_start').html(realtime.time_search_start);
$('#newshop_details_time_end').html(realtime.time_search_end); $('#newshop_details_time_end').html(realtime.time_search_end);
...@@ -1083,7 +1089,7 @@ define(['doT', 'text!temp/real_time_performance_office_template_tpl.html', 'text ...@@ -1083,7 +1089,7 @@ define(['doT', 'text!temp/real_time_performance_office_template_tpl.html', 'text
}; };
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: '/office/userResourcePcInfo', url: '/broker/userResourcePcInfo',
data: params, data: params,
timeout: 30000, timeout: 30000,
dataType: 'json', dataType: 'json',
......
public/resource/js/reportListOffice.js
View file @ 654aff77
...@@ -983,7 +983,7 @@ define(['doT', 'text!temp/reportList_office_template_tpl.html', 'css!style/home. ...@@ -983,7 +983,7 @@ define(['doT', 'text!temp/reportList_office_template_tpl.html', 'css!style/home.
// alert('请填写是否开业'); // alert('请填写是否开业');
// return; // return;
// } // }
params.is_open=$('.shop-is-open').val();//是否开业 // params.is_open=$('.shop-is-open').val();//是否开业
$.ajax({ $.ajax({
'type': 'POST', 'type': 'POST',
......
public/resource/template/real_time_performance_office_template_tpl.html
View file @ 654aff77
...@@ -397,8 +397,8 @@ ...@@ -397,8 +397,8 @@
<!--个人-收款数 --> <!--个人-收款数 -->
<script id="collection_number_details_tpl" type="text/template"> <script id="collection_number_details_tpl" type="text/template">
[% if(it&&it[0]) { %] [% if(it&&it[0]) { %]
[% var swPayType=function(s){switch(Number(s)){case 10:return"支付宝";case 20:return"微信";case 30:return"pos机器";case 40:return"转账";case 50:return"现金";case 60:return"其他";default:return s}}; %] [% var swPayType=function(s){switch(Number(s)){case 10:return"施总支付宝";case 11:return"林老师支付宝";case 12:return"筠姐支付宝";case 13:return"陈志杰支付宝";case 20:return"施总微信";case 21:return"林老师微信";case 22:return"筠姐微信";case 23:return"陈志杰微信";case 30:return"POS机器";case 40:return"地产转账";case 41:return"世家公账";case 42:return"3000账号";case 50:return"现金";case 60:return"其他";case 70:return"银满谷银行卡";case 71:return"筠姐上海银行卡";case 72:return"林老师建行卡";case 73:return"新同联福居银行卡";case 74:return"陈志杰招商银行卡";default:return s}}; %]
[% var swType=function(s){switch(Number(s)){case 10:return"意向金";case 20:return"定金";case 30:return"保管金";case 40:return"押金";case 50:return"租金";case 60:return"进场费";case 70:return"转让费";case 80:return"其他";case 90:return"佣金";default:return s}}; %] [% var swType=function(s){switch(Number(s)){case 10:return"意向金";case 20:return"定金";case 30:return"保管金";case 40:return"押金";case 50:return"租金";case 60:return"进场费";case 70:return"转让费";case 80:return"其他";case 90:return"佣金";case 91:return"中介费";case 92:return"案场费";default:return s}}; %]
<tr> <tr>
<th class="text-center">收款时间</th> <th class="text-center">收款时间</th>
<th class="text-center">客户姓名</th> <th class="text-center">客户姓名</th>
...@@ -509,56 +509,48 @@ ...@@ -509,56 +509,48 @@
<tr> <tr>
<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>
<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>
</tr> </tr>
[% for(var item in it){ %] [% for(var item in it){ %]
[% if(it[item]["status"] != 3) { %]
<tr data-id="[%= it[item]['id'] %]" data-orderid="[%= it[item]['order_id'] %]"> <tr data-id="[%= it[item]['id'] %]" data-orderid="[%= it[item]['order_id'] %]">
<td class="text-center">[%= it[item]['id'] %]</td> <td>[%= it[item]['id'] %]</td>
<td class="text-center"> <td>
[% if(it[item]["shop_type"] == 0) { %] [% if (it[item]['type'] == 1) { %]
商场 写字楼
[% }else{ %] [% } else if (it[item]['type'] == 2) { %]
街铺 商住两用
[% } %] [% }else if (it[item]['type'] == 3) { %]
</td> 园区
<td class="text-center">[%= hideStr(it[item]['internal_title']) %]</td> [% }else if (it[item]['type'] == 4) { %]
<td class="text-center"> 洋房
[% if (it[item]['rent_type'] == 1) { %] [% }else if (it[item]['type'] == 5) { %]
[%= it[item]["rent_price"] / 100 %] 元 联合办公
[% } else if (it[item]['rent_type'] == 2) { %] [% }else if (it[item]['type'] == 6) { %]
[%= it[item]["rent_price"] / 100 %] % 厂房
[% }else{ %]
[%= it[item]["rent_price"] / 100 %] 元/天/㎡
[% } %]
</td>
<td class="text-center">
[% if(it[item]["shop_type"] == 0) { %]
[%= it[item]["shop_area_start"] + '-' + it[item]["shop_area_end"] %]㎡
[% }else{ %]
[%= it[item]["shop_area_start"] %]㎡
[% } %] [% } %]
</td> </td>
<td class="text-left">[%= it[item]['industry_type'] %]</td> <td>[%= it[item]['title'] %]</td>
<td class="text-center">[%= it[item]['last_phone_follow_time'] %]</td>
<td> <td>
[% if(it[item]["status"] == 1) { %] [% if (it[item]['floor_tag'] == 1) { %]
上架 底层
[% }else if(it[item]["status"] == 2){ %] [% } else if (it[item]['floor_tag'] == 2) { %]
下架 中层
[% }else if (it[item]['floor_tag'] == 3) { %]
[% }else{ %] 高层
回收
[% } %] [% } %]
</td> </td>
<td>[%=it[item]["price_total"] %]元/月</td>
<td>[%=it[item]["price"] %]元/㎡/天</td>
<td>[%=it[item]["area"] %]</td>
<td>[%=it[item]["station_start"] %]-[%=it[item]["station_end"] %]</td>
</tr> </tr>
[% } %] [% } %]
[% } %]
[% }else{ %] [% }else{ %]
<tr> <tr>
<td colspan="10" style="text-align:center;"> 暂无数据</td> <td colspan="10" style="text-align:center;"> 暂无数据</td>
......
public/resource/template/real_time_performance_template_tpl.html
View file @ 654aff77
...@@ -398,8 +398,8 @@ ...@@ -398,8 +398,8 @@
<!--个人-收款数 --> <!--个人-收款数 -->
<script id="collection_number_details_tpl" type="text/template"> <script id="collection_number_details_tpl" type="text/template">
[% if(it&&it[0]) { %] [% if(it&&it[0]) { %]
[% var swPayType=function(s){switch(Number(s)){case 10:return"支付宝";case 20:return"微信";case 30:return"pos机器";case 40:return"转账";case 50:return"现金";case 60:return"其他";default:return s}}; %] [% var swPayType=function(s){switch(Number(s)){case 10:return"施总支付宝";case 11:return"林老师支付宝";case 12:return"筠姐支付宝";case 13:return"陈志杰支付宝";case 20:return"施总微信";case 21:return"林老师微信";case 22:return"筠姐微信";case 23:return"陈志杰微信";case 30:return"POS机器";case 40:return"地产转账";case 41:return"世家公账";case 42:return"3000账号";case 50:return"现金";case 60:return"其他";case 70:return"银满谷银行卡";case 71:return"筠姐上海银行卡";case 72:return"林老师建行卡";case 73:return"新同联福居银行卡";case 74:return"陈志杰招商银行卡";default:return s}}; %]
[% var swType=function(s){switch(Number(s)){case 10:return"意向金";case 20:return"定金";case 30:return"保管金";case 40:return"押金";case 50:return"租金";case 60:return"进场费";case 70:return"转让费";case 80:return"其他";case 90:return"佣金";default:return s}}; %] [% var swType=function(s){switch(Number(s)){case 10:return"意向金";case 20:return"定金";case 30:return"保管金";case 40:return"押金";case 50:return"租金";case 60:return"进场费";case 70:return"转让费";case 80:return"其他";case 90:return"佣金";case 91:return"中介费";case 92:return"案场费";default:return s}}; %]
<tr> <tr>
<th class="text-center">收款时间</th> <th class="text-center">收款时间</th>
<th class="text-center">客户姓名</th> <th class="text-center">客户姓名</th>
......
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