Skip to content

T
tl_estate
Commit ee67c7d1 authored by clone's avatar clone Committed by hujun
Browse files
Options

Merge branch 'test-v1.9' into test

parents 976d620b 8ca1f58f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 294 additions and 95 deletions
application/api_broker/controller/OrderLog.php
View file @ ee67c7d1
......@@ -426,9 +426,9 @@ class OrderLog extends Basic
{
header('Access-Control-Allow-Origin:*');
$params = $this->params;
// $params = array(
// "bargain_id" => 169,
// );
/* $params = array(
"bargain_id" => 469,
);*/
if (!isset($params["bargain_id"])) {
return $this->response("101", "请求参数错误");
}
......
application/api_broker/service/OrderLogService.php
View file @ ee67c7d1
......@@ -838,7 +838,7 @@ class OrderLogService
//分佣提成 o_partial_commission
$partialCommissionModel = new OPartialCommission();
$field = "a.agent_id,a.role,b.name,b.phone,a.scale,a.should_commission,a.create_time,a.real_fee,a.charity_fund,
$field = "a.agent_id,a.role,b.name,b.phone,a.scale,a.should_commission,a.confirm_date,a.create_time,a.real_fee,a.charity_fund,
a.cash,a.practical_fee,a.service_charge";
$commissionParams["bargain_id"] = $params["bargain_id"];
$cent_commission_arr = $partialCommissionModel->getCommissionListByBargainId($field, $commissionParams);
......@@ -861,6 +861,7 @@ class OrderLogService
foreach ($item as $i => $j) {
$cent_commission[$z]["info"][$key]["real_fee"] = $j["real_fee"];
$cent_commission[$z]["info"][$key]["create_time"] = $j["create_time"];
$cent_commission[$z]["info"][$key]["confirm_date"] = $j["confirm_date"];
$cent_commission[$z]["info"][$key]["charity_fund"] = $j["charity_fund"];
$cent_commission[$z]["info"][$key]["cash"] = $j["cash"];
$cent_commission[$z]["info"][$key]["practical_fee"] = $j["practical_fee"];
......
application/api_broker/service/PushMessageService.php
View file @ ee67c7d1
......@@ -103,6 +103,12 @@ class PushMessageService
$report_data = $report->getReportOrder($field, [ 'a.id' => $report_id ]);
$house_arr = [1,4,3031,3032]; //剔除测试楼盘推送
if (in_array($report_data['house_id'], $house_arr)) {
return ;
}
//查询经纪人门店和部门信息
$agent_store = $agent->verifyUser('store_id', '', ['id'=>$report_data['report_agent_id']]);
$store = new AStore();
......
application/index/controller/Auth.php
View file @ ee67c7d1
......@@ -168,10 +168,9 @@ class Auth extends Basic
}
}
//权限表list
/**
* 权限表list
*
* @param int $type
* @return array|false|\PDOStatement|string|\think\Collection|\think\Response
* @throws \think\db\exception\DataNotFoundException
......@@ -179,12 +178,9 @@ class Auth extends Basic
* @throws \think\exception\DbException
*/
public function classList($type=1){
$table=new authRule;
$menus=db('auth_rule')->select();
// exit;
$table = new authRule;
$menus = db('auth_rule')->where('status',0)->select();
$menus =$table->toFormatTree($menus,'title');
// prt($menus);
if($type==1) {
return $this->response(200, '成功', $menus);
}else{
......
application/index/controller/Finance.php
View file @ ee67c7d1
......@@ -13,8 +13,6 @@ use app\api_broker\service\OrderLogService;
use app\index\extend\Basic;
use app\index\untils\ExportExcelUntil;
use app\model\AAgents;
use app\model\AStore;
use app\model\OBargainLogModel;
use app\model\OBargainModel;
use app\model\ORealIncome;
use app\model\OTaxes;
......@@ -68,11 +66,12 @@ class Finance extends Basic
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
$fields = 'a.id,a.create_time,a.trade_type,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.commission,a.practical_fee,a.scale_fee,a.order_no,content,house_number';
$check_status = $this->params['check_status'];
$fields = 'a.id,a.create_time,a.trade_type,b.user_phone,b.user_name,d.internal_title,d.internal_address,
a.commission,a.practical_fee,a.scale_fee,a.order_no,a.order_id,content,house_number';
$where['a.father_id'] = 0;
$where['c.is_del'] = 0;
$where['a.status'] = 10;
// $where['c.is_del'] = 0;
$where['a.status'] = 11;
$order = 'e.id desc';
if (!empty($this->params['create_time']) && empty($this->params['end_time'])) {
......@@ -84,7 +83,7 @@ class Finance extends Basic
}
if (!empty($this->params['end_time']) && !empty($this->params['create_time'])) {
$where['a.create_time'] = [ 'between time', [ $this->params['create_time'] . ' 00:00:00', $this->params['create_time'] . ' 23:59:59' ] ];
$where['a.create_time'] = [ 'between time', [ $this->params['create_time'] . ' 00:00:00', $this->params['end_time'] . ' 23:59:59' ] ];
}
if (!empty($this->params['internal_address'])) {
......@@ -99,25 +98,20 @@ class Finance extends Basic
$where['a.house_number'] = [ 'like', '%' . $this->params['house_number'] . '%' ];
}
switch ($this->params['check_status']) {
switch ($check_status) {
case 2 :
//成交报告列表-第二级审核
$where['e.audit_level'] = 0;
$where[]= ['EXP','e.id in (SELECT MAX(id) FROM o_financial_audit WHERE is_del = 0 and `status`<>3 GROUP BY bargain_id)'];
$where['e.is_del'] = 0;
$audit_level = 0;
break;
case 3 :
//成交报告列表-第三级审核
$where['e.audit_level'] = 1;
$where['e.is_del'] = 0;
$where[]= ['EXP','e.id in (SELECT MAX(id) FROM o_financial_audit WHERE is_del = 0 and `status`<>3 GROUP BY bargain_id)'];
$audit_level = 1;
break;
case 4 :
//成交报告列表-已结单
$where['a.account_statement'] = 1;
$where['a.status'] = 11;
$where['e.audit_level'] = 2;
$where['a.status'] = 13;
$audit_level = 2;
break;
/* case 5 :
//成交报告列表-待撤销
......@@ -130,8 +124,8 @@ class Finance extends Basic
default :
//成交报告列表-第一级审核
$order = 'a.id DESC';
$where['e.audit_level'] = ['NULL'];
$where[]= ['EXP','e.audit_level IS NULL or e.id not in (SELECT MAX(id) FROM o_financial_audit WHERE is_del = 0 GROUP BY bargain_id)'];
$where['a.status'] = 10;
$audit_level = -1;
}
if (!empty($this->params['status'])) {
......@@ -139,9 +133,9 @@ class Finance extends Basic
}
$bargain = new OBargainModel();
$data['data']['list'] = $bargain->getBargain($pageNo, $pageSize, $order, $fields, $where);
$data['data']['total'] = $bargain->getBargainTotal($where);
$data['data']['step'] = $this->params['check_status'];
$data['data']['list'] = $bargain->getBargainList($pageNo, $pageSize, $order, $fields, $where, $audit_level);
$data['data']['total'] = $bargain->getBargainTotal($where, $audit_level);
$data['data']['step'] = $check_status;
return $this->response($data['code'], $data['msg'], $data['data']);
}
......@@ -264,7 +258,7 @@ class Finance extends Basic
$practical_fee_arr = $this->params["practical_fee"];
$bargain_id = $this->params["id"];
$log_data = $add_real_arr = $update_real_arr = [];
$add_real_arr = $update_real_arr = [];
$i = $j = 0;
foreach ($practical_fee_arr as $item) {
if (!$item['fee'] || !$item['operation_date']) {
......@@ -587,7 +581,7 @@ class Finance extends Basic
$where['b.house_number'] = [ 'like', '%' . $this->params['house_number'] . '%' ];
}
$field = 'a.id,b.id as bargain_id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,b.house_number';
$field = 'a.id,b.id as bargain_id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,b.house_number,b.father_id,b.order_id';
$m_commission = new OPartialCommission();
$data['data']['list'] = $m_commission->getCommissionBargainList($pageNo, $pageSize, 'a.id desc', $field, $where);
......@@ -921,7 +915,7 @@ class Finance extends Basic
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
$fields = 'a.id,a.create_time,e.name,e.phone,a.fee,b.house_number,d.internal_address,b.agent_id';
$fields = 'a.id,a.create_time,e.name,e.phone,a.fee,b.house_number,d.internal_address,b.agent_id,b.father_id,b.order_id';
$where['c.is_del'] = 0;
$where['b.status'] = [ 'in', 10, 11 ]; //10已提交 11审核成功
......@@ -1147,6 +1141,8 @@ class Finance extends Basic
$data['is_del'] = 1;
$data = $m_financial->editData($data, $this->params['bargain_id'], 'bargain_id');
$m_bargain = new OBargainModel();
$m_bargain->updateBargainById($this->params['bargain_id'], ['status'=>10]);
$msg = '';
if ($data > 0) {
$code = 200;
......
application/index/view/finance/account_statement.html
View file @ ee67c7d1
......@@ -30,6 +30,8 @@
<form id="maintable_form_search">
<span class="fore-span">提交时间:</span>
<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_create_time" name="start_date" type="date">
<span class="fore-span" id="maintable_form_span_zhi">至</span>
<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_end_time" name="end_date" type="date">
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_internal_address" placeholder="商铺地址" type="text" value="">
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_shop_num" placeholder="商铺号" type="text" value="">
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_user_phone" placeholder="客户电话" type="text" value="">
......
application/index/view/finance/commission_total.html
View file @ ee67c7d1
......@@ -26,6 +26,11 @@
width: 340px;
line-height: 36px;
}
.left-btn{
float: left;
}
.right {
line-height: 36px;
......@@ -57,6 +62,9 @@
height: 500px;
overflow-y: scroll;
}
.clear{
clear: both;
}
</style>
<div id="page-content-wrapper">
<div class="container">
......@@ -86,10 +94,13 @@
<span class="fore-span ld-Marheight">-</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_dealtime" name="end_date" type="date">
<select class="form-control btn4 ld-Marheight" id="deal_status">
<!--<select class="form-control btn4 ld-Marheight" id="deal_status">
<option value="-1">请选择部门</option>
<option value="10">市场一部</option>
<option value="20">市场二部</option>
</select>-->
<select name="qx-store" class="form-control btn2 ld-Marheight" id="qx-store">
<option value="" selected="selected">选择部门</option>
</select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="store_name" placeholder="所属门店名称" type="text" value="">
......@@ -101,10 +112,11 @@
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="create_ticketTime" name="start_date" type="date">
<span class="fore-span ld-Marheight">-</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_ticketTime" name="end_date" type="date">
<div class="clear"></div>
<span class="btn btn-info btn3" id="search">搜索</span>
<span class="btn btn-info btn3" id="reset">重置</span>
<span class="btn btn-info btn3" id="export">导出excel</span>
<span class="btn btn-info btn3 " id="search">搜索</span>
<span class="btn btn-info btn3 " id="reset">重置</span>
<span class="btn btn-info btn3 " id="export">导出excel</span>
</form>
</td>
</tr>
......
application/index/view/finance/tax.html
View file @ ee67c7d1
This diff is collapsed.
application/model/OBargainModel.php
View file @ ee67c7d1
......@@ -257,26 +257,75 @@ class OBargainModel extends Model
return $result;
}
// /**
// * 成交报告
// *
// * @param int $pageNo
// * @param int $pageSize
// * @param string $order_
// * @param string $field
// * @param string $params
// * @return false|\PDOStatement|string|\think\Collection
// * @throws \think\db\exception\DataNotFoundException
// * @throws \think\db\exception\ModelNotFoundException
// * @throws \think\exception\DbException
// */
// public function getBargain($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '')
// {
// return $this->field($field)->alias('a')
// ->join('o_report b', 'a.report_id = b.id', 'left')
// ->join('o_order c', 'a.order_id = c.id', 'left')
// ->join('g_houses d', 'c.house_id = d.id', 'left')
// ->join('o_financial_audit e', 'e.bargain_id = a.id', 'left')
// ->where($params)
// ->group('a.id')
// ->order($order_)
// ->limit($pageSize)
// ->page($pageNo)
// ->select();
// }
/**
* 成交报告
* 成交报告列表
*
* @param int $pageNo
* @param int $pageSize
* @param string $order_
* @param string $field
* @param string $params
* @param int $audit_level
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getBargain($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '')
public function getBargainList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '', int $audit_level = 0)
{
return $this->field($field)->alias('a')
if ($audit_level != -1) {
$sql_string = '((SELECT * FROM o_financial_audit WHERE audit_level = '.$audit_level .' AND is_del = 0)
UNION ALL (SELECT * FROM o_financial_audit WHERE audit_level > '.$audit_level .' AND is_del = 0)) as e';
$data = $this->table($sql_string)
->field($field)
->join('o_bargain a', 'e.bargain_id = a.id', 'left')
->join('o_report b', 'a.report_id = b.id', 'left')
->join('o_order c', 'a.order_id = c.id', 'left')
->join('g_houses d', 'c.house_id = d.id', 'left')
->where($params)
->having('count(e.order_id) = 1')
->order($order_)
->group('e.order_id')
->limit($pageSize)
->page($pageNo)
->select();
} else {
$data = $this->field($field)->alias('a')
->join('o_report b', 'a.report_id = b.id', 'left')
->join('o_order c', 'a.order_id = c.id', 'left')
->join('g_houses d', 'c.house_id = d.id', 'left')
->join('o_financial_audit e', 'e.bargain_id = a.id', 'left')
->where($params)
->group('a.id')
->order($order_)
......@@ -285,31 +334,68 @@ class OBargainModel extends Model
->select();
}
return $data;
}
// /**
// * 成交报告总数
// *
// * @param string $params
// * @return int|string
// */
// public function getBargainTotal($params = '')
// {
// return $this->alias('a')
// ->join('o_report b', 'a.report_id = b.id', 'left')
// ->join('o_order c', 'a.order_id = c.id', 'left')
// ->join('g_houses d', 'c.house_id = d.id', 'left')
// ->join('o_financial_audit e', 'e.bargain_id = a.id', 'left')
// ->where($params)
// ->group('a.id')
// ->count();
// }
/**
* 成交报告总数
*
* @param string $params
* @return int|string
* @param array $params
* @param int $audit_level
* @return int
*/
public function getBargainTotal($params = '')
public function getBargainTotal(array $params = [], int $audit_level = 0) : int
{
return $this->alias('a')
$total = 0;
if ($audit_level != -1) {
$total = $this->table('((SELECT * FROM o_financial_audit WHERE audit_level = '.$audit_level .' AND is_del = 0)
UNION ALL (SELECT * FROM o_financial_audit WHERE audit_level > '.$audit_level .' AND is_del = 0)) as e')
->join('o_bargain a', 'e.bargain_id = a.id', 'left')
->join('o_report b', 'a.report_id = b.id', 'left')
->join('o_order c', 'a.order_id = c.id', 'left')
->join('g_houses d', 'c.house_id = d.id', 'left')
->where($params)
->having('count(e.order_id) = 1')
->group('e.order_id')
->count();
} else {
$total = $this->alias('a')
->join('o_report b', 'a.report_id = b.id', 'left')
->join('o_order c', 'a.order_id = c.id', 'left')
->join('g_houses d', 'c.house_id = d.id', 'left')
->join('o_financial_audit e', 'e.bargain_id = a.id', 'left')
->where($params)
->group('a.id')
->count();
}
return $total;
}
/**
* 成交报告审核
*
* @param int $id
* @param array $data
* @param int $source 审核来源 1成交报告申请结单 2退款 3申请撤销成交报告
* @param int $status 成交报告状态 10已提交 11审核成功 20待撤销 21已撤销 30删除
* @param int $status 成交报告状态 10已提交 11审核开始 12驳回 13审核成功 20待撤销 21已撤销 30删除
* @return bool
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
......@@ -318,11 +404,11 @@ class OBargainModel extends Model
*/
public function addCheckBargain(int $id, array $data, int $source, int $status): bool
{
$this->startTrans();
// $this->startTrans();
$bargain_data = $this->field('id,report_id,agent_id,order_no,order_id')->where([
'id' => $id,
'status' => $status
])->lock(true)->find();
'status' => ['in','10,11']
])->find();
if ($bargain_data != '') {
$audit = new OFinancialAudit();
......@@ -358,20 +444,23 @@ class OBargainModel extends Model
if ($return) {
if ($data['audit_level'] == 2 && $status == 10) {
$update_data['status'] = 11;
$update_data['status'] = 13;
$update_data['account_statement'] = 1;
$update_data['account_time'] = time();
$this->save($update_data, [ 'id' => $bargain_data['id'] ]);
} else {
$update_data['status'] = 11;
$this->save($update_data, [ 'id' => $bargain_data['id'] ]);
}
if ($data['audit_level'] == 2 && $status == 20) {
$this->where('id', $bargain_data['id'])->setField('status', 21);
}
$this->commit();
// $this->commit();
$result = true;
} else {
$this->rollback();
// $this->rollback();
$result = false;
}
} else {
......@@ -732,14 +821,17 @@ class OBargainModel extends Model
{
$m_partial = new OPartialCommission();
$data = $m_partial->getBragainScale($bargain_id);
$partial_bargain = $m_partial->getBragainScale($bargain_id);
foreach ($partial_bargain as $val) {
$bargain_id_arr[] = $val['bargain_id'];
}
if (empty($data)) {
$data = $this->field('role,agent_id,scale,scale_fee')
->where('id', $bargain_id)
->where('id', 'not in', import(',',$bargain_id_arr))
->whereOr('father_id', $bargain_id)
->select();
}
$m_agent = new AAgents();
$result = [];
......@@ -748,6 +840,7 @@ class OBargainModel extends Model
if (isset($v['role'])) {
$agent_name = $m_agent->getAgentInfo('id,name,phone', $v['agent_id']);
$result[$k]['id'] = $agent_name['id'];
$result[$k]['agent_id'] = $agent_name['id'];
$result[$k]['name'] = $agent_name['name'];
$result[$k]['phone'] = $agent_name['phone'];
$result[$k]['role'] = $v['role'];
......
application/model/OPartialCommission.php
View file @ ee67c7d1
......@@ -197,8 +197,9 @@ class OPartialCommission extends BaseModel
* @throws \think\exception\PDOException
*/
public function getBragainScale(int $bargain_id) {
$sql = 'SELECT scale,agent_id,role,substring_index(group_concat(id ORDER BY id DESC),",",1) as id
FROM o_partial_commission WHERE bargain_id = '.$bargain_id.' GROUP BY role';
$sql = 'SELECT a.bargain_id,a.scale,b.scale_fee,a.agent_id,a.role,substring_index(group_concat(a.id ORDER BY a.id DESC),",",1) AS id
FROM o_partial_commission a LEFT JOIN o_bargain b on a.bargain_id=b.id WHERE a.bargain_id = '.$bargain_id.'
and b.id= '.$bargain_id.' OR b.father_id='.$bargain_id.' GROUP BY role';
return $this->query($sql);
}
}
\ No newline at end of file
application/model/OTaxes.php
View file @ ee67c7d1
......@@ -24,8 +24,10 @@ class OTaxes extends BaseModel
*/
public function getBargainTaxes(int $bargain_id, $field = 'id as fee_id,fee,operation_date')
{
$params["bargain_id"] = $bargain_id;
$params["father_id"] = array("neq",0);
return $this->field($field)
->where('bargain_id', $bargain_id)
->where($params)
->where('is_del', 0)
->select();
}
......@@ -100,7 +102,7 @@ class OTaxes extends BaseModel
foreach ($data as $k => $v) {
$result[$k] = $v;
if (isset($v['id']) && $v['bargain_id']) {
$result[$k]['fee_list'] = $this->field('a.id as feed_id,a.fee,b.phone,b.name,a.role,a.scale')
$result[$k]['fee_list'] = $this->field('a.id as fee_id,a.fee,b.phone,b.name,a.role,a.scale')
->alias('a')
->join('a_agents b', 'a.agent_id = b.id', 'left')
->where('a.father_id', $v['id'])
......@@ -112,12 +114,15 @@ class OTaxes extends BaseModel
return $result;
}
/**
* 根据id 查询详情 zw
*
* @param int $taxesId
* @param string $field
* @return false|\PDOStatement|string|\think\Collection
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getTaxesId(int $taxesId, string $field)
{
......
public/appnew/src/components/reportDetails/reportDetails.vue
View file @ ee67c7d1
......@@ -104,7 +104,7 @@
</li>
<li class="main-sec-li-26 color li-border-bottom">
<div class='clear'>
<div class="left">确认时间{{index+1}}：{{items.create_time}}</div>
<div class="left">确认时间{{index+1}}：{{items.confirm_date}}</div>
</div>
</li>
......
public/resource/css/report_list.css
View file @ ee67c7d1
......@@ -15,7 +15,10 @@ addtax_
*
*
* */
/*页面主要内容table区域*/
#maintable_form_span_zhi{
margin-left: 10px;
}
/*详情弹出框*/
.detail-modal-body {
......
public/resource/js/commission.js
View file @ ee67c7d1
This diff is collapsed.
public/resource/js/commissionTotal.js
View file @ ee67c7d1
......@@ -18,6 +18,7 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
$("body").append(template);
business.getList();
business.event();
business.getDistrict();
},
event: function() {
var _doc = $(document);
......@@ -323,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 = $('#user_phone').val();
params.district_id= $("#qx-store option:selected").val();//部门id 添加字段
params.store_name = $('#store_name').val();
$.ajax({
......@@ -343,19 +344,54 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
add_page(data.data.total, pageNo, business.pageSize, business.getList);
}
});
},
getDistrict: function(name) {
$.ajax({
url: '/index/getDistrictListByName',
type: 'GET',
async: true,
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)) {
_html += '<option value="' + n.id + '">' + n.district_name + '</option>';
} else {
_html += '<option value="' + n.id + '">' + n.district_name + '</option>';
}
});
$("#ss-store").html(_html);
$("#qx-store").append(_html);
// $("#qx-store").html(_html);
} else {
alert('获取部门信息失败');
}
}
});
},
exportList: function(pageNo) {
console.log(2);
business.pageNo = pageNo;
var create_time = $('#create_time').val();
var end_time = $('#end_time').val();
var internal_address = $('#internal_address').val();
var agent = $('#user_name').val();
var user_phone = $('#user_phone').val();
var house_number = $('#internal_num').val();
window.open('/index/exportExcel?create_time=' + create_time + '&end_time=' + end_time + '&internal_address=' + internal_address + '&name=' + agent + '&phone=' + user_phone + '&house_number=' + house_number);
var excel_two = 1;
var name = $('#user_name').val();
var phone = $('#user_phone').val();
var commission_start_date = $('#create_time').val();
var commission_end_date = $('#end_time').val();
var deal_start_date = $('#create_dealtime').val();
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 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);
},
};
return business;
});
\ No newline at end of file
});
\ No newline at end of file
public/resource/js/public.js
View file @ ee67c7d1
......@@ -139,10 +139,10 @@ function is_mobile(text) {
//处理金额的数字，最多三位小数
function dealJineNum(num){
if(isFinite(num)){
if(parseInt(num)==num || num.toString().split(".")[1].length < 4){
if(parseInt(num)==num || num.toString().split(".")[1].length < 3){
return num;
}else{
return Number((num).toFixed(3));
return Number((num).toFixed(2));
}
}else{
return 0;
......
public/resource/js/reportList.js
View file @ ee67c7d1
......@@ -356,7 +356,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
e.preventDefault();
e.stopPropagation();
var _this = $(this);
var _id = _this.closest('tr').data('id');
var _id = _this.closest('tr').data('orderid');
console.log(_id);
$('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id='+_id);
});
......@@ -839,13 +839,14 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
$('#addtax_date').val(_data['data'][0]['operation_date']);
var _htmlTemp = '<tr><td>分佣方</td><td>业务员</td><td>分佣比例</td><td>税费</td></tr>';
$.each(_data['data'], function(i, v) {
_htmlTemp += '<tr class="addtax-modal-tax-table-datatr" data-id="{id}" data-role="{role}"><td>{0}</td><td>{1}</td><td>{2}%</td><td contenteditable>{3}</td></tr>'.stringFormatObj({
_htmlTemp += '<tr class="addtax-modal-tax-table-datatr" data-feeid="{feeid}" data-agentid="{id}" data-role="{role}"><td>{0}</td><td>{1}</td><td>{2}%</td><td contenteditable>{3}</td></tr>'.stringFormatObj({
'0': v.role_name,
'1': v.name+'-'+v.phone,
'2': v.scale,
'3': (obj['type'] === 'new')?'':v.fee,
'role': v.role,
'id': v.id
'id': v.agent_id,
'feeid': v.id
});
});
$('.addtax-modal-tax-table').html(_htmlTemp);
......@@ -883,12 +884,12 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
$.each($('.addtax-modal-tax-table-datatr'), function(i, v) {
_data['tax['+i+']'] = {
'fee': v.childNodes[3].innerHTML,
'agent_id': JSON.parse(decodeURIComponent(sessionStorage.getItem('pcUserInfo'))).id,
'agent_id': v.getAttribute('data-agentid'),
'role': v.getAttribute('data-role'),
'scale': v.childNodes[2].innerHTML.split('%')[0]
};
if(_tempTableObj.attr('data-type') === 'edit'){
_data['tax['+i+']']['fee_id'] = v.getAttribute('data-id');
_data['tax['+i+']']['fee_id'] = v.getAttribute('data-feeid');
};
});
$.ajax({
......@@ -1010,6 +1011,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
'pageNo': pageNo,
'pageSize': bargain.pageSize,
'create_time': $.trim($('#maintable_create_time').val()),
'end_time': $.trim($('#maintable_end_time').val()),
'internal_address': $.trim($('#maintable_internal_address').val()),
'user_phone': $.trim($('#maintable_user_phone').val()),
'house_number': $.trim($('#maintable_shop_num').val())
......
public/resource/js/tax.js
View file @ ee67c7d1
This diff is collapsed.
public/resource/template/commission_template_tpl.html
View file @ ee67c7d1
<script id="commission_list_tpl" type="text/template">
[% if(it) { %]
[% for(var item in it){ %]
<tr class="text-center">
<tr class="text-center" data-id="[%= it[item]['id'] %]" data-orderid="[%= it[item]['order_id'] %]" data-fatherid="[%= it[item]['father_id'] %]">
<td>[%= it[item]['confirm_date'] %]</td>
<td>[%= it[item]['district_store'] %]</td>
<td>[%= it[item]['agent'] %]</td>
......@@ -11,8 +11,8 @@
<td>[%= it[item]['practical_fee'] %]</td>
<td>
<a class="btn1 btn-info edit" href="#modal-details" data-toggle="modal" data-id='[%= it[item]["bargain_id"] %]'>详情</a>
<a class="btn1 btn-info timeline" href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["bargain_id"] %]'>时间轴</a>
<a class="btn1 btn-info details-btn" href="#modal_detail" data-toggle="modal" data-id='[%= it[item]["bargain_id"] %]'>详情</a>
<a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["bargain_id"] %]'>时间轴</a>
</td>
</tr>
[% } %]
......
public/resource/template/reportList_maidtwo_template_tpl.html 0 → 100644
View file @ ee67c7d1
<script id="reportList_maid_list_tpl" type="text/template">
[% if(it['data'] && it['data'].length && it['data'].length>0) { %]
[% var dealT=function(g){if(g&&(g!="null")){return g}else{return""}}; %]
[% for(var i in it['data']){ %]
<tr class="text-center" data-id="[%= it['data'][i]['id'] %]" data-agentid="[%= it['data'][i]['agent_id'] %]" data-role="[%= it['data'][i]['role'] %]" data-lastid="[%= it['data'][i]['last_commission_id'] %]">
<td>[%= it['data'][i]['role_name'] %]</td>
<td>[%= it['data'][i]['agent'] %]</td>
<td>[%= it['data'][i]['district_store'] %]</td>
<td><span class="detail-modal-maid-span-scale">[%= it['data'][i]['scale'] %]</span><span>%</span></td>
<td class="detail-modal-maid-td-should-commission">[%= it['data'][i]['scale_fee'] %]</td>
<td colspan="6" class="detail-modal-maid-mix-td oh">
[% if(it['data'][i]['partial_commission'] && it['data'][i]['partial_commission'].length && it['data'][i]['partial_commission'].length>0) { %]
[% for(var j in it['data'][i]['partial_commission']){ %]
<div class="oh" data-id="[%= it['data'][i]['partial_commission'][j]['id'] %]">
<span class="detail-modal-maid-span-real-fee">[%= it['data'][i]['partial_commission'][j]['real_fee'] %]</span>
<span class="detail-modal-maid-span-service-charge">[%= it['data'][i]['partial_commission'][j]['service_charge'] %]</span>
<span class="detail-modal-maid-span-charity-fund">[%= it['data'][i]['partial_commission'][j]['charity_fund'] %]</span>
<span class="detail-modal-maid-span-cash">[%= it['data'][i]['partial_commission'][j]['cash'] %]</span>
<span class="detail-modal-maid-span-practical-fee">[%= it['data'][i]['partial_commission'][j]['practical_fee'] %]</span>
<span class="detail-modal-maid-span-time">[%= dealT(it['data'][i]['partial_commission'][j]['confirm_date']) %]</span>
</div>
[% } %]
[% }else{ %]
<div class="oh">
<span class="detail-modal-maid-span-real-fee"></span>
<span class="detail-modal-maid-span-service-charge">0</span>
<span class="detail-modal-maid-span-charity-fund">0</span>
<span class="detail-modal-maid-span-cash">0</span>
<span class="detail-modal-maid-span-practical-fee"></span>
<span class="detail-modal-maid-span-time"></span>
</div>
[% } %]
</td>
</tr>
[% } %]
[% }else{ %]
<tr>
<td colspan="11" style="text-align:center;"> 暂无数据</td>
</tr>
[% } %]
</script>
public/resource/template/reportList_shuiFee_template_tpl.html
View file @ ee67c7d1
......@@ -19,7 +19,7 @@
</tr>
[% if(it[item]['fee_list'] && it[item]['fee_list'].length && it[item]['fee_list'].length>0) { %]
[% for(var item2 in it[item]['fee_list']){ %]
<tr data-id="[%= it[item]['fee_list'][item2]['fee_id'] %]">
<tr data-feeid="[%= it[item]['fee_list'][item2]['fee_id'] %]">
<td>[%= getInfoType(it[item]['fee_list'][item2]['role']) %]</td>
<td>[%= it[item]['fee_list'][item2]['name']+'-'+it[item]['fee_list'][item2]['phone'] %]</td>
<td>[%= it[item]['fee_list'][item2]['scale'] %]</td>
......
public/resource/template/reportList_template_tpl.html
View file @ ee67c7d1
......@@ -2,7 +2,7 @@
[% if(it["list"] && it["list"].length && it["list"].length>0) { %]
[% var sw=function(s){switch(Number(s)){case 10:return"出租";case 20:return"增佣";case 30:return"代理";case 40:return"好处费";default:return s}}; %]
[% for(var item in it["list"]){ %]
<tr class="text-center" data-id='[%= it["list"][item]["id"] %]'>
<tr class="text-center" data-id="[%= it['list'][item]['id'] %]" data-orderid="[%= it['list'][item]['order_id'] %]">
<td>[%= it["list"][item]['create_time'] %]</td>
<td>[%= it["list"][item]['internal_address'] %]</td>
<td>[%= it["list"][item]['house_number'] %]</td>
......
public/resource/template/tax_template_tpl.html
View file @ ee67c7d1
<script id="tax_list_tpl" type="text/template">
[% if(it) { %]
[% for(var item in it){ %]
<tr class="text-center">
<tr class="text-center" data-id="[%= it[item]['id'] %]" data-orderid="[%= it[item]['order_id'] %]" data-fatherid="[%= it[item]['father_id'] %]">
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['district_store'] %]</td>
<td>[%= it[item]['name'] %]</td>
......@@ -11,8 +11,8 @@
<td>
<a class="btn1 btn-info edit" href="#modal-details" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
<a class="btn1 btn-info timeline" href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>
<a class="btn1 btn-info details-btn" href="#modal_detail" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
<a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>
</td>
</tr>
[% } %]
......
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