Skip to content

T
tl_estate
Commit 591b5aff authored by clone's avatar clone
Browse files
Options

Merge branch 'test-v2.0-0530' of https://gitee.com/zwyjjc/tl_estate into test-v2.0-0530

parents 8d0e45bb cb40b83d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 331 additions and 14 deletions
application/index/view/collection/getCollection.html
View file @ 591b5aff
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<input type="hidden" class="page-load" id="getCollection" /> <input type="hidden" class="page-load" id="getCollection" />
<style> <style>
.modal-body{ .modal-body{
height: 600px; /*height: 600px;*/
overflow-y: auto; overflow-y: auto;
padding-bottom: 60px; padding-bottom: 60px;
} }
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<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>
<td colspan="9"> <td colspan="10">
<form id="form_search"> <form id="form_search">
<span class="fore-span ld-Marheight">收款时间:</span> <span class="fore-span ld-Marheight">收款时间:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date1" type="date"> <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date1" type="date">
...@@ -70,6 +70,8 @@ ...@@ -70,6 +70,8 @@
<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> <th class="text-center">商铺地址</th>
...@@ -91,6 +93,34 @@ ...@@ -91,6 +93,34 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="modal-linetime" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
时间轴
</h4>
</div>
<div class="modal-body">
<div class="modal-body" id="del_msg">
实付金额：<input type="number" />元
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary" id=" ">
删除
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
......
application/index/view/finance/finance_update_log.html
View file @ 591b5aff
<!DOCTYPE html> {layout name="global/frame_tpl" /}
<html lang="en"> <input type="hidden" class="page-load" id="finance_update_log" />
<head> <style>
<meta charset="UTF-8"> #note_text {
<title>Title</title> width: 80%;
</head> margin-left: 48px;
<body> margin-top: -20px;
111111 }
</body>
</html> #note_text_re {
\ No newline at end of file width: 80%;
margin-left: 48px;
margin-top: -20px;
}
.Tswitch_one {
display: none;
}
.Tswitch_two {
display: none;
}
.left {
float: left;
width: 340px;
line-height: 36px;
}
.right {
line-height: 36px;
}
.btn_2 {
width: 60px;
display: inline-block;
height: 26px;
padding: 3px 6px
}
.edit_new {
float: right;
margin-bottom: 5px;
margin-top: -10px;
}
.form-control-one {
display: inline-block;
width: 40%;
}
#form_search {
line-height: 48px;
}
.modal-body-two {
height: 500px;
overflow-y: scroll;
}
</style>
<div id="page-content-wrapper">
<div class="container">
<div class="row">
<div class="col-lg-10 col-lg-offset-0">
<div class="panel panel-default">
<div class="panel-heading breadcrumb">
<li>
<a href="#">财务修改日志</a>
</li>
</div>
<div class="panel-body">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<td colspan="10">
<form id="form_search">
<span class="fore-span ld-Marheight">修改时间:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="create_time" name="start_date" type="date">
<span class="fore-span ld-Marheight">-</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_time" name="end_date" type="date">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="store_name" placeholder="商铺地址" type="text" value="">
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_num" placeholder="商铺号" type="text" value="">-->
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="商铺号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="修改人姓名" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="修改人手机号" type="text" value="">
<span class="btn btn-info btn3" id="search">搜索</span>
<span class="btn btn-info btn3" id="reset">重置</span>
<!--<span class="btn btn-info btn3" id="export">导出excel</span>-->
</form>
</td>
</tr>
<tr>
<th class="text-center">修改时间</th>
<th class="text-center">修改内容</th>
<th class="text-center">修改人</th>
</tr>
</thead>
<tbody class="text-center" id="business_list">
</table>
</div>
<!-- /#page-content-wrapper -->
<div class="text-right" id="pagediv">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- 弹出框 编辑 -->
<div class="modal fade" id="modal-details" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
<span class="btn btn-info" id="information">成交信息</span>
<span class="btn btn-default caozuo" id="fees">分佣提成</span>
<span class="btn btn-default" id="records">收款记录</span>
</h4>
</div>
<div class="modal-body modal-body-two">
<div class="Tswitch">
<div class="left">
<span>商铺地址：</span><span class="internal_address"></span><br>
<span>客户姓名：</span><span class="user_name"></span><br>
<span>应收总佣金：</span>&nbsp;<input class="form-control btn_2 commission" type="text">元<br>
<span>实收佣金：</span>&nbsp;<input class="form-control btn_2 practical_fee" type="text">元<br>
</div>
<div class="right">
<span>商铺名称：</span><span class="internal_title"></span><br>
<span>客户电话：</span><span class="user_phone"></span><br>
<span>提交日期：</span><span class="create_time"></span><br>
</div>
<input type="hidden" class="page-pass" />
</div>
<div class="Tswitch Tswitch_one">
<!--分佣提成-->
<a class="btn btn-success edit_new" href="#modal-new" data-toggle="modal">新增</a>
<table class="table table-striped table-bordered table-hover table-condensed" id="caozuo_hide">
<thead>
<tr>
<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>
</tr>
</thead>
<tbody class="text-center" id="caozuo_table">
</table>
<!--分佣提成-->
</div>
<div class="Tswitch Tswitch_two">
<table class="table table-striped table-bordered table-hover table-condensed" id="tcaozuo_hide">
<thead>
<tr>
<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>
</tr>
</thead>
<tbody class="text-center" id="tcaozuo_table">
</table>
</div>
<br><br><br><br>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消
</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" id="confirm_edit">
确定
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<!-- 弹出框 时间 -->
<div class="modal fade" id="modal-linetime" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
时间轴
</h4>
</div>
<div class="modal-body">
<div class="modal-body" id="del_msg">
时间轴
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary" id=" ">
删除
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<!-- 分佣提成新增 -->
<div class="modal fade" id="modal-new" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
新增分佣提成
</h4>
</div>
<div class="modal-body">
<div class="modal-body" id="">
<!-- 新增分佣提成 -->
<form id="form_search">
分佣方：&nbsp;&nbsp;&nbsp;
<select class="form-control form-control-one" id="is_carefully_chosen">
<option value="0">请选择</option>
<option value="1">盘方</option>
<option value="2">客方</option>
<option value="3">反签</option>
<option value="4">独家</option>
<option value="5">合作方</option>
</select><br>
<span>业务员：&nbsp;&nbsp;&nbsp;</span><input class="form-control form-control-one" data-rule-phoneus="false" data-rule-required="false" id=" " placeholder="" type="text" value=""><br>
<span>所属门店：</span><input class="form-control form-control-one" data-rule-phoneus="false" data-rule-required="false" id=" " placeholder="" type="text" value=""><br>
<span>分佣比例：</span><input class="form-control form-control-one" data-rule-phoneus="false" data-rule-required="false" id="commission-rate" placeholder="" type="text" value=""><br>
<span>应分佣金：</span><input class="form-control form-control-one" data-rule-phoneus="false" data-rule-required="false" id="should-commission" placeholder="" type="text" value=""><br>
</form>
<!-- 新增分佣提成 -->
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消
</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" id="new-commission">
确定
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
\ No newline at end of file
public/resource/js/finance_update_log.js 0 → 100644
View file @ 591b5aff
This diff is collapsed.
public/resource/template/financeUpdateLog_template_tpl.html 0 → 100644
View file @ 591b5aff
<script id="financeUpdateLog_list_tpl" type="text/template">
[% if(it) { %]
[% for(var item in it){ %]
<tr class="text-center">
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['income_time'] %]</td>
<td>[%= it[item]['district_store'] %]</td>
<!--<td>[%= it[item]['name'] %]</td>
<td>[%= it[item]['practical_fee'] %]</td>
<td>[%= it[item]['cash'] %]</td>
<td>[%= it[item]['service_charge'] %]</td>
<td>[%= it[item]['practical_fee'] %]</td>
<td>[%= it[item]['fee'] %]</td>-->
<!--<td>[%= it[item]['service_charge'] %]</td>-->
<!--<td>
<a class="btn1 btn-info edit" href="#modal-details" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
<a class="btn1 btn-info timeline" href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>
</td>-->
</tr>
[% } %]
[% }else{ %]
<tr>
<td colspan="8" style="text-align:center;"> 暂无数据</td>
</tr>
[% } %]
</script>
public/resource/template/get_collection_template_tpl.html
View file @ 591b5aff
...@@ -6,13 +6,14 @@ ...@@ -6,13 +6,14 @@
<td>[%= it[item]['user_name'] %]</td> <td>[%= it[item]['user_name'] %]</td>
<td>[%= it[item]['user_phone'] %]</td> <td>[%= it[item]['user_phone'] %]</td>
<td>[%= it[item]['money'] %]</td> <td>[%= it[item]['money'] %]</td>
<td>[%= it[item]['money'] %]</td>
<td class="pay_type">[%= it[item]['pay_type'] %]</td> <td class="pay_type">[%= it[item]['pay_type'] %]</td>
<td>[%= it[item]['type'] %]</td> <td>[%= it[item]['type'] %]</td>
<td>[%= it[item]['internal_address'] %]</td> <td>[%= it[item]['internal_address'] %]</td>
<td>[%= it[item]['internal_title'] %]</td> <td>[%= it[item]['internal_title'] %]</td>
<td> <td>
<a class="btn1 btn-info caozuo" href="#modal-record" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a> <a class="btn1 btn-info caozuo" href="#modal-record" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>
<a class="btn1 btn-info caozuo" href="#modal-record" data-toggle="modal" data-id='[%= it[item]["id"] %]'>编辑</a> <a class="btn1 btn-info caozuo" href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"] %]'>编辑</a>
</td> </td>
</tr> </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