Skip to content

T
tl_estate
Commit b5e81bc3 authored by clone's avatar clone
Browse files
Options

Merge branch 'test-0806-bug' of https://gitee.com/zwyjjc/tl_estate into test-0806-bug

parents 37a0c07a 48182783
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 15 deletions
public/resource/js/commission.js
View file @ b5e81bc3
define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportLis_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax) { define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
bargain = { bargain = {
pageNo: 1, pageNo: 1,
/*第几页*/ /*第几页*/
...@@ -13,7 +13,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportLis_te ...@@ -13,7 +13,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportLis_te
maidTotalCommission: 0,//应收总佣金 maidTotalCommission: 0,//应收总佣金
init: function() { init: function() {
//初始化dot //初始化dot
$(document.body).append(template + template_tax); $(document.body).append(template + template_tax + template_maid + template_maid_sub1);
bargain.getList(1); bargain.getList(1);
bargain.event(); bargain.event();
}, },
......
public/resource/js/tax.js
View file @ b5e81bc3
define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax) { define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
bargain = { bargain = {
pageNo: 1, pageNo: 1,
/*第几页*/ /*第几页*/
...@@ -13,7 +13,7 @@ define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_template_ ...@@ -13,7 +13,7 @@ define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_template_
maidTotalCommission: 0,//应收总佣金 maidTotalCommission: 0,//应收总佣金
init: function() { init: function() {
//初始化dot //初始化dot
$(document.body).append(template + template_tax); $(document.body).append(template + template_tax + template_maid + template_maid_sub1);
bargain.getList(1); bargain.getList(1);
bargain.event(); bargain.event();
}, },
......
public/resource/js/user.js
View file @ b5e81bc3
...@@ -6,10 +6,12 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -6,10 +6,12 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
pageSize: 15, pageSize: 15,
/*每页显示多少条*/ /*每页显示多少条*/
user_id: 0, user_id: 0,
user_type: '',
user_phone:'', user_phone:'',
urls: '', urls: '',
agent_id_two: '', agent_id_two: '',
agent_id2: 0, agent_id2: 0,
agent_id_infor: 0,
isAjaxSaving: false, isAjaxSaving: false,
init: function() { init: function() {
//初始化dot //初始化dot
...@@ -74,6 +76,18 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -74,6 +76,18 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
_doc.on('click', '#look_shop_date', function() { _doc.on('click', '#look_shop_date', function() {
$('.datetimepicker').show(); $('.datetimepicker').show();
}); });
//上一页 获取客户详情
_doc.on('click', '#user_up', function() {
user_type='last';
user.getInfor();
});
//下一页 获取客户详情
_doc.on('click', '#user_down', function() {
user_type='next';
user.getInfor();
});
// _doc.on('click', '.take-look', function(e) {//点击约带看 获取 客户姓名 编号 电话 // _doc.on('click', '.take-look', function(e) {//点击约带看 获取 客户姓名 编号 电话
// e.preventDefault(); // e.preventDefault();
// e.stopPropagation(); // e.stopPropagation();
...@@ -171,7 +185,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -171,7 +185,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
$(document).delegate(".caozuo", "click", function() { //点击操作跟进详情 $(document).delegate(".caozuo", "click", function() { //点击操作跟进详情
user.user_id = $(this).attr("data-id"); user.user_id = $(this).attr("data-id");
user.user_phone = $(this).attr("data-phone"); user.user_phone = $(this).attr("data-phone");
user.agent_id_infor = $(this).attr("data-agentId");
$('#take_look_name').html($(this).attr("data-name")); $('#take_look_name').html($(this).attr("data-name"));
$('#take_look_phone').html($(this).attr("data-phone")); $('#take_look_phone').html($(this).attr("data-phone"));
$('#take_look_id').html($(this).attr("data-id")); $('#take_look_id').html($(this).attr("data-id"));
...@@ -892,6 +906,23 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -892,6 +906,23 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
} }
}); });
}, },
getInfor: function(params) {
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
$.ajax({
url: 'broker/getLastOrNextUserID',//上一页 下一页 调用接口
type: 'GET',
async: true,
data: {
"user_id": user.user_id,
"agent_id": user_info_obj.id,
"type":user_type
},
dataType: 'json',
success: function(data) {
}
});
},
getGenjinLabel: function() { getGenjinLabel: function() {
$('#genj_text').val(''); $('#genj_text').val('');
$.ajax({ $.ajax({
......
public/resource/template/performance_subsidiary_template_tpl.html
View file @ b5e81bc3
...@@ -8,8 +8,6 @@ ...@@ -8,8 +8,6 @@
<td>[%= it[item]['internal_address'] %]</td> <td>[%= it[item]['internal_address'] %]</td>
<td>[%= it[item]['house_number'] %]</td> <td>[%= it[item]['house_number'] %]</td>
<td>[%= it[item]['fee'] %]</td> <td>[%= it[item]['fee'] %]</td>
<td> <td>
<a class="btn1 btn-success details-btn" href="#modal_detail" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a> <a class="btn1 btn-success details-btn" href="#modal_detail" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a> <a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>
......
public/resource/template/reportList_no_edit_template_tpl.html
View file @ b5e81bc3
...@@ -72,9 +72,9 @@ ...@@ -72,9 +72,9 @@
</table> </table>
</div> </div>
<div> <div>
<a class="btn btn-default" href="#modal_new_tax" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">编辑</a> <!--<a class="btn btn-default" href="#modal_new_tax" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">编辑</a>-->
<br /><br /> <br /><br />
<a class="btn btn-danger detail-modal-shuiFee-del-btn" href="javascript:;" data-recordid="[%= it[item]['id'] %]">删除</a> <!--<a class="btn btn-danger detail-modal-shuiFee-del-btn" href="javascript:;" data-recordid="[%= it[item]['id'] %]">删除</a>-->
</div> </div>
</section> </section>
[% } %] [% } %]
...@@ -116,15 +116,14 @@ ...@@ -116,15 +116,14 @@
</div> </div>
[% } %] [% } %]
</td> </td>
<!--不能操作--> <td>
<!--<td> <!--[% if(check_auth('index/getBargainCommission')) { %]
[% if(check_auth('index/getBargainCommission')) { %]
<a href="#modal_new_maid" class="btn-success detail-modal-maid-a-edit" data-toggle="modal">编辑</a> <a href="#modal_new_maid" class="btn-success detail-modal-maid-a-edit" data-toggle="modal">编辑</a>
[% } %] [% } %]
[% if(check_auth('index/delPartialCommission') && (it['data'][i]['father_id'] != 0)) { %] [% if(check_auth('index/delPartialCommission') && (it['data'][i]['father_id'] != 0)) { %]
<a href="javascript:;" class="btn-danger detail-modal-maid-a-del">删除</a> <a href="javascript:;" class="btn-danger detail-modal-maid-a-del">删除</a>
[% } %] [% } %]-->
</td>--> </td>
</tr> </tr>
[% } %] [% } %]
[% }else{ %] [% }else{ %]
......
public/resource/template/user_template_tpl.html
View file @ b5e81bc3
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<td width="16%"> <td width="16%">
[% if((check_auth('auth_vip') && it[item]['vip']) || (it[item]['agent_id'] == 0) || (it[item]['agent_id'] == it[item]['current_agent_id']) || check_auth('index/useraction_search') ) { %] [% if((check_auth('auth_vip') && it[item]['vip']) || (it[item]['agent_id'] == 0) || (it[item]['agent_id'] == it[item]['current_agent_id']) || check_auth('index/useraction_search') ) { %]
<a class="btn1 caozuo genj_ure caozuo-add-color [%= getLoaclId(it[item]['id']) %]" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]' data-name='[%= it[item]["user_name"] %]'>详情/跟进</a>&nbsp; <a class="btn1 caozuo genj_ure caozuo-add-color [%= getLoaclId(it[item]['id']) %]" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]' data-agentId='[%= it[item]["agent_id"] %]' data-name='[%= it[item]["user_name"] %]'>详情/跟进</a>&nbsp;
<a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>&nbsp; <a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>&nbsp;
......
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