Skip to content

T
tl_estate
Commit 8ec81535 authored by duxinyuan's avatar duxinyuan
Browse files
Options

commite

parent 9e0b604e
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 18 deletions
application/index/view/finance/getCollection.html
View file @ 8ec81535
...@@ -328,13 +328,19 @@ ...@@ -328,13 +328,19 @@
<option value="70">转让费</option> <option value="70">转让费</option>
<option value="80">其他</option> <option value="80">其他</option>
<option value="90">佣金</option> <option value="90">佣金</option>
<option value="91">中介费</option>
<option value="92">案场费</option>
</select> </select>
<select class="form-control btn2 ld-Marheight" id="maintable_pay_type"> <select class="form-control btn2 ld-Marheight" id="maintable_pay_type">
<option value="">入账方式</option> <option value="">入账方式</option>
<option value="10">支付宝</option> <option value="10">施总支付宝</option>
<option value="20">微信</option> <option value="11">林老师支付宝</option>
<option value="20">施总微信</option>
<option value="21">林老师微信</option>
<option value="30">POS机器</option> <option value="30">POS机器</option>
<option value="40">转账</option> <option value="40">地产转账</option>
<option value="41">世家公账</option>
<option value="42">3000账号</option>
<option value="50">现金</option> <option value="50">现金</option>
<option value="60">其他</option> <option value="60">其他</option>
</select> </select>
...@@ -344,7 +350,7 @@ ...@@ -344,7 +350,7 @@
<option value="1">智能pos机</option> <option value="1">智能pos机</option>
<option value="1">调整</option> <option value="1">调整</option>
</select> </select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="order_id" placeholder="订单ID" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="order_id" placeholder="带看ID" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="get_id" placeholder="收款ID" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="get_id" placeholder="收款ID" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="report_id" placeholder="成交报告ID" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="report_id" placeholder="成交报告ID" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_id" placeholder="商铺ID" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_id" placeholder="商铺ID" type="text" value="">
...@@ -488,6 +494,7 @@ ...@@ -488,6 +494,7 @@
<strong><span class="col-xs-4 ld-Marheight">是否分红:</span></strong> <strong><span class="col-xs-4 ld-Marheight">是否分红:</span></strong>
<div class="col-xs-6"> <div class="col-xs-6">
<select class="form-control " id="change_fenhong"> <select class="form-control " id="change_fenhong">
<option value="">请选择</option>
<option value="0">否</option> <option value="0">否</option>
<option value="1">是</option> <option value="1">是</option>
</select> </select>
...@@ -580,7 +587,7 @@ ...@@ -580,7 +587,7 @@
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<div class="form-group"> <div class="form-group">
<strong><span>订单ID:</span></strong> <strong><span>带看ID:</span></strong>
<span id="dingdanId">45122</span> <span id="dingdanId">45122</span>
</div> </div>
</div> </div>
...@@ -764,6 +771,7 @@ ...@@ -764,6 +771,7 @@
<strong><span class="col-xs-3 ld-Marheight">是否分红:</span></strong> <strong><span class="col-xs-3 ld-Marheight">是否分红:</span></strong>
<div class="col-xs-6"> <div class="col-xs-6">
<select class="form-control" id="fenhong"> <select class="form-control" id="fenhong">
<option value="">请选择</option>
<option value="1">是</option> <option value="1">是</option>
<option value="0">否</option> <option value="0">否</option>
</select> </select>
......
public/resource/js/getCollection.js
View file @ 8ec81535
...@@ -352,10 +352,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -352,10 +352,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
$('#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")); // $('#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_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(1) $('#into_id_change').val($(obj).attr("data-order_id"))
}, },
search_phone : function(){ search_phone : function(){
...@@ -378,7 +378,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -378,7 +378,7 @@ 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_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-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);
...@@ -550,7 +550,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -550,7 +550,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
'pay_type' : that.pay_type 'pay_type' : that.pay_type
}; };
if ($('#change_type').val()){//调整类型 if ($('#change_type').val()){//调整类型
obj.type = that.type_num; obj.type = $('#change_type').val();//that.type_num;
//$('#change_type').val() //$('#change_type').val()
}; };
//拼接jsonArray to jsonObject //拼接jsonArray to jsonObject
...@@ -714,19 +714,19 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -714,19 +714,19 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
var params = {}; var params = {};
var paramsStr = "?" ; var paramsStr = "?" ;
if ( commite_time_start ) { if ( commite_time_start ) {
params.income_start_time = commite_time_start; params.start_time = commite_time_start;
paramsStr += "income_start_time=" + commite_time_start + "&" paramsStr += "income_start_time=" + commite_time_start + "&"
} }
if ( commite_time_end ) { if ( commite_time_end ) {
params.income_end_time = commite_time_end; params.end_time = commite_time_end;
paramsStr += "income_end_time=" + commite_time_end + "&" paramsStr += "income_end_time=" + commite_time_end + "&"
} }
if ( into_time_start ) { if ( into_time_start ) {
params.start_time = into_time_start; params.income_start_time = into_time_start;
paramsStr += "start_time=" + into_time_start + "&" paramsStr += "start_time=" + into_time_start + "&"
} }
if ( into_time_end ) { if ( into_time_end ) {
params.end_time = into_time_end; params.income_end_time = into_time_end;
paramsStr += "end_time=" + into_time_end + "&" paramsStr += "end_time=" + into_time_end + "&"
} }
if ( maintable_deal_type ) { if ( maintable_deal_type ) {
...@@ -759,8 +759,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -759,8 +759,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
} }
if ( shop_id ) { if ( shop_id ) {
params.id = shop_id; params.house_id = shop_id;
paramsStr += "id=" + shop_id + "&" paramsStr += "house_id =" + shop_id + "&"
} }
if ( commit_home ) { if ( commit_home ) {
params.district_id = commit_home; params.district_id = commit_home;
......
public/resource/template/receivables_template_tpl.html
View file @ 8ec81535
...@@ -13,16 +13,16 @@ ...@@ -13,16 +13,16 @@
<td>[%= it[item]['type'] %]</td> <td>[%= it[item]['type'] %]</td>
<td>[%= it[item]['money'] %]</td> <td>[%= it[item]['money'] %]</td>
<td>[%= it[item]['real_money'] %]</td> <td>[%= it[item]['real_money'] %]</td>
<td>[%= it[item]['source_id'] %]</td>
[% if(it[item]['soucre'] == 0) { %] [% if(it[item]['soucre'] == 0) { %]
<td>正常</td> <td>APP提交</td>
[% } else if ( it[item]['soucre'] == 1 ) { %] [% } else if ( it[item]['soucre'] == 1 ) { %]
<td>正常</td> <td>智能pos机</td>
[% } else if ( it[item]['soucre'] == 2) { %] [% } else if ( it[item]['soucre'] == 2) { %]
<td>调整</td> <td>调整</td>
[% } else {%] [% } else {%]
<td>--</td> <td>--</td>
[% } %] [% } %]
<td>[%= it[item]['source_id'] %]</td>
<td> <td>
<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>
......
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