Skip to content

T
tl_estate
Commit 17b1e272 authored by zw's avatar zw
Browse files
Options

Merge remote-tracking branch 'origin/1210-v3.0.2' into 1210-v3.0.2

parents 25a857a4 5b565677
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 10 deletions
public/app/js/timeline_pc.js
View file @ 17b1e272
...@@ -105,6 +105,10 @@ require(['vue', 'css!style/timeline_pc.css', 'jquery0325', 'common'],function(Vu ...@@ -105,6 +105,10 @@ require(['vue', 'css!style/timeline_pc.css', 'jquery0325', 'common'],function(Vu
return '其他'; return '其他';
case '90' : case '90' :
return '佣金'; return '佣金';
case '91' :
return '中介费';
case '92' :
return '案场费';
default: default:
return '未定义'; return '未定义';
} }
......
public/resource/js/getCollection.js
View file @ 17b1e272
...@@ -361,15 +361,18 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -361,15 +361,18 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
//将li里的值 赋给input（分佣方姓名） //将li里的值 赋给input（分佣方姓名）
intoIdBuild: function(obj) {//新增客户 input赋值 intoIdBuild: function(obj) {//新增客户 input赋值
var that = receiv ; var that = receiv ;
that.intoId_a = $(obj).attr("data-id");
$("#into_id_change").val($(obj).attr("data-id")); $("#into_id_change").val($(obj).attr("data-id"));
$(".intoIdArea").html(''); $(".intoIdArea").html('');
$('.intoIdArea').hide(); $('.intoIdArea').hide();
$('#shop_addr_change').text($(obj).attr("data-addr")); $('#shop_addr_change').text($(obj).attr("data-addr"));
// $('#into_id_change').text($(obj).attr("data-order_id"));
$('#shop_id_change_shop').text($(obj).attr("data-house_number")); $('#shop_id_change_shop').text($(obj).attr("data-house_number"));
$('#shop_id_change').text($(obj).attr("data-house_number")); $('#shop_id_change').text($(obj).attr("data-house_number"));
that.houseNmuber = $(obj).attr("data-house_number"); that.houseNmuber = $(obj).attr("data-house_number");
that.order_id = $(obj).attr("data-id") ;
that.order_no = $(obj).attr("data-order_no") ;
that.report_id = $(obj).attr("data-report_id");
that.agent_id = $(obj).attr("data-agent_id");
that.agent_name = $(obj).attr("data-agent_name");
}, },
//将li里的值 赋给input（分佣方姓名） //将li里的值 赋给input（分佣方姓名）
...@@ -380,7 +383,6 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -380,7 +383,6 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
$(".reportArea").html(''); $(".reportArea").html('');
$('.reportArea').hide(); $('.reportArea').hide();
$('#shop_addr_change').text($(obj).attr("data-addr")); $('#shop_addr_change').text($(obj).attr("data-addr"));
// $('#into_id_change').text($(obj).attr("data-order_id"));
$('#shop_id_change_shop').text($(obj).attr("data-house_number")); $('#shop_id_change_shop').text($(obj).attr("data-house_number"));
$('#shop_id_change').text($(obj).attr("data-house_id")); $('#shop_id_change').text($(obj).attr("data-house_id"));
that.houseNmuber = $(obj).attr("data-house_number"); that.houseNmuber = $(obj).attr("data-house_number");
...@@ -391,6 +393,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -391,6 +393,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
that.order_no = $(obj).attr("data-order_no") ; that.order_no = $(obj).attr("data-order_no") ;
that.report_id = $(obj).attr("data-report_id"); that.report_id = $(obj).attr("data-report_id");
that.agent_id = $(obj).attr("data-agent_id"); that.agent_id = $(obj).attr("data-agent_id");
that.agent_name = $(obj).attr("data-agent_name");
}, },
search_phone : function(){ search_phone : function(){
...@@ -450,7 +453,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -450,7 +453,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
if(data.code == 200) { if(data.code == 200) {
var user_ul = ""; var user_ul = "";
$.each(data.data, function(i, item) { $.each(data.data, function(i, item) {
user_ul += '<li class="intoIdBuild" data-house_number="'+item.house_id+'"data-order_id="'+item.order_id+'" data-addr="'+item.house_address+'" data-id="' + item.id + '">' + item.house_address + ',商铺ID：+' + item.house_id + '，带看ID' + item.id+'</li>'; user_ul += '<li class="intoIdBuild" data-house_number="'+item.house_id+'"data-order_id="'+item.order_id+'" data-addr="'+item.house_address+'" data-id="' + item.id
+'" data-agent_id="' + item.report_agent_id +'" data-agent_name="' + item.report_agent_name +'" data-order_no="' + item.order_no
+ '">' + item.house_address + ',商铺ID：+' + item.house_id + '，带看ID' + item.id+'</li>';
}); });
$('.intoIdArea').show(); $('.intoIdArea').show();
$(".intoIdArea").html(user_ul); $(".intoIdArea").html(user_ul);
...@@ -582,7 +587,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -582,7 +587,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
'order_id' : that.order_id , 'order_id' : that.order_id ,
'order_no' : that.order_no, 'order_no' : that.order_no,
'agent_id' : that.agent_id, 'agent_id' : that.agent_id,
'report_id' : that.report_id_a ? that.report_id_a : that.report_id, 'report_id' : that.report_id,
'industry_type' : that.yetai, 'industry_type' : that.yetai,
'income_time' : that.income_time 'income_time' : that.income_time
}; };
......
public/resource/template/financial_manager_daily_list_template_tpl.html
View file @ 17b1e272
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<td>[%= it[item]['money']%]</td> <td>[%= it[item]['money']%]</td>
<td>[%= (it[item]['money']*1 - (it[item]['price']*0.8)).toFixed(2) %]</td> <td>[%= (it[item]['money']*1 - (it[item]['price']*0.8)).toFixed(2) %]</td>
<td>[%= sw(it[item]['pay_type'])%]</td> <td>[%= sw(it[item]['pay_type'])%]</td>
<td>[%= it[item]['transfer_name'] %]</td> <td>[% if(it[item]["transfer_name"] != null) { %] [%= it[item]["transfer_name"] %] [% } %]</td>
<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>[%= swopen(it[item]['is_open']) %]</td> <td>[%= swopen(it[item]['is_open']) %]</td>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<td>[%= it[item]['price']%]</td> <td>[%= it[item]['price']%]</td>
<td>[%= it[item]['money']%]</td> <td>[%= it[item]['money']%]</td>
<td>[%= sw(it[item]['pay_type']) %]</td> <td>[%= sw(it[item]['pay_type']) %]</td>
<td>[%= it[item]['transfer_name'] %]</td> <td>[% if(it[item]["transfer_name"] != null) { %] [%= it[item]["transfer_name"] %] [% } %]</td>
<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>[%= swopen(it[item]['is_open']) %]</td> <td>[%= swopen(it[item]['is_open']) %]</td>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<td>[%= it[item]['house_address']%]</td> <td>[%= it[item]['house_address']%]</td>
<td>[%= it[item]['money'] %]</td> <td>[%= it[item]['money'] %]</td>
<td>[%= sw(it[item]['pay_type']) %]</td> <td>[%= sw(it[item]['pay_type']) %]</td>
<td>[%= it[item]['transfer_name'] %]</td> <td>[% if(it[item]["transfer_name"] != null) { %] [%= it[item]["transfer_name"] %] [% } %]</td>
<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]['receipt_number'] %]</td> <td>[%= it[item]['receipt_number'] %]</td>
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<td>[%= it[item]['house_address'] %]</td> <td>[%= it[item]['house_address'] %]</td>
<td>[%= it[item]['money']%]</td> <td>[%= it[item]['money']%]</td>
<td>[%= sw(it[item]['pay_type']) %]</td> <td>[%= sw(it[item]['pay_type']) %]</td>
<td>[%= it[item]['transfer_name'] %]</td> <td>[% if(it[item]["transfer_name"] != null) { %] [%= it[item]["transfer_name"] %] [% } %]</td>
<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]['receipt_number'] %]</td> <td>[%= it[item]['receipt_number'] %]</td>
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<td>[%= it[item]['house_address'] %]</td> <td>[%= it[item]['house_address'] %]</td>
<td>[%= swtype(it[item]['type'])%]</td> <td>[%= swtype(it[item]['type'])%]</td>
<td>[%= it[item]['create_time'] %]</td> <td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['receipt_number'] %]</td> <td>[% if(it[item]["receipt_number"] != null) { %] [%= it[item]["receipt_number"] %] [% } %]</td>
<td>[%= it[item]['money'] %]</td> <td>[%= it[item]['money'] %]</td>
<td> <td>
<a class="btn1 btn-info record-pic" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a> <a class="btn1 btn-info record-pic" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a>
......
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