Skip to content

T
tl_estate
Commit 94132e28 authored by agping's avatar agping
Browse files
Options

后台

parent 2cebbce4
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 35 deletions
application/index/view/collection/getCollection.html
View file @ 94132e28
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
<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/member/users_list.html
View file @ 94132e28
...@@ -612,8 +612,8 @@ ...@@ -612,8 +612,8 @@
<select class="form-control btn6" id="user_label_add"> <select class="form-control btn6" id="user_label_add">
<!--<option value='' class="successModel">请选择</option>--> <!--<option value='' class="successModel">请选择</option>-->
<option value=''>请选择</option> <option value=''>请选择</option>
<option value="40">是租客也是房东</option> <option value="1">是租客也是房东</option>
<option value="41">纯房东</option> <option value="2">纯房东</option>
</select> </select>
</div> </div>
</div> </div>
...@@ -1195,8 +1195,8 @@ ...@@ -1195,8 +1195,8 @@
<span class="fore-span ld-Marheight">客户标签:</span> <span class="fore-span ld-Marheight">客户标签:</span>
<select class="form-control btn6 fore-span ld-Marheight" id="user_label_edit"> <select class="form-control btn6 fore-span ld-Marheight" id="user_label_edit">
<option value=''>请选择</option> <option value=''>请选择</option>
<option value="40">是租客也是房东</option> <option value="1">是租客也是房东</option>
<option value="41">纯房东</option> <option value="2">纯房东</option>
</select> </select>
</td> </td>
</tr> </tr>
......
public/resource/js/performance_subsidiary.js
View file @ 94132e28
...@@ -1332,7 +1332,7 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r ...@@ -1332,7 +1332,7 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r
var params = { var params = {
'pageNo': pageNo, 'pageNo': pageNo,
'pageSize': bargain.pageSize, 'pageSize': bargain.pageSize,
'shop_type': $('#maintable_shop_type').val(), // 'shop_type': $('#maintable_shop_type').val(),
'create_time': $.trim($('#maintable_create_time').val()), 'create_time': $.trim($('#maintable_create_time').val()),
'end_time': $.trim($('#maintable_end_time').val()), 'end_time': $.trim($('#maintable_end_time').val()),
'internal_address': $.trim($('#maintable_internal_address').val()), 'internal_address': $.trim($('#maintable_internal_address').val()),
...@@ -1348,9 +1348,8 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r ...@@ -1348,9 +1348,8 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
// url: bargain.switchUrl(), // url: bargain.switchUrl(),
url: '/index/marchInList', //获取业绩明细列表 url: '/index/performanceInfo', //获取业绩明细列表
data: params, data: params,
timeout: 30000,
dataType: 'json', dataType: 'json',
beforeSend: function() {}, beforeSend: function() {},
success: function(data) { success: function(data) {
...@@ -1369,14 +1368,7 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r ...@@ -1369,14 +1368,7 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r
alert('数据错误'); alert('数据错误');
}; };
}, },
error: function() {
alert('error');
},
complete: function(xhr, textStatus) {
if(textStatus === 'timeout') {
alert('请求超时');
};
}
}); });
}, },
getDistrict: function(fn) { getDistrict: function(fn) {
......
public/resource/js/user.js
View file @ 94132e28
...@@ -114,23 +114,20 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -114,23 +114,20 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
}); });
//城市 区域 筛选 //城市 区域 筛选
_doc.on('input', '#user_city_add,#user_city_edit,#user_city_choose', function() { _doc.on('input', '#user_city_add,#user_city_edit,#user_city_choose', function() {
console.log(222);
var _this = $(this); var _this = $(this);
var _id = _this.val(); var _id = _this.val();
_this.next().html(''); //先清空 _this.next().html(''); //先清空
//新增 编辑 //新增 编辑
var _objTemp = _this.parent().next().find('select'); // var _objTemp = _this.parent().next().find('select');
_objTemp.html(''); //先清空 // _objTemp.html(''); //先清空
if(_id && _id != '0') { if(_id && _id != '0') {
user.getCityAreaList(_id, function(_data) { user.getCityAreaList(_id, function(_data) {
// var _str = '';
var _str = '<option value="">全部</option>'; var _str = '<option value="">全部</option>';
$.each(_data, function(i, item) { $.each(_data, function(i, item) {
_str += '<option value="' + item.fullName + '">' + item.fullName + '</option>'; _str += '<option value="' + item.fullName + '">' + item.fullName + '</option>';
}); });
_objTemp.html(_str); // _objTemp.html(_str);
_this.next().html(_str); _this.next().html(_str);
}); });
} else {}; } else {};
}); });
...@@ -648,7 +645,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -648,7 +645,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
}); });
}, },
Submit_follow: function() { //提交 Submit_follow: function() { //客户编辑提交
var params = {}; var params = {};
params.id = user.user_id; params.id = user.user_id;
params.user_name = $(".cus_name_1").val(); params.user_name = $(".cus_name_1").val();
...@@ -664,10 +661,9 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -664,10 +661,9 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
if($('#user_city_edit').val() == 330100){ if($('#user_city_edit').val() == 330100){
params.city = '杭州市' ; params.city = '杭州市' ;
} }
// params.city = $("#user_city_edit").val();
params.disc = $("#user_area_edit").val(); params.disc = $("#user_area_edit").val();
params.source = $("#user_label_edit").val(); params.user_label = $("#user_label_edit").val();
$.ajax({ $.ajax({
...@@ -797,6 +793,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -797,6 +793,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
$("#take_look_name").html(data.data.user_info.user_name); //约带看姓名 $("#take_look_name").html(data.data.user_info.user_name); //约带看姓名
$("#take_look_phone").html(data.data.user_info.user_phone); //约带看手机号 $("#take_look_phone").html(data.data.user_info.user_phone); //约带看手机号
$("#take_look_id").html(data.data.user_info.user_id); //约带看id $("#take_look_id").html(data.data.user_info.user_id); //约带看id
if(data.data.user_info.city=='上海市'){ if(data.data.user_info.city=='上海市'){
$("#user_city_edit").val(310100); //编辑客方 $("#user_city_edit").val(310100); //编辑客方
var city_id=310100; var city_id=310100;
...@@ -806,18 +803,18 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -806,18 +803,18 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
var city_id=330100; var city_id=330100;
}; };
//区域 渲染
if(city_id) { if(city_id) {
agent.getDistrictStoreList(city_id, function(_data) { user.getCityAreaList(city_id, function(_data) {
// var _str = '';
var _str = '<option value="0">全部</option>'; var _str = '<option value="0">全部</option>';
$.each(_data, function(i, item) { $.each(_data, function(i, item) {
_str += '<option value="' + item.id + '">' + item.store_name + '</option>'; _str += '<option value="' + item.fullName + '">' + item.fullName + '</option>';
}); });
$("#user_area_edit").html(_str).val(data.data.user_info.disc); $("#user_area_edit").html(_str).val(data.data.user_info.disc);
}); });
} else { } else {
} };
// $("#user_area_edit").val(data.data.user_info.disc); //编辑区域 // $("#user_area_edit").val(data.data.user_info.disc); //编辑区域
...@@ -831,14 +828,14 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -831,14 +828,14 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
if(data.data.user_info.source == 30) { if(data.data.user_info.source == 30) {
$(".source_type").html('老数据报备客户'); $(".source_type").html('老数据报备客户');
} }
if(data.data.user_info.source == 40) { if(data.data.user_info.user_label == 1) {
$(".user_details_label").html('是租客也是房东'); $(".user_details_label").html('是租客也是房东');
$("#user_label_edit").val(40); $("#user_label_edit").val(1);
} }
if(data.data.user_info.source == 41) { if(data.data.user_info.user_label == 2) {
$(".user_details_label").html('纯房东'); $(".user_details_label").html('纯房东');
$("#user_label_edit").val(41); $("#user_label_edit").val(2);
} }
var caozuo_table = ""; var caozuo_table = "";
...@@ -981,7 +978,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -981,7 +978,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
params.city = '杭州市' ; params.city = '杭州市' ;
} }
params.disc = $("#user_area_add").val(); params.disc = $("#user_area_add").val();
params.source = $("#user_label_add").val(); params.user_label = $("#user_label_add").val();
if(params.user_name == '') { if(params.user_name == '') {
alert('姓名不能为空'); alert('姓名不能为空');
......
public/resource/template/user_template_tpl.html
View file @ 94132e28
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
[% if(it[item]["vip"] == 1) { %] [% if(it[item]["vip"] == 1) { %]
<span class="btn1 btn-danger btn-xs">vip</span> <span class="btn1 btn-danger btn-xs">vip</span>
[% } %] [% } %]
[% if(it[item]["source"] == 41) { %] [% if(it[item]["user_label"] == 2) { %]
<span class="btn1 btn-warning btn-xs">纯房东</span> <span class="btn1 btn-warning btn-xs">纯房东</span>
[% } %] [% } %]
</td> </td>
......
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