Commit 866e0bff authored by agping's avatar agping

后台修改

parent c74e4c26
...@@ -436,8 +436,8 @@ ...@@ -436,8 +436,8 @@
<div class="clear"></div> <div class="clear"></div>
<select class="form-control btn2 ld-Marheight" id="user_city_choose"> <select class="form-control btn2 ld-Marheight" id="user_city_choose">
<option value="" selected="selected">城市筛选</option> <option value="" selected="selected">城市筛选</option>
<option value="310100">上海</option> <option value="310100">上海</option>
<option value="330100">杭州</option> <option value="330100">杭州</option>
</select> </select>
<select class="form-control btn2 ld-Marheight" id="user_area_choose"> <select class="form-control btn2 ld-Marheight" id="user_area_choose">
<option value="" selected="selected">区域筛选</option> <option value="" selected="selected">区域筛选</option>
...@@ -533,8 +533,8 @@ ...@@ -533,8 +533,8 @@
<div class="col-sm-9"> <div class="col-sm-9">
<select class="form-control btn5" id="user_city_add"> <select class="form-control btn5" id="user_city_add">
<option value="" selected="selected">请选择城市</option> <option value="" selected="selected">请选择城市</option>
<option value="310100">上海</option> <option value="310100">上海</option>
<option value="330100">杭州</option> <option value="330100">杭州</option>
</select> </select>
<select class="form-control btn5" id="user_area_add"> <select class="form-control btn5" id="user_area_add">
<option value="" selected="selected">请选择区域</option> <option value="" selected="selected">请选择区域</option>
...@@ -1207,8 +1207,8 @@ ...@@ -1207,8 +1207,8 @@
<span class="fore-span ld-Marheight">客户所属城市:</span> <span class="fore-span ld-Marheight">客户所属城市:</span>
<select class="form-control btn4 ld-Marheight" id="user_city_edit"> <select class="form-control btn4 ld-Marheight" id="user_city_edit">
<option value="" selected="selected">请选择城市</option> <option value="" selected="selected">请选择城市</option>
<option value="310100">上海</option> <option value="310100">上海</option>
<option value="330100">杭州</option> <option value="330100">杭州</option>
</select> </select>
<select class="form-control btn4 ld-Marheight" id="user_area_edit"> <select class="form-control btn4 ld-Marheight" id="user_area_edit">
<option value="" selected="selected">请选择区域</option> <option value="" selected="selected">请选择区域</option>
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<td colspan="11"> <td colspan="11">
<form id="maintable_form_search"> <form id="maintable_form_search">
<!--<span class="btn btn-primary btn3 left" id="maintable_month">本月</span>--> <!--<span class="btn btn-primary btn3 left" id="maintable_month">本月</span>-->
<span class="btn btn-primary btn3 left" id="maintable_today">今天</span> <!--<span class="btn btn-primary btn3 left" id="maintable_today">今天</span>-->
<span class="fore-span margin-left-10">时间:</span> <span class="fore-span margin-left-10">时间:</span>
<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_create_time" name="start_date" type="date"> <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 margin-left-10">-</span> <span class="fore-span margin-left-10">-</span>
......
...@@ -131,7 +131,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css' ...@@ -131,7 +131,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
if(_id && _id != '0') { if(_id && _id != '0') {
user.getCityAreaList(_id, function(_data) { user.getCityAreaList(_id, function(_data) {
// var _str = ''; // var _str = '';
var _str = '<option value="0">全部</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>';
}); });
...@@ -307,7 +307,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css' ...@@ -307,7 +307,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
}); });
}, },
addphone: function(obj) {//新增客户 input赋值 addphone: function(obj) {//新增客户 input赋值
var user_ht = $(obj).html(); var user_ht = $(obj).html();
$("#set_father_id3").val(user_ht); $("#set_father_id3").val(user_ht);
$(".user-ul").html(''); $(".user-ul").html('');
...@@ -723,7 +723,13 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css' ...@@ -723,7 +723,13 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
params.remark_phone = $.trim($("#remark_phone").val()); params.remark_phone = $.trim($("#remark_phone").val());
params.remark_store_id = $.trim($("#guest_stores").val()); params.remark_store_id = $.trim($("#guest_stores").val());
params.remark_district_id = $.trim($("#district_id").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.disc = $.trim($("#user_area_choose").val());//区域
_startDateObj.val() != '' && (params.start_date = _startDateObj.val()); _startDateObj.val() != '' && (params.start_date = _startDateObj.val());
_endDateObj.val() != '' && (params.end_date = _endDateObj.val()); _endDateObj.val() != '' && (params.end_date = _endDateObj.val());
$.trim(_customerNameObj.val()) != '' && (params.customer = $.trim(_customerNameObj.val())); $.trim(_customerNameObj.val()) != '' && (params.customer = $.trim(_customerNameObj.val()));
......
...@@ -139,7 +139,7 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css' ...@@ -139,7 +139,7 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css'
_objTemp.html(''); //先清空 _objTemp.html(''); //先清空
if(_id && _id != '0') { if(_id && _id != '0') {
house.getCityAreaList(_id, function(_data) { house.getCityAreaList(_id, function(_data) {
var _str = '<option value="0">全部</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>';
}); });
...@@ -195,6 +195,13 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css' ...@@ -195,6 +195,13 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css'
params.pageNo = house.pageNo; params.pageNo = house.pageNo;
params.pageSize = house.pageSize; params.pageSize = house.pageSize;
params.AuthToken = user_info_obj.AuthToken; params.AuthToken = user_info_obj.AuthToken;
if($('#shop_city_id').val() == 310100){
params.city = '上海市' ;
}
if($('#shop_city_id').val() == 330100){
params.city = '杭州市' ;
}
params.disc = $('#shop_area_id').val(); //区域筛选
if( !(params.end_time&&params.start_time)){ if( !(params.end_time&&params.start_time)){
alert('请选择时间') alert('请选择时间')
return; return;
......
...@@ -125,7 +125,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -125,7 +125,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
if(_id && _id != '0') { if(_id && _id != '0') {
business.getDistrictStoreList(_id, function(_data) { business.getDistrictStoreList(_id, function(_data) {
// var _str = ''; // var _str = '';
var _str = '<option value="0">全部</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>';
}); });
...@@ -708,10 +708,10 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -708,10 +708,10 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
params.external_title = $('#internal_title_open').val(); //对外商铺名称 params.external_title = $('#internal_title_open').val(); //对外商铺名称
params.area = $('#area_id').val(); //面积筛选 params.area = $('#area_id').val(); //面积筛选
if($('#shop_city_id').val() == 310100){ if($('#shop_city_id').val() == 310100){
params.city = '上海' ; params.city = '上海' ;
} }
if($('#shop_city_id').val() == 330100){ if($('#shop_city_id').val() == 330100){
params.city = '杭州' ; params.city = '杭州' ;
} }
params.disc = $('#shop_area_id').val(); //区域筛选 params.disc = $('#shop_area_id').val(); //区域筛选
params.industry_type = $('#yetai_id').val(); //业态筛选 params.industry_type = $('#yetai_id').val(); //业态筛选
......
...@@ -124,7 +124,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'css!style/h ...@@ -124,7 +124,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'css!style/h
'pageSize': realtime.pageSize, 'pageSize': realtime.pageSize,
'start_day':$('#maintable_create_time').val(), 'start_day':$('#maintable_create_time').val(),
'end_day':$('#maintable_end_time').val(), 'end_day':$('#maintable_end_time').val(),
'is_today':realtime.is_today_yeji, // 'is_today':realtime.is_today_yeji,
}; };
$.ajax({ $.ajax({
......
...@@ -84,7 +84,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -84,7 +84,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
if(_id && _id != '0') { if(_id && _id != '0') {
user.getCityAreaList(_id, function(_data) { user.getCityAreaList(_id, function(_data) {
// var _str = ''; // var _str = '';
var _str = '<option value="0">全部</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>';
}); });
...@@ -813,6 +813,14 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -813,6 +813,14 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
params.industry_type = $.trim($("select[name=industry_type]").val()); params.industry_type = $.trim($("select[name=industry_type]").val());
params.first_login_start = $.trim($("#first_login_start").val()); params.first_login_start = $.trim($("#first_login_start").val());
params.first_login_end = $.trim($("#first_login_end").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());//区域
//客方和邀请人搜索项不能并列 //客方和邀请人搜索项不能并列
$.ajax({ $.ajax({
...@@ -870,10 +878,10 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -870,10 +878,10 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
params.vip = $("#user_vip").val(); params.vip = $("#user_vip").val();
params.type = 'add'; params.type = 'add';
if($('#user_city_add').val() == 310100){ if($('#user_city_add').val() == 310100){
params.city = '上海' ; params.city = '上海' ;
} }
if($('#user_city_add').val() == 330100){ if($('#user_city_add').val() == 330100){
params.city = '杭州' ; params.city = '杭州' ;
} }
params.disc = $("#user_area_add").val(); params.disc = $("#user_area_add").val();
params.source = $("#user_label_add").val(); params.source = $("#user_label_add").val();
......
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