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
24f8bd9a
Commit
24f8bd9a
authored
Aug 17, 2018
by
agping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
后台 修改
parent
c5b588e1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
104 additions
and
28 deletions
+104
-28
users_list.html
application/index/view/member/users_list.html
+10
-10
performancesubsidiaryList.html
...view/performancesubsidiary/performancesubsidiaryList.html
+1
-2
RemarkFollowIndex.js
public/resource/js/RemarkFollowIndex.js
+21
-6
performance_subsidiary.js
public/resource/js/performance_subsidiary.js
+28
-0
user.js
public/resource/js/user.js
+44
-10
No files found.
application/index/view/member/users_list.html
View file @
24f8bd9a
...
@@ -369,7 +369,7 @@
...
@@ -369,7 +369,7 @@
<input
class=
"form-control btn2 margin-top-ld"
data-rule-phoneus=
"false"
data-rule-required=
"false"
name=
"userID"
placeholder=
"客户ID"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 margin-top-ld"
data-rule-phoneus=
"false"
data-rule-required=
"false"
name=
"userID"
placeholder=
"客户ID"
type=
"text"
value=
""
>
<span
class=
"fore-span ld-Marheight"
>
VIP客户:
</span>
<span
class=
"fore-span ld-Marheight"
>
VIP客户:
</span>
<select
class=
"form-control btn4 ld-Marheight"
id=
"user_vip_select"
>
<select
class=
"form-control btn4 ld-Marheight"
id=
"user_vip_select"
>
<option
value=
"
-1
"
>
请选择
</option>
<option
value=
""
>
请选择
</option>
<option
value=
"1"
>
是
</option>
<option
value=
"1"
>
是
</option>
<option
value=
"0"
>
否
</option>
<option
value=
"0"
>
否
</option>
</select>
</select>
...
@@ -381,7 +381,7 @@
...
@@ -381,7 +381,7 @@
<!--业态选择-->
<!--业态选择-->
<select
class=
"form-control btn2 margin-top-ld"
name=
"industry_type"
>
<select
class=
"form-control btn2 margin-top-ld"
name=
"industry_type"
>
<option
value=
"
0
"
>
业态选择
</option>
<option
value=
""
>
业态选择
</option>
<option>
轻餐饮
</option>
<option>
轻餐饮
</option>
<option>
重餐饮
</option>
<option>
重餐饮
</option>
<option>
百货零售
</option>
<option>
百货零售
</option>
...
@@ -391,13 +391,13 @@
...
@@ -391,13 +391,13 @@
</select>
</select>
<select
class=
"form-control btn2 margin-top-ld"
name=
"price_type"
>
<select
class=
"form-control btn2 margin-top-ld"
name=
"price_type"
>
<option
value=
"
0
"
>
价格需求
</option>
<option
value=
""
>
价格需求
</option>
<option
value=
"1"
>
10000元/月以下
</option>
<option
value=
"1"
>
10000元/月以下
</option>
<option
value=
"2"
>
10000元/月--30000元/月
</option>
<option
value=
"2"
>
10000元/月--30000元/月
</option>
<option
value=
"3"
>
30000元/月以上
</option>
<option
value=
"3"
>
30000元/月以上
</option>
</select>
</select>
<select
class=
"form-control btn2 margin-top-ld"
name=
"area_type"
>
<select
class=
"form-control btn2 margin-top-ld"
name=
"area_type"
>
<option
value=
"
0
"
>
面积需求
</option>
<option
value=
""
>
面积需求
</option>
<option
value=
"1"
>
30㎡以下
</option>
<option
value=
"1"
>
30㎡以下
</option>
<option
value=
"2"
>
30㎡-60㎡
</option>
<option
value=
"2"
>
30㎡-60㎡
</option>
<option
value=
"3"
>
60㎡-100㎡
</option>
<option
value=
"3"
>
60㎡-100㎡
</option>
...
@@ -405,30 +405,30 @@
...
@@ -405,30 +405,30 @@
</select>
</select>
<!--业态选择-->
<!--业态选择-->
<select
class=
"form-control btn2 margin-top-ld"
name=
"login_status"
>
<select
class=
"form-control btn2 margin-top-ld"
name=
"login_status"
>
<option
value=
"
-1
"
>
下载登录app
</option>
<option
value=
""
>
下载登录app
</option>
<option
value=
"1"
>
是
</option>
<option
value=
"1"
>
是
</option>
<option
value=
"2"
>
否
</option>
<option
value=
"2"
>
否
</option>
</select>
</select>
<select
class=
"form-control btn2 margin-top-ld"
name=
"activate"
>
<select
class=
"form-control btn2 margin-top-ld"
name=
"activate"
>
<option
value=
"
-1
"
>
是否注册app
</option>
<option
value=
""
>
是否注册app
</option>
<option
value=
"1"
>
是
</option>
<option
value=
"1"
>
是
</option>
<option
value=
"2"
>
否
</option>
<option
value=
"2"
>
否
</option>
</select>
</select>
<select
class=
"form-control btn2 margin-top-ld"
name=
"male_status"
>
<select
class=
"form-control btn2 margin-top-ld"
name=
"male_status"
>
<option
value=
"
-1
"
>
是否公客
</option>
<option
value=
""
>
是否公客
</option>
<option
value=
"2"
>
否
</option>
<option
value=
"2"
>
否
</option>
<option
value=
"1"
>
是
</option>
<option
value=
"1"
>
是
</option>
</select>
</select>
<select
class=
"form-control btn2 margin-top-ld"
name=
"public_status"
>
<select
class=
"form-control btn2 margin-top-ld"
name=
"public_status"
>
<option
value=
"
2
"
>
客户状态
</option>
<option
value=
""
>
客户状态
</option>
<option
value=
"0"
>
求租
</option>
<option
value=
"0"
>
求租
</option>
<option
value=
"1"
>
已租
</option>
<option
value=
"1"
>
已租
</option>
<option
value=
"-1"
>
无效
</option>
<option
value=
"-1"
>
无效
</option>
</select>
</select>
<select
class=
"form-control btn2 margin-top-ld input"
name=
""
id=
"district_id"
title=
"
<select
class=
"form-control btn2 margin-top-ld input"
name=
""
id=
"district_id"
title=
"
客方所属部门、客方所属门店 与邀请人所属部门、邀请人所属门店 不作为并列筛选项"
>
客方所属部门、客方所属门店 与邀请人所属部门、邀请人所属门店 不作为并列筛选项"
>
<option
value=
"
0
"
>
客方所属部门
</option>
<option
value=
""
>
客方所属部门
</option>
</select>
</select>
...
@@ -440,7 +440,7 @@
...
@@ -440,7 +440,7 @@
<!--邀请人-->
<!--邀请人-->
<select
class=
"form-control btn2 margin-top-ld input"
name=
""
id=
"district_id2"
title=
"
<select
class=
"form-control btn2 margin-top-ld input"
name=
""
id=
"district_id2"
title=
"
客方所属部门、客方所属门店 与邀请人所属部门、邀请人所属门店 不作为并列筛选项"
>
客方所属部门、客方所属门店 与邀请人所属部门、邀请人所属门店 不作为并列筛选项"
>
<option
value=
"
0
"
>
邀请人所属部门
</option>
<option
value=
""
>
邀请人所属部门
</option>
</select>
</select>
...
...
application/index/view/performancesubsidiary/performancesubsidiaryList.html
View file @
24f8bd9a
...
@@ -66,8 +66,7 @@
...
@@ -66,8 +66,7 @@
</div>
</div>
<span
class=
"btn btn-info btn3 search"
id=
"maintable_search"
>
搜索
</span>
<span
class=
"btn btn-info btn3 search"
id=
"maintable_search"
>
搜索
</span>
<span
class=
"btn btn-info btn3"
id=
"maintable_reset"
>
重置
</span>
<span
class=
"btn btn-info btn3"
id=
"maintable_reset"
>
重置
</span>
<span
class=
"btn btn-info btn3"
id=
"maintable_export"
>
导出excel
</span>
<!--<span class="btn btn-info btn3" id="maintable_export">导出excel</span>-->
</form>
</form>
</td>
</td>
</tr>
</tr>
...
...
public/resource/js/RemarkFollowIndex.js
View file @
24f8bd9a
...
@@ -1109,17 +1109,32 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
...
@@ -1109,17 +1109,32 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
},
},
getInfor
:
function
(
params
)
{
getInfor
:
function
(
params
)
{
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
var
params
=
{};
params
.
remark_name
=
$
.
trim
(
$
(
"#remark_name"
).
val
());
params
.
remark_phone
=
$
.
trim
(
$
(
"#remark_phone"
).
val
());
params
.
remark_store_id
=
$
.
trim
(
$
(
"#guest_stores"
).
val
());
params
.
remark_district_id
=
$
.
trim
(
$
(
"#district_id"
).
val
());
if
(
$
(
'#user_city_choose'
).
val
()
==
310100
){
//城市
params
.
city
=
'上海市'
;
}
if
(
$
(
'#user_city_choose'
).
val
()
==
330100
){
params
.
city
=
'杭州市'
;
}
params
.
start_date
=
$
(
'#start_date'
).
val
();
params
.
end_date
=
$
(
'#end_date'
).
val
();
// params.user_id = $.trim($("#customer_name_id").val());//客户编号
params
.
disc
=
$
.
trim
(
$
(
"#user_area_choose"
).
val
());
//区域
params
.
user_id
=
user
.
user_id
;
params
.
agent_id
=
user_info_obj
.
id
;
params
.
type
=
user_type
;
params
.
AuthToken
=
user_info_obj
.
AuthToken
;
$
.
ajax
({
$
.
ajax
({
url
:
'/broker/getLastOrNextUserID'
,
//上一页 下一页 调用接口
url
:
'/broker/getLastOrNextUserID'
,
//上一页 下一页 调用接口
// url: 'https://pre2.tonglianjituan.com'+'/broker/getLastOrNextUserID',
// url: 'https://pre2.tonglianjituan.com'+'/broker/getLastOrNextUserID',
type
:
'GET'
,
type
:
'GET'
,
async
:
true
,
async
:
true
,
data
:
{
data
:
params
,
"user_id"
:
user
.
user_id
,
"agent_id"
:
user_info_obj
.
id
,
"type"
:
user_type
,
"AuthToken"
:
user_info_obj
.
AuthToken
},
dataType
:
'json'
,
dataType
:
'json'
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
if
(
data
.
code
==
200
||
data
.
code
==
201
)
{
if
(
data
.
code
==
200
||
data
.
code
==
201
)
{
...
...
public/resource/js/performance_subsidiary.js
View file @
24f8bd9a
...
@@ -47,6 +47,10 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r
...
@@ -47,6 +47,10 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r
_doc
.
on
(
"click"
,
".timeline"
,
function
()
{
_doc
.
on
(
"click"
,
".timeline"
,
function
()
{
bargain
.
Timeline
();
bargain
.
Timeline
();
});
});
//业绩明细 导出报表
_doc
.
on
(
"click"
,
"#maintable_export"
,
function
()
{
bargain
.
maintableExport
();
});
//转到一级审核
//转到一级审核
_doc
.
on
(
'click'
,
'.maintable-btn-trans-one'
,
function
(
e
){
_doc
.
on
(
'click'
,
'.maintable-btn-trans-one'
,
function
(
e
){
...
@@ -1326,6 +1330,30 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r
...
@@ -1326,6 +1330,30 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r
return
''
;
return
''
;
}
}
},
},
// 导出业绩列表
maintableExport
:
function
(
pageNo
)
{
console
.
log
(
2
);
bargain
.
pageNo
=
pageNo
;
var
params
=
{};
var
excel_two
=
1
;
var
user_name
=
$
.
trim
(
$
(
'#customer_name'
).
val
());
var
start_time
=
$
(
'#start_date'
).
val
();
var
end_time
=
$
(
'#end_date'
).
val
();
var
internal_address
=
$
(
'#shop_name'
).
val
();
var
user_phone
=
$
(
'#customer_phone'
).
val
();
var
id
=
$
(
'#shop_num'
).
val
();
var
store_name
=
$
(
'#store_name'
).
val
();
var
report_phone
=
$
(
'#applicant_phone'
).
val
();
var
report_name
=
$
(
'#applicant_name'
).
val
();
var
store_id
=
$
(
"select[name='store_id'] option:selected"
).
val
();
var
district_id
=
$
(
"select[name='district_id'] option:selected"
).
val
();
var
pay_type
=
$
(
"select[name='maintable_shop_type_2'] option:selected"
).
val
();
var
type
=
$
(
"select[name='maintable_shop_type_1'] option:selected"
).
val
();
window
.
open
(
'/index/getPerformanceExcel'
);
// window.open('/index/getCollection?' +
// 'excel=' + excel_two + '&user_name=' + user_name + '&start_time=' + start_time + '&end_time=' + end_time + '&internal_address=' + internal_address + '&user_phone=' + user_phone + '&id=' + id + '&store_name=' + store_name + '&report_phone=' + report_phone + '&report_name=' + report_name+ '&store_id=' + store_id+ '&district_id=' + district_id+ '&pay_type=' + pay_type+ '&type=' + type);
},
//获取一级审核,二级审核,三级审核,结单数据列表共用的方法
//获取一级审核,二级审核,三级审核,结单数据列表共用的方法
getList
:
function
(
pageNo
){
getList
:
function
(
pageNo
){
var
params
=
{
var
params
=
{
...
...
public/resource/js/user.js
View file @
24f8bd9a
...
@@ -903,8 +903,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
...
@@ -903,8 +903,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
user
.
pageNo
=
pageNo
;
user
.
pageNo
=
pageNo
;
var
params
=
{};
var
params
=
{};
params
.
agent_id
=
user_info_obj
.
id
;
params
.
agent_id
=
user_info_obj
.
id
;
// 增加客户id的搜索 客户姓名和手机号搜索分开
params
.
user_nick
=
$
.
trim
(
$
(
"input[name='user']"
).
val
());
params
.
user_nick
=
$
.
trim
(
$
(
"input[name='user']"
).
val
());
params
.
phone
=
$
.
trim
(
$
(
"input[name='phone']"
).
val
());
params
.
phone
=
$
.
trim
(
$
(
"input[name='phone']"
).
val
());
params
.
id
=
$
.
trim
(
$
(
"input[name='userID']"
).
val
());
params
.
id
=
$
.
trim
(
$
(
"input[name='userID']"
).
val
());
...
@@ -944,8 +942,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
...
@@ -944,8 +942,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
}
}
params
.
disc
=
$
.
trim
(
$
(
"#user_area_choose"
).
val
());
//区域
params
.
disc
=
$
.
trim
(
$
(
"#user_area_choose"
).
val
());
//区域
//客方和邀请人搜索项不能并列
$
.
ajax
({
$
.
ajax
({
url
:
'/index/users_list'
,
url
:
'/index/users_list'
,
type
:
'GET'
,
type
:
'GET'
,
...
@@ -1116,17 +1112,55 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
...
@@ -1116,17 +1112,55 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
},
},
getInfor
:
function
(
params
)
{
//上一页 下一页 调用接口
getInfor
:
function
(
params
)
{
//上一页 下一页 调用接口
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
var
params
=
{};
params
.
user_nick
=
$
.
trim
(
$
(
"input[name='user']"
).
val
());
params
.
phone
=
$
.
trim
(
$
(
"input[name='phone']"
).
val
());
params
.
id
=
$
.
trim
(
$
(
"input[name='userID']"
).
val
());
params
.
vip
=
$
.
trim
(
$
(
"#user_vip_select"
).
val
());
//vip筛选
params
.
phone
=
$
.
trim
(
$
(
"input[name='phone']"
).
val
());
params
.
invite_phone
=
$
.
trim
(
$
(
"input[name='invite_phone']"
).
val
());
params
.
start_date
=
$
.
trim
(
$
(
"#start_date"
).
val
());
params
.
end_date
=
$
.
trim
(
$
(
"#end_date"
).
val
());
params
.
follow_start
=
$
.
trim
(
$
(
"#follow_start"
).
val
());
params
.
follow_end
=
$
.
trim
(
$
(
"#follow_end"
).
val
());
params
.
registration_start
=
$
.
trim
(
$
(
"#registration_start"
).
val
());
params
.
registration_end
=
$
.
trim
(
$
(
"#registration_end"
).
val
());
params
.
login_status
=
$
.
trim
(
$
(
"select[name=login_status]"
).
val
());
params
.
activate
=
$
.
trim
(
$
(
"select[name=activate]"
).
val
());
params
.
rent_user
=
$
.
trim
(
$
(
"select[name=public_status]"
).
val
());
params
.
public_user
=
$
.
trim
(
$
(
"select[name=male_status]"
).
val
());
params
.
store_id
=
$
.
trim
(
$
(
"#guest_stores"
).
val
());
params
.
referrer_store_id
=
$
.
trim
(
$
(
"#guest_stores2"
).
val
());
params
.
district_id
=
$
.
trim
(
$
(
"#district_id"
).
val
());
params
.
referrer_district_id
=
$
.
trim
(
$
(
"#district_id2"
).
val
());
params
.
login_status
=
$
.
trim
(
$
(
"select[name=login_status]"
).
val
());
params
.
activate
=
$
.
trim
(
$
(
"select[name=activate]"
).
val
());
params
.
pageNo
=
user
.
pageNo
;
params
.
pageSize
=
user
.
pageSize
;
params
.
user_agent
=
$
.
trim
(
$
(
"input[name='user_agent']"
).
val
());
params
.
invite_agent_phone
=
$
.
trim
(
$
(
"input[name='invite_agent_phone']"
).
val
());
params
.
area_type
=
$
.
trim
(
$
(
"select[name=area_type]"
).
val
());
params
.
price_type
=
$
.
trim
(
$
(
"select[name=price_type]"
).
val
());
params
.
industry_type
=
$
.
trim
(
$
(
"select[name=industry_type]"
).
val
());
params
.
first_login_start
=
$
.
trim
(
$
(
"#first_login_start"
).
val
());
params
.
first_login_end
=
$
.
trim
(
$
(
"#first_login_end"
).
val
());
if
(
$
(
'#user_city_choose'
).
val
()
==
310100
){
//城市
params
.
city
=
'上海市'
;
}
if
(
$
(
'#user_city_choose'
).
val
()
==
330100
){
params
.
city
=
'杭州市'
;
}
params
.
disc
=
$
.
trim
(
$
(
"#user_area_choose"
).
val
());
//区域
params
.
user_id
=
user
.
user_id
;
params
.
agent_id
=
user_info_obj
.
id
;
params
.
type
=
user_type
;
params
.
AuthToken
=
user_info_obj
.
AuthToken
;
$
.
ajax
({
$
.
ajax
({
url
:
'/broker/getLastOrNextUserID'
,
url
:
'/broker/getLastOrNextUserID'
,
// url: 'https://pre2.tonglianjituan.com'+'/broker/getLastOrNextUserID',
// url: 'https://pre2.tonglianjituan.com'+'/broker/getLastOrNextUserID',
type
:
'GET'
,
type
:
'GET'
,
async
:
true
,
async
:
true
,
data
:
{
data
:
params
,
"user_id"
:
user
.
user_id
,
"agent_id"
:
user_info_obj
.
id
,
"type"
:
user_type
,
"AuthToken"
:
user_info_obj
.
AuthToken
},
dataType
:
'json'
,
dataType
:
'json'
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
if
(
data
.
code
==
200
||
data
.
code
==
201
)
{
if
(
data
.
code
==
200
||
data
.
code
==
201
)
{
...
...
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