Skip to content

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

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

parents 7e913337 16a4a1da
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 33 deletions
application/index/view/finance/receivables.html
View file @ f24a2ad6
......@@ -296,7 +296,8 @@
</select>
<select class="form-control btn2 ld-Marheight" id="come_from">
<option value="">来源</option>
<option value="0">提交</option>
<option value="0">app</option>
<option value="1">智能pos机</option>
<option value="1">调整</option>
</select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="order_id" placeholder="订单ID" type="text" value="">
......@@ -306,22 +307,18 @@
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_addr" placeholder="商铺地址" type="text" value="">
<select class="form-control btn2 ld-Marheight" id="commit_home">
<option value="">提交人所在部门</option>
<option value="0">一部</option>
<option value="1">二部</option>
</select>
<select class="form-control btn2 ld-Marheight" id="commit_shop">
<option value="">提交人所在门店</option>
<option value="0">一店</option>
<option value="1">二店</option>
</select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="comit_name" placeholder="提交人姓名" type="text" value="">
<span class="btn btn-info btn3 ld-Marheight" id="search" style="float:left">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset" style="float:left">重置</span>
<!--<span class="money_total_two fore-span ld-Marheight ">实付总额：</span><span id="money_total" class="money_total_two_shifu fore-span ld-Marheight">1268</span>元-->
<span class="btn btn-info btn3 ld-Marheight" id="export" style="float:left">导出报表</span>
<!--<span class="btn btn-info btn3 ld-Marheight" id="export" style="float:left">导出报表</span>-->
<span class="btn btn-info btn3 ld-Marheight" id="count" style="float:left">统计</span>
<span class="money_total_two ld-Marheight " style="float:left">实付总额：</span><span style="float:left" id="money_total" class="money_total_two_shifu fore-span ld-Marheight">1268元</span>
<span class="money_total_two ld-Marheight " style="float:left">实付总额：</span><span style="float:left" id="money_total" class="money_total_two_shifu fore-span ld-Marheight">0元</span>
</form>
</td>
</tr>
......@@ -387,55 +384,79 @@
<div class="modal-body modal-body-height">
<form class="">
<div class="col-xs-12">
<div class="col-xs-12">
<span>该笔收款可调整/退款金额：<strong><span id="could_price">1000</span></strong>元</span>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">商铺ID:</span></strong>
<strong><span class="col-xs-4 ld-Marheight">调整后商铺ID:</span></strong>
<span id="shop_id_change" class="col-xs-6 ld-Marheight">123456</span>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">商铺地址:</span></strong>
<strong><span class="col-xs-4 ld-Marheight">调整后商铺地址:</span></strong>
<span id="shop_addr_change" class="col-xs-6 ld-Marheight">123456</span>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">调整为:</span></strong>
<strong><span class="col-xs-4 ld-Marheight">调整为:</span></strong>
<div class="col-xs-6">
<select class="form-control" id="change_type">
<option value="0">佣金</option>
<option value="1">意向金</option>
<option value="2">保管金</option>
<option class="yixiangjin" value="0">中介费</option>
<option class="yixiangjin" value="1">案场费</option>
<option class="yixiangjin" value="2">意向金</option>
<option class="baoguanjin" value="0">中介费</option>
<option class="baoguanjin" value="1">案场费</option>
<option class="baoguanjin" value="2">保管金</option>
</select>
</div>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">调整金额:</span></strong>
<strong><span class="col-xs-4 ld-Marheight">调整金额(元):</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="2018" id="change_price" /></div>
<strong><span class="col-xs-2 ld-Marheight">元</span></strong>
<!--<strong><span class="col-xs-2 ld-Marheight">元</span></strong>-->
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">成交报告ID:</span></strong>
<strong><span class="col-xs-4 ld-Marheight">成交报告ID:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="2018" id="report_id_change" /></div>
<ul class="reportArea"></ul>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">订单ID:</span></strong>
<strong><span class="col-xs-4 ld-Marheight">调整后带看ID:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="2018" id="into_id_change" /></div>
</div>
</div>
<div class="col-xs-6 choose_topic_1">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">是否分红:</span></strong>
<div class="col-xs-6">
<select class="form-control " id="change_fenhong">
<option value="0">否</option>
<option value="1">是</option>
</select>
</div>
</div>
</div>
<div class="col-xs-6 choose_topic_2">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">最后转定时间:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="2018" id="change_time" /></div>
</div>
</div>
<!--上传图片-->
<div class="col-xs-12 p-a-0">
<div class="col-xs-12">
<div class="col-xs-12" style="margin-top:20px;">
<div class="col-xs-12" style="padding-left:30px;">
<label>上传资料图片:</label>
</div>
<div class="col-xs-12 p-a-0">
<div class="col-xs-12">
<div class="file-upload-area p-a-0 ">
<ul class="img-pre-ul" id="fujian_ul"></ul>
<div class="btn-area">
......
application/index/view/performance_ranking/performance_ranking.html
View file @ f24a2ad6
......@@ -187,12 +187,12 @@
<div class="col-xs-8 p-a-10 p-t-0" >
<div class="panel panel-default">
<div class="area-title p-a-15 p-tb-10">
<span><strong>团队荣誉榜</strong></span>
<span><strong>团队荣誉榜</strong><span id="tymd"></span></span>
</div>
<div class="col-xs-12" style="margin-top:0.07rem;" id="teamList"></div>
<div class="col-xs-12 p-a-0">
<div class="area-title p-a-15">
<span><strong>个人荣誉榜</strong></span>
<span><strong>个人荣誉榜</strong><span id="pymd"></span></span>
</div>
</div>
<div class="col-xs-12" style="margin-top:0.07rem;padding-bottom:0.05rem;" id="personList"></div>
......
public/resource/js/performance_ranking.js
View file @ f24a2ad6
......@@ -23,7 +23,7 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
},
event: function () {
var that = this ;
that.initDate();
$(document).on('click','.business_more', function(e){
var id = $(this).attr("id");
console.log(id);
......@@ -76,6 +76,16 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
},
initDate : function(){
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth()+1;
var day =date.getDate();
var dateArea = year +"." + month +"." + "01" + "--" + year +"." + month +"." + day;
$('#tymd').text(dateArea);
$('#pymd').text(dateArea);
},
addDark : function(){
var docHeight = '7.52rem' //获取窗口高度
$('#paihang').append('<div id="overlay" style="padding-top:25%;height:7.52rem;position:relative;top:0;left:0"><div style="position:relative;top:50%font-size:20px;color:red;transform: translate(-25%,-50%);">数据加载中，请稍后。。。</div></div>');
......
public/resource/js/receivables.js
View file @ f24a2ad6
This diff is collapsed.
public/resource/template/receivables_template_tpl.html
View file @ f24a2ad6
......@@ -3,23 +3,33 @@
[% for(var item in it){ %]
<tr class="text-center">
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['id'] %]</td>
<td>[%= it[item]['order_id'] %]</td>
<td>[%= it[item]['bargain_id'] %]</td>
<td>[%= it[item]['income_time'] %]</td>
<td>[%= it[item]['report_agent_name'] %]-[%= it[item]['report_agent_phone'] %]</td>
<td>[%= it[item][''] %]</td>
<td>[%= it[item]['report_agent_name'] %]</td>
<td>[%= it[item]['store_name'] %]</td>
<td>[%= it[item]['type'] %]</td>
<td>[%= it[item]['money'] %]</td>
<td>[%= it[item]['real_money'] %]</td>
<td>[%= it[item]['type'] %]</td>
<td>[%= it[item]['pay_type'] %]</td>
<td>[%= it[item]['internal_address'] %]</td>
<td>[%= it[item]['house_number'] %]</td>
<td>[%= it[item]['report_agent_phone'] %]</td>
<td>[%= it[item]['bbb'] %]</td>
<td>[%= it[item]['aaa'] %]</td>
[% if(it[item]['soucre'] == 0) { %]
<td>APP</td>
[% } else if ( it[item]['soucre'] == 1 ) { %]
<td>智能pos机</td>
[% } else if ( it[item]['soucre'] == 2) { %]
<td>调整</td>
[% } else {%]
<td>--</td>
[% } %]
<td>[%= it[item]['soucre_id'] %]</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 add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收款详情</a>
<a class="btn1 btn-success money_change" href="#modal-linetime" 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>-->
[% if( it[item]['type'] == "意向金" || it[item]['type'] == "保管金" ) { %]
<a class="btn1 btn-success money_change" href="#modal-linetime" data-toggle="modal" 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 list_delete" href="#modal-delete" data-toggle="modal" data-id='[%= it[item]["id"]%]'>删除</a>
</td>
</tr>
......
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