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
36b1384e
Commit
36b1384e
authored
Jun 10, 2019
by
agping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2
parent
81570431
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
83 additions
and
22 deletions
+83
-22
users_list.html
application/index/view/member/users_list.html
+4
-4
officeBuildingList.html
...ication/index/view/officeBuilding/officeBuildingList.html
+4
-4
officeEdit.html
application/index/view/officeBuilding/officeEdit.html
+9
-4
officeBuildingList.js
public/resource/js/officeBuildingList.js
+2
-2
officeEdit.js
public/resource/js/officeEdit.js
+11
-0
user.js
public/resource/js/user.js
+38
-6
user_genjing_modal.js
public/resource/js/user_genjing_modal.js
+6
-1
office_building_list_template_tpl.html
.../resource/template/office_building_list_template_tpl.html
+9
-1
No files found.
application/index/view/member/users_list.html
View file @
36b1384e
...
...
@@ -663,13 +663,13 @@
</div>
</div>
<div
class=
"form-group form-group-bottom col-sm-6"
>
<div
class=
"form-group form-group-bottom col-sm-6"
class=
"isShowYetai"
>
<label
for=
"inputEmail3"
class=
"col-sm-4 control-label"
>
具体业态:
</label>
<div
class=
"col-sm-8"
>
<input
type=
"text"
class=
"form-control left-width"
name=
""
id=
"concrete_industry"
placeholder=
"8个字以内(选填)"
>
</div>
</div>
<div
class=
"form-group form-group-bottom col-sm-6"
>
<div
class=
"form-group form-group-bottom col-sm-6"
class=
"isShowYetai"
>
<label
class=
"col-sm-4 control-label"
>
业态:
</label>
<div
class=
"col-sm-8"
>
<select
class=
"form-control left-width"
id=
"industry_type2"
>
...
...
@@ -906,11 +906,11 @@
<option
value=
"1"
>
找办公楼
</option>
</select>
</td>
<td>
<td
class=
"isShowYetaiEdit"
>
<span
class=
"fore-span ld-Marheight"
>
具体业态:
</span>
<input
class=
"form-control btn6 ld-Marheight"
value=
""
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"concrete_industryEdit"
name=
""
type=
"text"
placeholder=
"选填"
>
</td>
<td>
<td
class=
"isShowYetaiEdit"
>
<span
class=
"fore-span ld-Marheight"
>
业态:
</span>
<select
class=
"form-control btn6 ld-Marheight industry_type_two_1"
name=
"industry_type_two"
>
<option>
轻餐饮
</option>
...
...
application/index/view/officeBuilding/officeBuildingList.html
View file @
36b1384e
...
...
@@ -276,9 +276,9 @@
</select>
<select
class=
"form-control btn2 ld-Marheight"
id=
"office_rent"
>
<option
value=
""
>
出租状态
</option>
<option
value=
"
1"
>
求
租
</option>
<option
value=
"
2
"
>
已租
</option>
<
option
value=
"3"
>
无效
</option
>
<option
value=
"
0"
>
未
租
</option>
<option
value=
"
1
"
>
已租
</option>
<
!--<option value="3">无效</option>--
>
</select>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"office_id"
placeholder=
"房源编号"
type=
"text"
value=
""
>
...
...
@@ -325,7 +325,7 @@
<ul
class=
"user-ul-agent"
></ul>
</div>
<!--盘方员工姓名 下拉式 搜索-->
<
input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"dish_phone"
placeholder=
"盘方(员工)手机号"
type=
"tel"
value=
""
>
<
!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish_phone" placeholder="盘方(员工)手机号" type="tel" value="">--
>
<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_date"
type=
"date"
>
...
...
application/index/view/officeBuilding/officeEdit.html
View file @
36b1384e
...
...
@@ -89,7 +89,7 @@
</div>
<!--<div class="form-group">-->
<!--新增时 不显示是否对客户展示-->
<div
class=
"form-group"
style=
"display: none;"
>
<div
class=
"form-group"
style=
"display: none;"
class=
"isShowuser"
>
<label
for=
"show_all"
>
是否对客户展示
</label>
<select
class=
"form-control"
name=
"showCd"
id=
"showCd"
disabled=
"disabled"
>
<option
value=
""
>
请选择
</option>
...
...
@@ -185,7 +185,7 @@
<div
class=
"col-xs-4 p-t-10"
>
<label
class=
""
>
物业管理费:
</label>
<input
type=
"number"
class=
"form-control input-100-width"
id=
"management_fee"
placeholder=
"请输入"
data-alert=
"请输入物业管理费!"
>
元/m/天
<input
type=
"number"
class=
"form-control input-100-width"
id=
"management_fee"
placeholder=
"请输入"
data-alert=
"请输入物业管理费!"
>
元/m
²
/天
</div>
<div
class=
"col-xs-4 p-t-10"
>
...
...
@@ -196,7 +196,7 @@
</div>
<div
class=
"col-xs-4 p-t-10"
>
<label
class=
""
>
面积:
</label>
<input
type=
"number"
class=
"form-control input-100-width"
id=
"area"
placeholder=
"请输入"
data-alert=
"请输入面积!"
>
m
<input
type=
"number"
class=
"form-control input-100-width"
id=
"area"
placeholder=
"请输入"
data-alert=
"请输入面积!"
>
m
²
</div>
<div
class=
"col-xs-4 p-t-10"
>
<label
class=
""
>
所在楼层:
</label>
...
...
@@ -318,7 +318,12 @@
<img
src=
"/resource/image/jia2@2x.png"
class=
"input-add-tel-landlord"
id=
"landlord_tel_jia"
/>
</div>
</li>
<li
class=
"list-group-item"
>
<div
class=
"form-group"
>
<label>
房东备注:(选填)
</label>
<input
type=
"text"
id=
"landlord_remark"
class=
"form-control"
style=
"width: 300px;"
/>
</div>
</li>
<li
class=
"list-group-item"
>
<div
class=
"form-group full-width-100 full-pic-area"
>
<label
for=
""
>
室内详情图(至少2张)
</label>
...
...
public/resource/js/officeBuildingList.js
View file @
36b1384e
...
...
@@ -1347,7 +1347,7 @@ if(data.code == 200) {
params
.
dish_store_id
=
$
(
'#guest_stores_panfang'
).
val
();
//盘方 门店 id
}
if
(
business
.
agent_id_choose
){
params
.
dish_
name
=
business
.
agent_id_choose
;
//盘方姓名 下拉式
params
.
dish_
id
=
business
.
agent_id_choose
;
//盘方姓名 下拉式
}
if
(
$
(
'#area_start'
).
val
()){
params
.
area_start
=
$
(
'#area_start'
).
val
();
//面积开始
...
...
@@ -1578,7 +1578,7 @@ if(data.code == 200) {
if
(
data
.
code
==
200
)
{
var
user_ul
=
""
;
$
.
each
(
data
.
data
.
data
,
function
(
i
,
item
)
{
user_ul
+=
'<li class="addphone-agent" data-id="'
+
item
.
name
+
'"'
+
'data-ids="'
+
item
.
id
+
'">'
+
item
.
id
+
'-'
+
item
.
name
+
'-'
+
item
.
phone
+
'</li>'
;
user_ul
+=
'<li class="addphone-agent" data-id="'
+
item
.
id
+
'"'
+
'data-ids="'
+
item
.
id
+
'">'
+
item
.
id
+
'-'
+
item
.
name
+
'-'
+
item
.
phone
+
'</li>'
;
});
$
(
".user-ul-agent"
).
html
(
user_ul
);
...
...
public/resource/js/officeEdit.js
View file @
36b1384e
...
...
@@ -10,6 +10,11 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
//初始化dot
user
.
event
();
$
(
'#pf_tel_jia'
).
hide
();
if
(
getUrlParam
(
'id'
)
!=
null
){
//编辑
$
(
".isShowuser"
).
show
()
}
else
{
$
(
".isShowuser"
).
hide
()
}
},
upload_id
:
0
,
event
:
function
()
{
...
...
@@ -55,6 +60,8 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
_isPartitionObj
=
$
(
'#is_partition'
),
//是否可分割
_carportObj
=
$
(
'#carport'
),
//车位情况
_isRegisterObj
=
$
(
'#is_register'
)
//入驻时间
_landlordRemarkObj
=
$
(
'#landlord_remark'
),
//房东备注
//处理文件名,长度过长时处理
function
dealFileName
(
str
)
{
//如果文件超过30的长度,则用*代替
...
...
@@ -244,6 +251,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
_floorObj
.
val
(
_data
[
'floor'
]);
//所在楼层
_roomNumberObj
.
val
(
_data
[
'room_number'
]);
//房号
_floorTagObj
.
val
(
_data
[
'floor_tag'
]);
//所属楼层
_landlordRemarkObj
.
val
(
_data
[
landlord_remark
]);
//房东备注
_enterDateObj
.
val
(
_data
[
'enter_date'
]);
//入驻时间
_isRegisterObj
.
val
(
_data
[
'is_register'
]);
//是否可注册公司
_isPartitionObj
.
val
(
_data
[
'is_partition'
]);
//是否可分割
...
...
@@ -251,6 +259,8 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
_enterDateObj
.
val
(
_data
[
'enter_date'
]);
//入驻时间
_laiyuanObj
.
val
(
_data
[
'source'
]);
//来源
_exclusiveTypeObj
.
val
(
_data
[
'is_exclusive_type'
]);
//是否独家
$
(
"#showCd"
).
val
(
_data
[
'is_show'
]);
//是否对客户展示
_zuhangxiuObj
.
val
(
_data
[
'decoration'
]);
//交互装修
if
(
_data
[
'is_exclusive_type'
]
==
1
){
...
...
@@ -1103,6 +1113,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
'floor'
:
_floorObj
.
val
(),
//所在楼层
'room_number'
:
_roomNumberObj
.
val
(),
//房号
'floor_tag'
:
_floorTagObj
.
val
(),
//所属楼层
'landlord_remark'
:
_landlordRemarkObj
.
val
(),
//房东备注
'enter_date'
:
_enterDateObj
.
val
(),
//入驻时间
'is_register'
:
_isRegisterObj
.
val
(),
//是否可注册公司
'is_partition'
:
_isPartitionObj
.
val
(),
//是否可分割
...
...
public/resource/js/user.js
View file @
36b1384e
...
...
@@ -236,6 +236,28 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
var
id_
=
$
(
this
).
attr
(
"data-id"
);
user
.
relationalRecord
(
id_
);
});
//新增客户 隐藏具体业态 业态范围
_doc
.
on
(
'input'
,
'#find-shop-type'
,
function
(
e
)
{
e
.
preventDefault
();
e
.
stopPropagation
();
if
(
$
(
this
).
val
()
==
1
){
$
(
".isShowYetai"
).
hide
();
}
else
{
$
(
".isShowYetai"
).
show
();
}
});
//编辑客户 隐藏具体业态 业态范围
_doc
.
on
(
'input'
,
'#find-shop-typeEdit'
,
function
(
e
)
{
e
.
preventDefault
();
e
.
stopPropagation
();
if
(
$
(
this
).
val
()
==
1
){
$
(
".isShowYetaiEdit"
).
hide
();
}
else
{
$
(
".isShowYetaiEdit"
).
show
();
}
});
//客户列表 客户编辑日志
_doc
.
on
(
'click'
,
'.customerEditLog '
,
function
(
e
)
{
...
...
@@ -1586,12 +1608,10 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
params
.
agents_id
=
user
.
agent_id2
;
params
.
sex
=
$
(
".sex_1"
).
val
();
params
.
vip
=
$
(
".user_vip2_1"
).
val
();
params
.
industry_type
=
$
(
".industry_type_two_1"
).
val
();
params
.
price_demand
=
$
(
".price_demand_1"
).
val
();
params
.
area_demand
=
$
(
".area_demand_1"
).
val
();
params
.
source_intro
=
$
(
"#user_source_edit"
).
val
();
params
.
referrer_id
=
user
.
user_id_edit_introduce
?
user
.
user_id_edit_introduce
:
-
1
;
if
(
user
.
referrer_source
==
"0"
||
user
.
referrer_source
==
0
)
{
params
.
referrer_source
=
10
;
}
else
{
...
...
@@ -1601,7 +1621,12 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
params
.
entrust_type
=
$
(
'#find-shop-typeEdit'
).
val
();
params
.
weixin_nick
=
$
(
"#weixin_nickEdit"
).
val
();
//微信号
params
.
user_status
=
$
(
"#edit-user-staus"
).
val
();
//客户状态
params
.
concrete_industry
=
$
(
"#concrete_industryEdit"
).
val
();
//具体业态
if
(
$
(
'#find-shop-typeEdit'
).
val
()
==
1
){
params
.
concrete_industry
=
$
(
"#concrete_industryEdit"
).
val
();
//具体业态
params
.
industry_type
=
$
(
".industry_type_two_1"
).
val
();
}
$
.
ajax
({
'type'
:
'POST'
,
'url'
:
'/index/pcEditClient'
,
...
...
@@ -2207,7 +2232,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
params
.
sex
=
$
(
"#user_sex"
).
val
();
params
.
price_demand
=
$
(
"#price_type2"
).
val
();
params
.
area_demand
=
$
(
"#area_type2"
).
val
();
params
.
industry_type
=
$
(
"#industry_type2"
).
val
();
params
.
vip
=
$
(
"#user_vip"
).
val
();
params
.
source_intro
=
$
(
"#user_source_add"
).
val
();
params
.
type
=
'add'
;
...
...
@@ -2215,8 +2239,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
params
.
referrer_source
=
10
;
params
.
weixin_nick
=
$
(
"#weixin_nick"
).
val
();
//微信号
params
.
user_status
=
$
(
"#add-user-staus"
).
val
();
//客户状态
params
.
concrete_industry
=
$
(
"#concrete_industry"
).
val
();
//具体业态
//站点标签验证
var
_siteTagArr
=
[];
$
.
each
(
$
(
'.roomTag'
),
function
(
i
,
item
)
{
...
...
@@ -2225,9 +2247,19 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
params
.
site_id
=
_siteTagArr
.
join
(
','
);
//客户类型
params
.
entrust_type
=
$
(
'#find-shop-type'
).
val
();
if
(
$
(
'#find-shop-type'
).
val
()
==
1
){
params
.
concrete_industry
=
$
(
"#concrete_industry"
).
val
();
//具体业态
params
.
industry_type
=
$
(
"#industry_type2"
).
val
();
//业态范围
if
(
params
.
concrete_industry
==
''
)
{
alert
(
'具体业态必填'
);
return
;
}
}
params
.
disc
=
$
(
"#user_area_add"
).
val
();
params
.
user_label
=
$
(
"#user_label_add"
).
val
();
if
(
params
.
user_name
==
''
)
{
alert
(
'姓名不能为空'
);
$
(
"input[name='user_name']"
).
focus
();
...
...
public/resource/js/user_genjing_modal.js
View file @
36b1384e
...
...
@@ -63,6 +63,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
isExitsNew
:
0
,
isExitsNewInfo
:
1
,
detailTabIndexFollowRent
:
3
,
//标识求租 已租
entrustType
:
0
,
init
:
function
()
{
$
(
"body"
).
append
(
template
);
user
.
isExitsNew
=
0
;
...
...
@@ -712,6 +713,8 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
'content'
:
_beizhuObjVal
,
'user_id'
:
user
.
user_id
,
'agent_id'
:
_userId
,
'entrust_type'
:
user
.
entrustType
,
// 'user_status': _genjinMarkOBj.attr('data-markid')
};
// if(type === 'sp1'){
...
...
@@ -744,7 +747,8 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
$
.
ajax
({
type
:
'POST'
,
url
:
ServerHostTempC
+
'/broker/add_phone_follow_up'
,
// url: ServerHostTempC + '/broker/add_phone_follow_up',
url
:
ServerHostTempC
+
'/broker/addUserPhoneFollowUpV2'
,
data
:
_data
,
timeout
:
30000
,
dataType
:
'json'
,
...
...
@@ -1131,6 +1135,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
success
:
function
(
data
)
{
if
(
data
.
code
==
200
)
{
if
(
data
.
data
)
{
user
.
entrustType
==
data
.
data
.
user_info
.
entrust_type
;
$
(
".cus_id"
).
html
(
data
.
data
.
user_info
.
user_id
);
//客户编号
// $(".cus_name").val(data.data.user_info.user_name); //姓名
// $("input[name=area_demand]").val(data.data.user_info.area_demand * 1);
...
...
public/resource/template/office_building_list_template_tpl.html
View file @
36b1384e
...
...
@@ -25,7 +25,15 @@
<
td
>
[
%=
it
[
item
][
'disc'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'business_name'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'title'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'floor_tag'
]
%
]
<
/td
>
<
td
>
[
%
if
(
it
[
item
][
'floor_tag'
]
==
1
)
{
%
]
底层
[
%
}
else
if
(
it
[
item
][
'floor_tag'
]
==
2
)
{
%
]
中层
[
%
}
else
if
(
it
[
item
][
'floor_tag'
]
==
3
)
{
%
]
高层
[
%
}
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
"price_total"
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
"price"
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
"area"
]
%
]
<
/td
>
...
...
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