Skip to content

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

1

parent 266e99e4
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 16 deletions
application/index/view/finance/getCollection.html
View file @ fc2e4a7c
...@@ -1122,6 +1122,7 @@ ...@@ -1122,6 +1122,7 @@
</div> </div>
<div class="modal-body modal-body-height"> <div class="modal-body modal-body-height">
<div class="col-xs-12"> <div class="col-xs-12">
<p>调整入账</p>
<table class="table table-striped table-bordered table-hover table-condensed"> <table class="table table-striped table-bordered table-hover table-condensed">
<thead> <thead>
<tr> <tr>
...@@ -1131,7 +1132,7 @@ ...@@ -1131,7 +1132,7 @@
<th class="text-center">成交报告ID</th> <th class="text-center">成交报告ID</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>
...@@ -1141,6 +1142,7 @@ ...@@ -1141,6 +1142,7 @@
</thead> </thead>
<tbody class="text-center" id="statusBody1"> <tbody class="text-center" id="statusBody1">
</table> </table>
<p>调整出账</p>
<table class="table table-striped table-bordered table-hover table-condensed"> <table class="table table-striped table-bordered table-hover table-condensed">
<thead> <thead>
<tr> <tr>
...@@ -1159,6 +1161,7 @@ ...@@ -1159,6 +1161,7 @@
</thead> </thead>
<tbody class="text-center" id="statusBody2"> <tbody class="text-center" id="statusBody2">
</table> </table>
<p>退款出账</p>
<table class="table table-striped table-bordered table-hover table-condensed"> <table class="table table-striped table-bordered table-hover table-condensed">
<thead> <thead>
<tr> <tr>
...@@ -1171,7 +1174,7 @@ ...@@ -1171,7 +1174,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">商铺ID</th>
<th class="text-center">商铺地址</th> <th class="text-center">商铺地址</th>
</tr> </tr>
</thead> </thead>
......
application/index/view/member/user_genjing_modal.html
View file @ fc2e4a7c
...@@ -785,9 +785,9 @@ ...@@ -785,9 +785,9 @@
<table class="table table-striped table-bordered table-hover table-condensed"> <table class="table table-striped table-bordered table-hover table-condensed">
<thead> <thead>
<tr> <tr>
<th class="text-center">编辑内容</th> <th class="text-center">浏览时间</th>
<th class="text-center">编辑人</th> <th class="text-center">浏览的商铺ID</th>
<th class="text-center">编辑时间</th> <th class="text-center">浏览的商铺名称</th>
</tr> </tr>
</thead> </thead>
<tbody id='watchShopLog'> <tbody id='watchShopLog'>
......
public/resource/js/getCollection.js
View file @ fc2e4a7c
...@@ -1260,6 +1260,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -1260,6 +1260,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
var commit_home = $('#commit_home').val(""); var commit_home = $('#commit_home').val("");
var commit_shop = $('#commit_shop').val(""); var commit_shop = $('#commit_shop').val("");
var comit_name = $('#comit_name').val(""); var comit_name = $('#comit_name').val("");
var is_open = $('#is_open').val("-1");
var is_normality = $('#is_normality').val("0");
}, },
//收款记录 导出 //收款记录 导出
......
public/resource/js/user_genjing_modal.js
View file @ fc2e4a7c
...@@ -1183,8 +1183,8 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c ...@@ -1183,8 +1183,8 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
~data.data.user_info['site_ids'].indexOf(item.getAttribute('data-id')) && (item.checked = 'checked'); ~data.data.user_info['site_ids'].indexOf(item.getAttribute('data-id')) && (item.checked = 'checked');
}); });
$('.shangpu_tags_area_detail').show(); $('.shangpu_tags_area_detail').show();
var site_detail= data.data.user_info.site_name.join(','); // var site_detail= data.data.site_ids_name.join(',');
$('.shangpu_tags_area_detail2').html(site_detail); $('.shangpu_tags_area_detail2').html(data.data.site_ids_name);
var sw=function(s){ var sw=function(s){
switch(Number(s)) switch(Number(s))
{ case 0:return""; { case 0:return"";
...@@ -1223,7 +1223,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c ...@@ -1223,7 +1223,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
$("#user_label_edit").val(2); $("#user_label_edit").val(2);
} }
$(".user-details-introduce-id").html(data.data.user_inviter_phone+'-'+data.data.user_inviter_id); //转介绍详情 $(".user-details-introduce-id").html(data.data.user_info.referrer_user+'-'+data.data.user_info.referrer_id); //转介绍详情
$("#introduce_edit_user").val(data.data.user_info.referrer_user); //转介绍编辑 $("#introduce_edit_user").val(data.data.user_info.referrer_user); //转介绍编辑
if(data.data.referrer_source == 10){ if(data.data.referrer_source == 10){
...@@ -1233,7 +1233,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c ...@@ -1233,7 +1233,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
} }
//客方修改记录 //客方修改记录
var caozuo_table = ""; var caozuo_table = "";
$.each(data['data']['user_history'], function(i, item) { $.each(data['data']['user_history_log']['user_history'], function(i, item) {
caozuo_table += '<tr><td>' + item.remark + '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>'; caozuo_table += '<tr><td>' + item.remark + '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';
}); });
if(caozuo_table){ if(caozuo_table){
...@@ -1243,7 +1243,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c ...@@ -1243,7 +1243,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
}; };
//邀请人修改记录 //邀请人修改记录
var caozuo_table_introduce = ""; var caozuo_table_introduce = "";
$.each(data['data']['user_invite_history'], function(i, item) { $.each(data['data']['user_history_log']['user_invite_history'], function(i, item) {
caozuo_table_introduce += '<tr><td>' + item.remark + '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>'; caozuo_table_introduce += '<tr><td>' + item.remark + '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';
}); });
if(caozuo_table_introduce){ if(caozuo_table_introduce){
...@@ -1332,7 +1332,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c ...@@ -1332,7 +1332,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
if(data.code == 200) { if(data.code == 200) {
var temp = document.getElementById('watch_shop_log_list').innerHTML; var temp = document.getElementById('watch_shop_log_list').innerHTML;
var doTtmpl = doT.template(temp); var doTtmpl = doT.template(temp);
$("#watchShopLog").html(doTtmpl(data.data.data)); $("#watchShopLog").html(doTtmpl(data.data.list));
} else { } else {
} }
......
public/resource/template/receivables_template_tpl.html
View file @ fc2e4a7c
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
<td>[%= it[item]['bargain_id'] %]</td> <td>[%= it[item]['bargain_id'] %]</td>
<td>[%= it[item]['income_time'] %]</td> <td>[%= it[item]['income_time'] %]</td>
<td>[%= it[item]['name'] %]</td> <td>[%= it[item]['name'] %]</td>
<td>[%= it[item]['current_agent_name'] %]</td>
<td>[%= it[item]['store_name'] %]</td> <td>[%= it[item]['store_name'] %]</td>
<td>[%= it[item]['type'] %]</td> <td>[%= it[item]['type'] %]</td>
<td>[%= it[item]['money'] %]</td> <td>[%= it[item]['money'] %]</td>
...@@ -187,7 +186,7 @@ ...@@ -187,7 +186,7 @@
[% } %] [% } %]
<td>[%= it[item]['agent_name'] %]</td> <td>[%= it[item]['agent_name'] %]</td>
<!--<td>[%= it[item]['store_name'] %]</td>--> <!--<td>[%= it[item]['store_name'] %]</td>-->
<!--<td>[%= it[item]['house_id'] %]</td>--> <td>[%= it[item]['house_id'] %]</td>
<td>[%= it[item]['address'] %]</td> <td>[%= it[item]['address'] %]</td>
</tr> </tr>
[% } %] [% } %]
......
public/resource/template/user_model_template_tpl.html
View file @ fc2e4a7c
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
[% if(it&&it.length) { %] [% if(it&&it.length) { %]
[% for(var item in it){ %] [% for(var item in it){ %]
<tr class="text-center"> <tr class="text-center">
<td>[%= it[item]["remark"] %]</td> <td>[%= it[item]["create_time"] %]</td>
<td>[%= it[item]["name"] %]</td> <td>[%= it[item]["house_id"] %]</td>
<td>[%= it[item]["create_time"] %]</td> <td>[%= it[item]["internal_title"] %]</td>
</tr> </tr>
[% } %] [% } %]
[% }else{ %] [% }else{ %]
......
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