Skip to content

T
tl_estate
Commit 1d0db78d authored by zw's avatar zw
Browse files
Options

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

parents 54c43d50 922788c9
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 16 deletions
application/index/view/finance/getCollection.html
View file @ 1d0db78d
...@@ -437,7 +437,6 @@ ...@@ -437,7 +437,6 @@
<div class="col-xs-12"> <div class="col-xs-12">
<span>该笔收款可调整/退款金额：<strong><span id="could_price">1000</span></strong>元</span> <span>该笔收款可调整/退款金额：<strong><span id="could_price">1000</span></strong>元</span>
</div> </div>
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">调整为:</span></strong> <strong><span class="col-xs-4 ld-Marheight">调整为:</span></strong>
......
public/resource/js/financial_daily_list.js
View file @ 1d0db78d
...@@ -32,6 +32,7 @@ define(['doT', 'text!temp/financial_daily_list_template_tpl.html', 'css!style/ho ...@@ -32,6 +32,7 @@ define(['doT', 'text!temp/financial_daily_list_template_tpl.html', 'css!style/ho
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
localStorage.setItem('financial_check_string_liu',$(this).attr("data-store")); localStorage.setItem('financial_check_string_liu',$(this).attr("data-store"));
location.href=href='/index/dailyDetails?time=' + $(this).attr("data-storeTime")+"&storeId="+$(this).attr("data-storeId");
}); });
//搜索按钮的事件 //搜索按钮的事件
......
public/resource/js/financial_manager_daily_list.js
View file @ 1d0db78d
...@@ -15,6 +15,7 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css! ...@@ -15,6 +15,7 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
isFinancial: 0, //收款id isFinancial: 0, //收款id
operationStatus:0, operationStatus:0,
daily_id:0,//日报id daily_id:0,//日报id
store_id:'',//日报id
init: function() { init: function() {
//初始化时间 //初始化时间
var myDate = new Date(); var myDate = new Date();
...@@ -34,6 +35,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css! ...@@ -34,6 +35,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
bargain.financialTime = getUrlParam('time'); bargain.financialTime = getUrlParam('time');
var managerTitle=localStorage.getItem('financial_check_string_liu') +' '+ bargain.financialTime; var managerTitle=localStorage.getItem('financial_check_string_liu') +' '+ bargain.financialTime;
$('.manager-title').html(managerTitle); $('.manager-title').html(managerTitle);
bargain.store_id = getUrlParam('storeId');
}else{ }else{
$('.is-submit-passed').hide(); $('.is-submit-passed').hide();
$('.is-submit-pass-btn').hide(); $('.is-submit-pass-btn').hide();
...@@ -44,6 +47,7 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css! ...@@ -44,6 +47,7 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
}else{ }else{
$('.manager-title').html('您还不是店长'); $('.manager-title').html('您还不是店长');
} }
bargain.store_id = user_info_obj.store_id;
} }
...@@ -164,8 +168,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css! ...@@ -164,8 +168,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
getList: function(pageNo){ getList: function(pageNo){
console.count('bar'); console.count('bar');
var params = { var params = {
'AuthToken':user_info_obj.AuthToken, 'AuthToken': user_info_obj.AuthToken,
'store_id': user_info_obj.store_id, 'store_id': bargain.store_id,
'is_store': bargain.isFinancial, 'is_store': bargain.isFinancial,
'daily_data': bargain.financialTime 'daily_data': bargain.financialTime
// 'store_id': 730, // 'store_id': 730,
......
public/resource/js/getCollection.js
View file @ 1d0db78d
...@@ -166,12 +166,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -166,12 +166,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
var type = e.target.dataset.type ; var type = e.target.dataset.type ;
var order_id = e.target.dataset.order_id ; var order_id = e.target.dataset.order_id ;
that.type_num = e.target.dataset.type_num that.type_num = e.target.dataset.type_num
that.order_id = order_id ; // that.order_id = order_id ;
that.order_no = e.target.dataset.order_no ; // that.order_no = e.target.dataset.order_no ;
that.report_id = e.target.dataset.report_id; // that.report_id = e.target.dataset.report_id;
that.agent_id = e.target.dataset.agent_id; // that.agent_id = e.target.dataset.agent_id;
that.pay_type = e.target.dataset.pay_type; that.pay_type = e.target.dataset.pay_type;
that.income_time = e.target.dataset.income_time that.income_time = e.target.dataset.income_time;
that.getAllPrice(id); that.getAllPrice(id);
if ( type == "意向金" ){ if ( type == "意向金" ){
$('#change_type').val(91); $('#change_type').val(91);
...@@ -385,7 +385,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -385,7 +385,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
$('#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");
$('#into_id_change').attr("readonly","readonly"); $('#into_id_change').attr("readonly","readonly");
$('#into_id_change').val($(obj).attr("data-order_id")) $('#into_id_change').val($(obj).attr("data-order_id"));
$('#order_id_report').val($(obj).attr("data-order_id"));
that.order_id = $(obj).attr("data-order_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");
}, },
search_phone : function(){ search_phone : function(){
...@@ -410,7 +415,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -410,7 +415,10 @@ 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.result, function(i, item) { $.each(data.data.result, function(i, item) {
user_ul += '<li class="reportIdBuild" data-house_id="'+item.house_id+'" data-house_number="'+item.house_number+'"data-order_id="'+item.order_id+'" data-addr="'+item.internal_address+'" data-id="' + item.id + '">' + item.internal_address + ',商铺ID：' + item.house_id + '，成交报告ID' + item.id + '，成交价：' + item.price + '，佣金'+ item.commission +'</li>'; user_ul += '<li class="reportIdBuild" data-house_id="'+item.house_id+'" data-house_number="'+item.house_number+'"data-order_id="'+item.order_id
+'" data-agent_id="' + item.agent_id +'" data-order_no="' + item.order_no +'" data-agent_id="' + item.agent_id +'" data-agent_id="' + item.agent_id+'" data-report_id="'+item.report_id
+'" data-addr="'+item.internal_address+'" data-id="' + item.id + '">'
+ item.internal_address + ',商铺ID：' + item.house_id + '，成交报告ID' + item.id + '，成交价：' + item.price + '，佣金'+ item.commission +'</li>';
}); });
$('.reportArea').show(); $('.reportArea').show();
$(".reportArea").html(user_ul); $(".reportArea").html(user_ul);
......
public/resource/template/financial_daily_list_template_tpl.html
View file @ 1d0db78d
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<td>[%= it[item]['store_name'] %]</td> <td>[%= it[item]['store_name'] %]</td>
<td> <td>
[% if(it[item]['status'] == 0) { %] [% if(it[item]['status'] == 0) { %]
<a class="btn1 btn-info financial-check" href="/index/dailyDetails?time=[%= it[item]['daily_date'] %]" data-recordid="[%= it[item]['id'] %]" data-store="[%= it[item]['store_name'] %]" data-toggle="modal">审核</a> <a class="btn1 btn-info financial-check" data-recordid="[%= it[item]['id'] %]" data-store="[%= it[item]['store_name'] %]" data-storeId="[%= it[item]['store_id'] %]" data-storeTime="[%= it[item]['daily_date'] %]" data-toggle="modal">审核</a>
[% } %] [% } %]
</td> </td>
</tr> </tr>
......
public/resource/template/receivables_template_tpl.html
View file @ 1d0db78d
...@@ -30,11 +30,8 @@ ...@@ -30,11 +30,8 @@
<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a> <a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
<a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收款详情</a> <a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收款详情</a>
[% if( it[item]['type_num'] == 10 || it[item]['type_num'] == 30 ) { %] [% if( it[item]['type_num'] == 10 || it[item]['type_num'] == 30 ) { %]
<a class="btn1 btn-success money_change" href="#modal-linetime" data-toggle="modal" data-order_id='[%= it[item]['order_id'] %]' <a class="btn1 btn-success money_change" href="#modal-linetime" data-toggle="modal" data-type='[%= it[item]['type'] %]' data-id='[%= it[item]["id"]%]'
data-agent_id = '[%= it[item]['agent_id'] %]' data-report_id='[%= it[item]['report_id'] %]' data-pay_type='[%= it[item]['pay_type_num'] %]' data-type_num = '[%= it[item]['type_num'] %]' data-income_time='[%= it[item]['income_time'] %]' data-pay_type='[%= it[item]['pay_type_num'] %]' >调整</a>
data-type_num = '[%= it[item]['type_num'] %]' data-income_time='[%= it[item]['income_time'] %]'
data-industry_type='[%= it[item]['industry_type'] %]' data-report='[%= it[item]['report_id'] %]' data-order_no = '[%= it[item]['order_no'] %]'
data-type='[%= it[item]['type'] %]' data-id='[%= it[item]["id"]%]'>调整</a>
[% } %] [% } %]
<!--<a class="btn1 btn-success money_back" href="#modal-back" data-toggle="modal" data-id='[%= it[item]["id"]%]'>退款</a>--> <!--<a class="btn1 btn-success money_back" href="#modal-back" data-toggle="modal" data-id='[%= it[item]["id"]%]'>退款</a>-->
<a class="btn1 btn-success list_delete" href="#modal-delete" data-toggle="modal" data-id='[%= it[item]["id"]%]'>删除</a> <a class="btn1 btn-success list_delete" href="#modal-delete" data-toggle="modal" data-id='[%= it[item]["id"]%]'>删除</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