Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
6b661691
Commit
6b661691
authored
Oct 17, 2018
by
agping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
后台 2.9.5
parent
eddee46b
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
169 additions
and
30 deletions
+169
-30
getCollection.html
application/index/view/collection/getCollection.html
+12
-3
account_statement.html
application/index/view/finance/account_statement.html
+16
-5
commission.html
application/index/view/finance/commission.html
+2
-1
commission_total.html
application/index/view/finance/commission_total.html
+2
-1
performancesubsidiaryList.html
...view/performancesubsidiary/performancesubsidiaryList.html
+2
-1
shopinspectionLogList.html
...tion/index/view/shopinspection/shopinspectionLogList.html
+17
-1
agent.js
public/resource/js/agent.js
+52
-1
getCollection.js
public/resource/js/getCollection.js
+32
-3
reportList.js
public/resource/js/reportList.js
+4
-1
shopInspectionLog.js
public/resource/js/shopInspectionLog.js
+9
-1
agent_template_tpl.html
public/resource/template/agent_template_tpl.html
+3
-7
commissionTotal_template_tpl.html
public/resource/template/commissionTotal_template_tpl.html
+4
-2
commission_template_tpl.html
public/resource/template/commission_template_tpl.html
+1
-0
get_collection_template_tpl.html
public/resource/template/get_collection_template_tpl.html
+3
-2
performance_subsidiary_template_tpl.html
...esource/template/performance_subsidiary_template_tpl.html
+1
-0
real_time_performance_template_tpl.html
...resource/template/real_time_performance_template_tpl.html
+2
-0
reportList_template_tpl.html
public/resource/template/reportList_template_tpl.html
+4
-1
shop_inspectionlog_template_tpl.html
...ic/resource/template/shop_inspectionlog_template_tpl.html
+3
-0
No files found.
application/index/view/collection/getCollection.html
View file @
6b661691
...
@@ -216,6 +216,7 @@
...
@@ -216,6 +216,7 @@
.modal-body-width
{
.modal-body-width
{
width
:
800px
;
width
:
800px
;
}
}
</style>
</style>
<div
id=
"page-content-wrapper"
>
<div
id=
"page-content-wrapper"
>
<div
class=
"container"
>
<div
class=
"container"
>
...
@@ -232,12 +233,16 @@
...
@@ -232,12 +233,16 @@
<table
class=
"table table-striped table-bordered table-hover table-condensed"
>
<table
class=
"table table-striped table-bordered table-hover table-condensed"
>
<thead>
<thead>
<tr>
<tr>
<td
colspan=
"1
1
"
>
<td
colspan=
"1
3
"
>
<form
id=
"form_search"
>
<form
id=
"form_search"
>
<span
class=
"fore-span ld-Marheight"
>
收款时间:
</span>
<span
class=
"fore-span ld-Marheight"
>
收款
提交
时间:
</span>
<input
class=
"form-control btn4 ld-Marheight"
value=
""
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"start_date"
name=
"start_date1"
type=
"date"
>
<input
class=
"form-control btn4 ld-Marheight"
value=
""
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"start_date"
name=
"start_date1"
type=
"date"
>
<span
class=
"fore-span ld-Marheight"
>
-
</span>
<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_date"
name=
"end_date1"
type=
"date"
>
<input
class=
"form-control btn4 ld-Marheight"
value=
""
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"end_date"
name=
"end_date1"
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=
"start_date_booked"
name=
""
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_date_booked"
name=
""
type=
"date"
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"shop_name"
placeholder=
"商铺地址"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"shop_name"
placeholder=
"商铺地址"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"shop_num"
placeholder=
"商铺号"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"shop_num"
placeholder=
"商铺号"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"customer_phone"
placeholder=
"客户手机号"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"customer_phone"
placeholder=
"客户手机号"
type=
"text"
value=
""
>
...
@@ -288,7 +293,8 @@
...
@@ -288,7 +293,8 @@
</td>
</td>
</tr>
</tr>
<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>
...
@@ -351,6 +357,9 @@
...
@@ -351,6 +357,9 @@
实付金额:
<input
type=
"number"
id=
'real_money'
/>
元
实付金额:
<input
type=
"number"
id=
'real_money'
/>
元
<div
class=
"clear"
></div>
<div
class=
"clear"
></div>
手续费:
<input
type=
"number"
id=
'real_money2'
/>
元
手续费:
<input
type=
"number"
id=
'real_money2'
/>
元
<div
class=
"clear"
></div><br
/>
<span
style=
"float: left;margin-top: 10px;"
>
入账日期:
</span><input
value=
""
class=
"form_datetime form-control btn5"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"date_booked"
name=
""
type=
"text"
readonly=
"readonly"
>
</div>
</div>
<div
class=
"modal-footer"
>
<div
class=
"modal-footer"
>
<!--<button type="button" class="btn btn-default" data-dismiss="modal">关闭
<!--<button type="button" class="btn btn-default" data-dismiss="modal">关闭
...
...
application/index/view/finance/account_statement.html
View file @
6b661691
...
@@ -53,7 +53,15 @@
...
@@ -53,7 +53,15 @@
float
:
right
;
float
:
right
;
}
}
/*客户详情 样式*/
/*客户详情 样式*/
.total-commission
{
font-size
:
16px
;
font-weight
:
600
;
float
:
left
;
margin-left
:
32px
;
}
#maintable_form_search
>
span
.total-commission
{
margin-top
:
16px
;
}
</style>
</style>
<div
id=
"page-content-wrapper"
>
<div
id=
"page-content-wrapper"
>
<div
class=
"container"
>
<div
class=
"container"
>
...
@@ -70,7 +78,7 @@
...
@@ -70,7 +78,7 @@
<table
class=
"table table-striped table-bordered table-hover table-condensed"
>
<table
class=
"table table-striped table-bordered table-hover table-condensed"
>
<thead>
<thead>
<tr>
<tr>
<td
colspan=
"1
2
"
class=
"maintable-top-sub-tr"
>
<td
colspan=
"1
4
"
class=
"maintable-top-sub-tr"
>
<a
class=
"btn btn-info liudan_pic_btn"
>
全部
</a>
<a
class=
"btn btn-info liudan_pic_btn"
>
全部
</a>
<a
class=
"btn btn-default liudan_pic_btn"
>
第一级审核
</a>
<a
class=
"btn btn-default liudan_pic_btn"
>
第一级审核
</a>
<a
class=
"btn btn-default liudan_pic_btn"
>
第二级审核
</a>
<a
class=
"btn btn-default liudan_pic_btn"
>
第二级审核
</a>
...
@@ -81,7 +89,7 @@
...
@@ -81,7 +89,7 @@
</tr>
</tr>
<!--三级审核的搜索功能-->
<!--三级审核的搜索功能-->
<tr>
<tr>
<td
colspan=
"1
2
"
>
<td
colspan=
"1
4
"
>
<form
id=
"maintable_form_search"
>
<form
id=
"maintable_form_search"
>
<span
class=
"fore-span"
>
商铺类型:
</span>
<span
class=
"fore-span"
>
商铺类型:
</span>
<select
class=
"form-control btn2"
name=
"maintable_shop_type"
id=
"maintable_shop_type"
>
<select
class=
"form-control btn2"
name=
"maintable_shop_type"
id=
"maintable_shop_type"
>
...
@@ -109,9 +117,10 @@
...
@@ -109,9 +117,10 @@
<input
class=
"form-control"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"partical_name"
placeholder=
"分佣方姓名"
type=
"text"
value=
""
>
<input
class=
"form-control"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"partical_name"
placeholder=
"分佣方姓名"
type=
"text"
value=
""
>
<ul
class=
"user-ul"
></ul>
<ul
class=
"user-ul"
></ul>
</div>
</div>
<input
class=
"form-control btn2"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"bargain_id"
placeholder=
"成交报告id"
type=
"text"
value=
""
>
<input
class=
"form-control btn2"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"bargain_id"
placeholder=
"成交报告id"
type=
"text"
value=
""
>
<span
class=
"total-commission"
>
应收佣金总计:
<span
class=
"total-commission-should"
></span>
元
</span>
<span
class=
"total-commission"
>
已收佣金总计:
<span
class=
"total-commission-real"
></span>
元
</span>
<span
class=
"total-commission"
>
未收佣金总计:
<span
class=
"total-commission-no"
></span>
元
</span>
<div
class=
"clear"
>
<div
class=
"clear"
>
</div>
</div>
...
@@ -132,6 +141,8 @@
...
@@ -132,6 +141,8 @@
<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>
</thead>
</thead>
...
...
application/index/view/finance/commission.html
View file @
6b661691
...
@@ -122,7 +122,8 @@
...
@@ -122,7 +122,8 @@
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<th
class=
"text-center"
>
ID
</th>
<th
class=
"text-center"
>
成交报告ID
</th>
<th
class=
"text-center"
>
分佣ID
</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 @
6b661691
...
@@ -133,7 +133,8 @@
...
@@ -133,7 +133,8 @@
<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>
...
...
application/index/view/performancesubsidiary/performancesubsidiaryList.html
View file @
6b661691
...
@@ -102,7 +102,8 @@
...
@@ -102,7 +102,8 @@
</td>
</td>
</tr>
</tr>
<tr
class=
"maintable-tr-bar"
>
<tr
class=
"maintable-tr-bar"
>
<th
class=
"text-center"
>
ID
</th>
<th
class=
"text-center"
>
成交报告ID
</th>
<th
class=
"text-center"
>
分佣ID
</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/shopinspection/shopinspectionLogList.html
View file @
6b661691
...
@@ -67,6 +67,7 @@
...
@@ -67,6 +67,7 @@
<th
class=
"text-center"
>
商铺ID
</th>
<th
class=
"text-center"
>
商铺ID
</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>
</thead>
</thead>
<tbody
class=
"text-center"
id=
"shop_log_list"
>
<tbody
class=
"text-center"
id=
"shop_log_list"
>
...
@@ -84,7 +85,22 @@
...
@@ -84,7 +85,22 @@
</div>
</div>
</div>
</div>
<!-- #查看-->
<div
class=
"modal fade modal_followup"
id=
"modal_shop_detail"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"myModalLabel"
aria-hidden=
"true"
>
<div
class=
"modal-dialog modal-dialog-one"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<h4
class=
"modal-title detail-modal-header-tab"
>
查看商铺
</h4>
</div>
<div
class=
"modal-body modal-body-one"
>
<iframe
class=
"iframe-shop-detail"
></iframe>
</div>
</div>
</div>
</div>
...
...
public/resource/js/agent.js
View file @
6b661691
...
@@ -147,7 +147,58 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
...
@@ -147,7 +147,58 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
$
(
document
).
delegate
(
".submit_user"
,
"click"
,
function
()
{
//提交变更
$
(
document
).
delegate
(
".submit_user"
,
"click"
,
function
()
{
//提交变更
agent
.
Submit_user
();
agent
.
Submit_user
();
});
});
//冻结状态选中与取消事件2.9.5版本;
$
(
document
).
on
(
'click'
,
'.yetai_checkbox'
,
function
(
e
){
if
(
!
confirm
(
'是否继续?'
))
{
return
;
};
if
(
$
(
this
).
hasClass
(
"isCheck"
)
){
//取消选中
if
(
$
(
this
).
html
()
==
'已离职'
){
$
(
this
).
html
(
'离职'
)
}
if
(
$
(
this
).
html
()
==
'已长假'
){
$
(
this
).
html
(
'长假'
)
}
if
(
$
(
this
).
html
()
==
'已转勤'
){
$
(
this
).
html
(
'转勤'
)
}
$
(
this
).
removeClass
(
"isCheck"
).
addClass
(
"btn-info"
).
removeClass
(
'btn-warning'
);
}
else
{
//选中
if
(
$
(
this
).
html
()
==
'离职'
){
$
(
this
).
html
(
'已离职'
);
$
(
".yetai_checkbox:eq(1)"
).
html
(
'长假'
);
$
(
".yetai_checkbox:eq(2)"
).
html
(
'转勤'
);
}
if
(
$
(
this
).
html
()
==
'长假'
){
$
(
this
).
html
(
'已长假'
);
$
(
".yetai_checkbox:eq(0)"
).
html
(
'离职'
);
$
(
".yetai_checkbox:eq(2)"
).
html
(
'转勤'
);
}
if
(
$
(
this
).
html
()
==
'转勤'
){
$
(
this
).
html
(
'已转勤'
);
$
(
".yetai_checkbox:eq(0)"
).
html
(
'离职'
);
$
(
".yetai_checkbox:eq(1)"
).
html
(
'长假'
);
}
$
(
this
).
siblings
(
".yetai_checkbox"
).
removeClass
(
"isCheck"
).
addClass
(
"btn-info"
).
removeClass
(
'btn-warning'
);
$
(
this
).
addClass
(
"isCheck"
).
removeClass
(
"btn-info"
).
addClass
(
'btn-warning'
);
};
$
.
ajax
({
//经纪人 离职 长假 转勤
'type'
:
'POST'
,
'url'
:
'/index/updateStatus'
,
data
:
{
"ids"
:
agent
.
id
,
"status"
:
$
(
'.isCheck'
).
html
()
},
dataType
:
"json"
,
success
:
function
(
data
)
{
if
(
data
.
code
!=
200
)
{
alert
(
"禁用失败!"
)
}
}
});
});
//老版本 经纪人 状态
$
(
document
).
delegate
(
".is_show"
,
"click"
,
function
()
{
//点击禁用
$
(
document
).
delegate
(
".is_show"
,
"click"
,
function
()
{
//点击禁用
if
(
!
confirm
(
'是否继续?'
))
{
if
(
!
confirm
(
'是否继续?'
))
{
return
;
return
;
...
...
public/resource/js/getCollection.js
View file @
6b661691
define
([
'doT'
,
'text!temp/get_collection_template_tpl.html'
,
'css!style/home.css'
,
'ckfinder'
,
'ckfinderStart'
,
'pagination'
,
'bootstrapJs'
,
'blow-up'
],
function
(
doT
,
template
)
{
define
([
'doT'
,
'text!temp/get_collection_template_tpl.html'
,
'css!style/home.css'
,
'ckfinder'
,
'ckfinderStart'
,
"datetimepicker"
,
'pagination'
,
'bootstrapJs'
,
'blow-up'
],
function
(
doT
,
template
)
{
follow
=
{
follow
=
{
pageNo
:
1
,
pageNo
:
1
,
/*第几页*/
/*第几页*/
...
@@ -13,6 +13,32 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
...
@@ -13,6 +13,32 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
$
(
document
.
body
).
append
(
template
);
$
(
document
.
body
).
append
(
template
);
follow
.
getList
(
1
);
follow
.
getList
(
1
);
follow
.
event
();
follow
.
event
();
//汉化实现
;(
function
(
$
){
$
.
fn
.
datetimepicker
.
dates
[
'zh-CN'
]
=
{
days
:
[
"星期日"
,
"星期一"
,
"星期二"
,
"星期三"
,
"星期四"
,
"星期五"
,
"星期六"
,
"星期日"
],
daysShort
:
[
"周日"
,
"周一"
,
"周二"
,
"周三"
,
"周四"
,
"周五"
,
"周六"
,
"周日"
],
daysMin
:
[
"日"
,
"一"
,
"二"
,
"三"
,
"四"
,
"五"
,
"六"
,
"日"
],
months
:
[
"01"
,
"02"
,
"03"
,
"04"
,
"05"
,
"06"
,
"07"
,
"08"
,
"09"
,
"10"
,
"11"
,
"12"
],
monthsShort
:
[
"01"
,
"02"
,
"03"
,
"04"
,
"05"
,
"06"
,
"07"
,
"08"
,
"09"
,
"10"
,
"11"
,
"12"
],
today
:
"今日"
,
suffix
:
[],
meridiem
:
[
"am"
,
"pm"
],
weekStart
:
1
,
};
}(
jQuery
));
$
(
".form_datetime"
).
datetimepicker
({
//format: 'yyyy-mm-dd hh:ii:ss',
format
:
'yyyy-mm-dd hh:ii:00'
,
autoclose
:
true
,
language
:
'zh-CN'
,
minView
:
0
,
minuteStep
:
30
//hourStep: 1
});
$
(
'.datetimepicker'
).
hide
();
//初始化隐藏时间控件
},
},
event
:
function
()
{
event
:
function
()
{
var
_doc
=
$
(
document
);
var
_doc
=
$
(
document
);
...
@@ -85,7 +111,6 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
...
@@ -85,7 +111,6 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
$
(
"#export"
).
click
(
function
()
{
//导出列表
$
(
"#export"
).
click
(
function
()
{
//导出列表
follow
.
exportList
();
follow
.
exportList
();
});
});
//编辑按钮点击事件
//编辑按钮点击事件
$
(
document
).
delegate
(
".submit_edit2"
,
"click"
,
function
()
{
//提交
$
(
document
).
delegate
(
".submit_edit2"
,
"click"
,
function
()
{
//提交
var
_this
=
$
(
this
);
var
_this
=
$
(
this
);
...
@@ -93,7 +118,11 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
...
@@ -93,7 +118,11 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
console
.
log
(
follow
.
house_id2
);
console
.
log
(
follow
.
house_id2
);
$
(
"#real_money"
).
val
(
_this
.
attr
(
"data-money"
));
$
(
"#real_money"
).
val
(
_this
.
attr
(
"data-money"
));
$
(
"#real_money2"
).
val
(
_this
.
attr
(
"data-fee"
));
$
(
"#real_money2"
).
val
(
_this
.
attr
(
"data-fee"
));
if
(
_this
.
attr
(
"data-time"
).
indexOf
(
"0000"
)
!=
-
1
){
$
(
"#date_booked"
).
val
(
'2016-08-02 00:00:00'
);
}
else
{
$
(
"#date_booked"
).
val
(
_this
.
attr
(
"data-time"
));
}
});
});
//编辑-收付金额-保存
//编辑-收付金额-保存
...
...
public/resource/js/reportList.js
View file @
6b661691
...
@@ -1558,7 +1558,10 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
...
@@ -1558,7 +1558,10 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
$
(
this
).
children
(
'td:eq(0)'
).
html
(
hanghao
++
);
$
(
this
).
children
(
'td:eq(0)'
).
html
(
hanghao
++
);
});
});
}
}
//添加 佣金总计
$
(
'.total-commission-should'
).
html
(
data
.
data
.
total_commission
);
$
(
'.total-commission-real'
).
html
(
data
.
data
.
total_income_money
);
$
(
'.total-commission-no'
).
html
(
data
.
data
.
total_commission
*
1
-
data
.
data
.
total_income_money
*
1
);
// var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));
// var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));
/*分页代码*/
/*分页代码*/
add_page
(
data
.
data
.
total
,
pageNo
,
bargain
.
pageSize
,
bargain
.
getList
);
add_page
(
data
.
data
.
total
,
pageNo
,
bargain
.
pageSize
,
bargain
.
getList
);
...
...
public/resource/js/shopInspectionLog.js
View file @
6b661691
...
@@ -15,7 +15,6 @@ define(['doT', 'text!temp/shop_inspectionlog_template_tpl.html', 'css!style/home
...
@@ -15,7 +15,6 @@ define(['doT', 'text!temp/shop_inspectionlog_template_tpl.html', 'css!style/home
},
},
event
:
function
()
{
event
:
function
()
{
var
_doc
=
$
(
document
);
var
_doc
=
$
(
document
);
//搜索按钮点击事件
//搜索按钮点击事件
$
(
"#search"
).
click
(
function
()
{
$
(
"#search"
).
click
(
function
()
{
shoplog
.
getList
(
1
);
shoplog
.
getList
(
1
);
...
@@ -26,6 +25,15 @@ define(['doT', 'text!temp/shop_inspectionlog_template_tpl.html', 'css!style/home
...
@@ -26,6 +25,15 @@ define(['doT', 'text!temp/shop_inspectionlog_template_tpl.html', 'css!style/home
document
.
getElementById
(
"form_search"
).
reset
();
document
.
getElementById
(
"form_search"
).
reset
();
});
});
//查看弹出框里的tab点击事件,查看商铺,商铺跟进
_doc
.
on
(
'click'
,
'.view-shop'
,
function
(
e
){
e
.
preventDefault
();
e
.
stopPropagation
();
shoplog
.
id
=
$
(
this
).
attr
(
"data-id"
);
$
(
this
).
removeClass
(
'btn-success'
).
addClass
(
'btn-warning'
);
$
(
'.iframe-shop-detail'
).
attr
(
'src'
,
'/app_broker/shop_detail_pc?shop_id='
+
shoplog
.
id
);
});
},
},
getList
:
function
(
pageNo
)
{
getList
:
function
(
pageNo
)
{
...
...
public/resource/template/agent_template_tpl.html
View file @
6b661691
...
@@ -34,13 +34,9 @@
...
@@ -34,13 +34,9 @@
<
td
class
=
"text-center"
>
<
td
class
=
"text-center"
>
<
a
class
=
"btn1 btn-success edit"
href
=
"#modal-edit"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
编辑
<
/a
>
<
a
class
=
"btn1 btn-success edit"
href
=
"#modal-edit"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
编辑
<
/a
>
[
%
if
(
it
[
item
][
"status"
]
==
0
)
{
%
]
<
a
class
=
"btn1 btn-info yetai_checkbox"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
离职
<
/a
>
<
a
class
=
"btn1 btn-info is_show"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
正常
<
/a
>
<
a
class
=
"btn1 btn-info yetai_checkbox"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
长假
<
/a
>
[
%
}
else
if
(
it
[
item
][
"status"
]
==
1
)
{
%
]
<
a
class
=
"btn1 btn-info yetai_checkbox"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
转勤
<
/a
>
<
a
class
=
"btn1 btn-default is_show"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
冻结
<
/a
>
[
%
}
else
{
%
]
<
a
class
=
"btn1 btn-default"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
离职
<
/a
>
[
%
}
%
]
<
a
class
=
"btn1 btn-default btn-default-show-caozuo"
>>>><
/a
>
<
a
class
=
"btn1 btn-default btn-default-show-caozuo"
>>>><
/a
>
[
%
if
(
check_auth
(
'index/updateRole'
))
{
%
]
[
%
if
(
check_auth
(
'index/updateRole'
))
{
%
]
<
a
href
=
"#modal-user"
class
=
"btn1 btn-danger btn-default-hide-display"
id
=
'role'
href
=
"#modal-edit"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
角色设置
<
/a
>
<
a
href
=
"#modal-user"
class
=
"btn1 btn-danger btn-default-hide-display"
id
=
'role'
href
=
"#modal-edit"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
角色设置
<
/a
>
...
...
public/resource/template/commissionTotal_template_tpl.html
View file @
6b661691
...
@@ -6,7 +6,9 @@
...
@@ -6,7 +6,9 @@
<
td
>
[
%=
it
[
item
][
'operation_date'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'operation_date'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'district_store'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'district_store'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'name'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'name'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'should_commission'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'service_charge'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'charity_fund'
]
%
]
<
/td
>
<
td
>
<
td
>
[
%
if
(
it
[
item
][
'cash'
]
){
%
]
[
%
if
(
it
[
item
][
'cash'
]
){
%
]
[
%=
it
[
item
][
'cash'
]
%
]
[
%=
it
[
item
][
'cash'
]
%
]
...
@@ -35,7 +37,7 @@
...
@@ -35,7 +37,7 @@
[
%
}
%
]
[
%
}
%
]
[
%
}
else
{
%
]
[
%
}
else
{
%
]
<
tr
>
<
tr
>
<
td
colspan
=
"
9
"
style
=
"text-align:center;"
>
暂无数据
<
/td
>
<
td
colspan
=
"
10
"
style
=
"text-align:center;"
>
暂无数据
<
/td
>
<
/tr
>
<
/tr
>
[
%
}
%
]
[
%
}
%
]
</script>
</script>
...
...
public/resource/template/commission_template_tpl.html
View file @
6b661691
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
[
%
for
(
var
item
in
it
){
%
]
[
%
for
(
var
item
in
it
){
%
]
<
tr
class
=
"text-center"
data
-
id
=
"[%= it[item]['bargain_id'] %]"
data
-
orderid
=
"[%= it[item]['order_id'] %]"
data
-
fatherid
=
"[%= it[item]['father_id'] %]"
>
<
tr
class
=
"text-center"
data
-
id
=
"[%= it[item]['bargain_id'] %]"
data
-
orderid
=
"[%= it[item]['order_id'] %]"
data
-
fatherid
=
"[%= it[item]['father_id'] %]"
>
<
td
>
[
%=
it
[
item
][
'bargain_id'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'bargain_id'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'id'
]
%
]
<
/td
>
<
td
>
<
td
>
[
%
if
(
it
[
item
][
'income_time'
])
{
%
]
[
%
if
(
it
[
item
][
'income_time'
])
{
%
]
[
%=
it
[
item
][
'income_time'
]
%
]
[
%=
it
[
item
][
'income_time'
]
%
]
...
...
public/resource/template/get_collection_template_tpl.html
View file @
6b661691
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
[
%
for
(
var
item
in
it
){
%
]
[
%
for
(
var
item
in
it
){
%
]
<
tr
class
=
"text-center"
>
<
tr
class
=
"text-center"
>
<
td
>
[
%=
it
[
item
][
'create_time'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'create_time'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'income_time'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'report_agent_name'
]
%
]
-
[
%=
it
[
item
][
'report_agent_phone'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'report_agent_name'
]
%
]
-
[
%=
it
[
item
][
'report_agent_phone'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'district_name'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'district_name'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'store_name'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'store_name'
]
%
]
<
/td
>
...
@@ -15,7 +16,7 @@
...
@@ -15,7 +16,7 @@
<
td
>
<
td
>
<
a
class
=
"btn1 btn-success add-pic"
href
=
"#modal-addPic"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
father
-
id
=
'[%= it[item]["father_id"] %]'
>
收款图片
<
/a
>
<
a
class
=
"btn1 btn-success add-pic"
href
=
"#modal-addPic"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
father
-
id
=
'[%= it[item]["father_id"] %]'
>
收款图片
<
/a
>
<
a
class
=
"btn1 btn-success timeline"
href
=
"#modal-time"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["order_id"] %]'
>
时间轴
<
/a
>
<
a
class
=
"btn1 btn-success timeline"
href
=
"#modal-time"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["order_id"] %]'
>
时间轴
<
/a
>
<
a
class
=
"btn1 btn-success submit_edit2"
href
=
"#modal-linetime"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"]%]'
data
-
fee
=
'[%= it[item]["transaction_fee"]%]'
data
-
money
=
'[%= it[item]["real_money"] %]'
>
实付金额
<
/a
>
<
a
class
=
"btn1 btn-success submit_edit2"
href
=
"#modal-linetime"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"]%]'
data
-
fee
=
'[%= it[item]["transaction_fee"]%]'
data
-
money
=
'[%= it[item]["real_money"] %]'
data
-
time
=
'[%= it[item]["income_time"] %]'
>
实付金额
<
/a
>
[
%
if
(
check_auth
(
'index/updatePayLog'
))
{
%
]
[
%
if
(
check_auth
(
'index/updatePayLog'
))
{
%
]
<
a
class
=
"btn1 btn-danger collection-del"
href
=
"#modal-delete"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
删除
<
/a
>
<
a
class
=
"btn1 btn-danger collection-del"
href
=
"#modal-delete"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
删除
<
/a
>
[
%
}
%
]
[
%
}
%
]
...
@@ -25,7 +26,7 @@
...
@@ -25,7 +26,7 @@
[
%
}
%
]
[
%
}
%
]
[
%
}
else
{
%
]
[
%
}
else
{
%
]
<
tr
>
<
tr
>
<
td
colspan
=
"1
0
"
style
=
"text-align:center;"
>
暂无数据
<
/td
>
<
td
colspan
=
"1
3
"
style
=
"text-align:center;"
>
暂无数据
<
/td
>
<
/tr
>
<
/tr
>
[
%
}
%
]
[
%
}
%
]
</script>
</script>
...
...
public/resource/template/performance_subsidiary_template_tpl.html
View file @
6b661691
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
[
%
for
(
var
item
in
it
){
%
]
[
%
for
(
var
item
in
it
){
%
]
<
tr
class
=
"text-center"
data
-
id
=
"[%= it[item]['id'] %]"
data
-
orderid
=
"[%= it[item]['order_id'] %]"
data
-
fatherid
=
"[%= it[item]['father_id'] %]"
>
<
tr
class
=
"text-center"
data
-
id
=
"[%= it[item]['id'] %]"
data
-
orderid
=
"[%= it[item]['order_id'] %]"
data
-
fatherid
=
"[%= it[item]['father_id'] %]"
>
<
td
>
[
%=
it
[
item
][
'id'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'id'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'partial_commission_id'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'create_time'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'create_time'
]
%
]
<
/td
>
<
td
>
[
%=
sw
(
it
[
item
][
'trade_type'
])
%
]
<
/td
>
<
td
>
[
%=
sw
(
it
[
item
][
'trade_type'
])
%
]
<
/td
>
<
td
class
=
"text-left"
>
[
%=
it
[
item
][
'landmark'
]
%
]
<
/td
>
<
td
class
=
"text-left"
>
[
%=
it
[
item
][
'landmark'
]
%
]
<
/td
>
...
...
public/resource/template/real_time_performance_template_tpl.html
View file @
6b661691
...
@@ -234,6 +234,7 @@
...
@@ -234,6 +234,7 @@
[
%
if
(
it
[
0
])
{
%
]
[
%
if
(
it
[
0
])
{
%
]
<
tr
>
<
tr
>
<
th
class
=
"text-center"
>
成交报告
ID
<
/th
>
<
th
class
=
"text-center"
>
成交报告
ID
<
/th
>
<
th
class
=
"text-center"
>
分佣
ID
<
/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
>
...
@@ -249,6 +250,7 @@
...
@@ -249,6 +250,7 @@
[
%
for
(
var
item
in
it
){
%
]
[
%
for
(
var
item
in
it
){
%
]
<
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
class
=
"text-center"
>
[
%=
it
[
item
][
'id'
]
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
it
[
item
][
'partial_commission_id'
]
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
it
[
item
][
'create_time'
]
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
it
[
item
][
'create_time'
]
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
sw
(
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-left"
>
[
%=
hideStr
(
it
[
item
][
'landmark'
])
%
]
<
/td
>
...
...
public/resource/template/reportList_template_tpl.html
View file @
6b661691
...
@@ -20,6 +20,9 @@
...
@@ -20,6 +20,9 @@
<
td
class
=
"text-center"
>
[
%=
it
[
"list"
][
item
][
'submit_agent_name'
]
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
it
[
"list"
][
item
][
'submit_agent_name'
]
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
sw
(
it
[
"list"
][
item
][
'trade_type'
])
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
sw
(
it
[
"list"
][
item
][
'trade_type'
])
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
it
[
"list"
][
item
][
'commission'
]
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
it
[
"list"
][
item
][
'commission'
]
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
it
[
"list"
][
item
][
'income_money'
]
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
it
[
"list"
][
item
][
'commission'
]
-
it
[
"list"
][
item
][
'income_money'
]
%
]
<
/td
>
<
td
class
=
"text-center"
width
=
"15%"
>
<
td
class
=
"text-center"
width
=
"15%"
>
[
%
if
(
check_auth
(
'index/bargainInfo'
))
{
%
]
[
%
if
(
check_auth
(
'index/bargainInfo'
))
{
%
]
<
a
class
=
"btn1 btn-success details-btn"
href
=
"#modal_detail"
data
-
toggle
=
"modal"
>
详情
<
/a> 
;
<
a
class
=
"btn1 btn-success details-btn"
href
=
"#modal_detail"
data
-
toggle
=
"modal"
>
详情
<
/a> 
;
...
@@ -46,7 +49,7 @@
...
@@ -46,7 +49,7 @@
[
%
}
%
]
[
%
}
%
]
[
%
}
else
{
%
]
[
%
}
else
{
%
]
<
tr
>
<
tr
>
<
td
colspan
=
"1
1
"
style
=
"text-align:center;"
>
暂无数据
<
/td
>
<
td
colspan
=
"1
4
"
style
=
"text-align:center;"
>
暂无数据
<
/td
>
<
/tr
>
<
/tr
>
[
%
}
%
]
[
%
}
%
]
</script>
</script>
...
...
public/resource/template/shop_inspectionlog_template_tpl.html
View file @
6b661691
...
@@ -6,6 +6,9 @@
...
@@ -6,6 +6,9 @@
<
td
>
[
%=
it
[
item
][
'house_id'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'house_id'
]
%
]
<
/td
>
<
td
>
[
%=
hideStr
(
it
[
item
][
'internal_title'
])
%
]
<
/td
>
<
td
>
[
%=
hideStr
(
it
[
item
][
'internal_title'
])
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'agent_name'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'agent_name'
]
%
]
<
/td
>
<
td
>
<
a
class
=
"btn1 view-shop [%= (it[item]['is_look'] && it[item]['auth_edit_house'] == 0)?'btn-warning':'btn-success' %]"
href
=
"#modal_shop_detail"
data
-
id
=
'[%= it[item]["house_id"] %]'
data
-
toggle
=
"modal"
>
查看商铺
<
/a
>
<
/td
>
<
/tr
>
<
/tr
>
[
%
}
%
]
[
%
}
%
]
[
%
}
else
{
%
]
[
%
}
else
{
%
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment