Skip to content

T
tl_estate
Commit 989c7b58 authored by xishifeng's avatar xishifeng
Browse files
Options

暂存1

parent bab5a408
Show whitespace changes
Inline Side-by-side
Showing with 129 additions and 98 deletions
application/index/view/finance/account_statement.html
View file @ 989c7b58
......@@ -66,7 +66,7 @@
</div>
</div>
</div>
<!-- 弹出框 编辑 -->
<!-- 弹出框 详情 -->
<div class="modal fade" id="modal-edit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-0522">
<div class="modal-content">
......@@ -83,7 +83,7 @@
<div class="modal-body modal-body-two">
<div>
<div class="Tswitch Tswitch_three">
<form id="form_search">
<form id="bargain_info_form">
<div class="left">
<span class="left-deal">商铺类型：</span>
<span id="shop_type"></span>
......@@ -103,13 +103,14 @@
<option value="20">增佣</option>
<option value="30">代理</option>
<option value="40">好处费</option>
</select> <br />
<span>应收总佣金：</span>&nbsp;<input class="form-control btn_2 commission" type="number">元<br>
</select>
<br />
<span>应收总佣金：</span>&nbsp;<input class="form-control bargain-total-yongjin" type="number">元<br>
</div>
<div class="right">
<span class="left-deal">是否开业：</span>
<select class="form-control btn5 " id="is_open">
<select class="form-control" id="is_open">
<option value="-1">是否开业</option>
<option value="0">否</option>
<option value="1">是</option>
......@@ -144,6 +145,9 @@
<textarea name="" rows="" cols="" id="note_content"></textarea>
</div>
</form>
<div class="tc">
<button type="button" class="btn btn-primary" id="confirm_edit">保存</button>
</div>
</div>
<div class="Tswitch Tswitch_one">
<!--分佣提成-->
......@@ -175,52 +179,16 @@
</div>
<div class="Tswitch Tswitch_two">
<div>
<div>
<button>新增开票</button>
<div class="tc">
<a class="btn btn-success" href="#modal_new_shuifee" data-toggle="modal">新增开票</a>
</div>
<div class="shuifei-main-box" id="shuifei_main_box">
<!--<section>
<div>
<table class="shuifee-table">
<tr>
<td>开票金额</td>
<td>10000</td>
<td>开票日期</td>
<td>2018-4-5</td>
</tr>
<tr>
<td>分佣方</td>
<td>业务员</td>
<td>分佣比例</td>
<td>税费</td>
</tr>
<tr>
<td>盘方</td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>客方</td>
<td></td>
<td></td>
<td></td>
</tr>
</table>
</div>
<div>
<button>编辑</button>
<!--内容为模板生成-->
</div>
</section>-->
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal" id="confirm_edit">保存</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
......@@ -315,7 +283,7 @@
</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">
......@@ -360,3 +328,56 @@
</div>
<!-- /.modal -->
</div>
<!-- 弹出框 开票税费新增 -->
<div class="modal fade" id="modal_new_shuifee" 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>
<div>
<div class="form-group input-box-0521">
<label class="">开票金额：</label>
<div class="input-group"><input type="number" class="form-control input-100-width" placeholder="请输入">
<div class="input-group-addon">元</div>
</div>
<label class="">开票日期：</label>
<div class="input-group"><input type="date" class="form-control input-100-width" placeholder="请输入"></div>
</div>
<div>
<table class="table-haveborder table-new-shuifee">
<tr>
<td>分佣方</td>
<td>业务员</td>
<td>分佣比例</td>
<td>税费</td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</table>
</div>
</div>
</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">
确定
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
\ No newline at end of file
public/resource/css/public.css
View file @ 989c7b58
......@@ -213,6 +213,18 @@ a:hover{
margin-left: 5px;
}
/*共用样式*/
.tc{
text-align: center;
}
.tr{
text-align: right;
}
.table-haveborder td{
border: 1px solid #000;
}
/*时间轴模态框样式 xishifeng abbr018.b5.b7*/
.iframe-time-line{
border: none;
......
public/resource/css/report_list.css
View file @ 989c7b58
......@@ -28,8 +28,9 @@
width: 32% !important;
}
.right .btn5 {
#is_open {
width: 20% !important;
display: inline-block;
}
.right {
......@@ -37,7 +38,7 @@
width: 560px;
}
.btn_2 {
.bargain-total-yongjin {
width: 60px;
display: inline-block;
height: 26px;
......@@ -55,12 +56,14 @@
width: 40%;
}
#form_search {
#bargain_info_form {
line-height: 48px;
width: 620px;
margin: 0 auto;
}
.modal-body-two {
height: 500px;
height: 660px;
overflow-y: scroll;
}
......@@ -143,13 +146,10 @@
.shuifee-table{
width:600px;
}
.shuifee-table td{
border: 1px solid #000;
line-height: 36px;
text-align: center;
}
......@@ -158,14 +158,26 @@
}
.shuifei-main-box>section{
overflow: hidden;
width: 680px;
margin: 0 auto;
}
.shuifei-main-box>section+section{
margin-top: 20px;
margin-top: 40px;
}
.shuifei-main-box>section>div{
float: left;
}
.shuifei-main-box>section>div:nth-of-type(2){
padding-left: 30px;
padding-left: 20px;
padding-top: 50px;
}
.table-new-shuifee{
width: 500px;
margin: 0 auto;
}
.table-new-shuifee td{
text-align: center;
line-height: 40px;
}
public/resource/js/reportList.js
View file @ 989c7b58
......@@ -167,27 +167,18 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
$(".internal_address").html(data.data.internal_address);
$(".internal_num").html(data.data.house_number);
$("#deal_status").val(data.data.trade_type);
$(".commission").val(data.data.commission);
$(".bargain-total-yongjin").val(data.data.commission);
$(".create_time").html(data.data.create_time);
if(data.data.practical_fee && data.data.practical_fee.length === 0){
$('#input_yongjin_add_area').html('<div class="form-group input-box-0521"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control input-100-width"placeholder="请输入"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control input-100-width"placeholder="请输入"></div></div>');
var _inputAreaTempObj = $('#input_yongjin_add_area');
if(data.data.practical_fee && data.data.practical_fee.length > 0){
_inputAreaTempObj.html('');
};
$.each(data.data.practical_fee, function(i, v) {
if(i == 0) {
$('#input_yongjin_add_area').html('<div class="form-group input-box-0521"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control input-100-width"placeholder="请输入"value="{0}"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control input-100-width"placeholder="请输入"value="{1}"></div></div>'.stringFormatObj({
_inputAreaTempObj.append('<div class="form-group input-box-0521"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control input-100-width"placeholder="请输入"value="{0}"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control input-100-width"placeholder="请输入"value="{1}"></div></div>'.stringFormatObj({
'0': v.fee,
'1': v.operation_date
}));
// var _tempObj = $('#input_yongjin_add_area>.input-box-0521:nth-of-type(1)');
// _tempObj.find('input').eq(0).val(v.fee);
// _tempObj.find('input').eq(1).val(v.operation_date);
} else {
$('#input_yongjin_add_area').append('<div class="form-group input-box-0521"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control input-100-width"placeholder="请输入"value="{0}"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control input-100-width"placeholder="请输入"value="{1}"></div><mark href="javascript:;"class="input-yongjin-cancel-pic"><img src="/resource/image/search_gb.png"/></mark></div>'.stringFormatObj({
'0': v.fee,
'1': v.operation_date
}));
};
});
}
......@@ -198,10 +189,12 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
});
},
confirmEdit: function() { //修改报告详情
var _tempArr = [];//
var _data = {
'id': bargain.bargain_id,
'commission': $.trim($('.btn_2 commission').val())
'commission': $.trim($('.bargain-total-yongjin').val()),
'content': $.trim($('#note_content').val()),
'is_open': $('#is_open').val(),
'trade_type': $('.left-deal').val()
};
$.each($('.input-box-0521'), function(i, v) {
var _tempData = {
......@@ -209,7 +202,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
'operation_date': $.trim($(v).find('input').eq(1).val())
};
console.log(_tempData);
_data['practical_fee'+'['+i+']'] = _tempData;
_data['practical_fee['+i+']'] = _tempData;
});
$.ajax({
'type': 'POST',
......@@ -218,11 +211,10 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
dataType: "json",
success: function(data) {
if(data.code == 200) {
alert('修改成功');
bargain.getList(0);
} else {
alert('获取失败！');
alert(data.msg);
}
}
});
......@@ -294,15 +286,10 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
}
});
},
// 收款记录
// 开票税费
shuiFee: function() {
$(".Tswitch:nth-of-type(3)").show().siblings().hide();
$("#information").removeClass("btn-info");
$("#information").addClass("btn-default");
$("#fees").removeClass("btn-info");
$("#fees").addClass("btn-default");
$("#records").removeClass("btn-default");
$("#records").addClass("btn-info");
$("#records").addClass("btn-info").removeClass("btn-default").siblings().removeClass("btn-info").addClass("btn-default");
$.ajax({
type: 'GET',
url: '/index/getTallAge',
......@@ -315,8 +302,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
success: function(_data) {
if(typeof _data === 'object') {
if(_data['code'] == '200') {
var doTtmpl = doT.template(document.getElementById('reportList_shuiFee_list_tpl').innerHTML);
$("#shuifei_main_box").html(doTtmpl(_data.data));
$("#shuifei_main_box").html(doT.template($('#reportList_shuiFee_list_tpl').html())(_data.data));
} else {
layerTipsX(_data['msg']);
}
......@@ -542,8 +528,6 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
}
});
},
//一级审核
//二级审核
Manager: function(pageNo) {
console.log(5555);
......
public/resource/template/reportList_shuiFee_template_tpl.html
View file @ 989c7b58
<script id="reportList_shuiFee_list_tpl" type="text/template">
[% if(it && it.length && it.length>0) { %]
[% for(var item in it){ %]
[% var getInfoType=function(r){switch(Number(r)){case 1:return"盘方";case 2:return"客方";case 3:return"反签";case 4:return"独家";case 5:return"合作方";default:return"未定义"}}; %]
<section>
<div>
<table class="shuifee-table">
<table class="shuifee-table table-haveborder">
<tr>
<td>开票金额</td>
<td>[%= it[item]['operation_date'] %]</td>
<td>[%= it[item]['total_fee'] %]</td>
<td>开票日期</td>
<td>[%= it[item]['operation_date'] %]</td>
</tr>
......@@ -16,22 +17,22 @@
<td>分佣比例</td>
<td>税费</td>
</tr>
[% if(it[item]['fee_list'] && it[item]['fee_list'].length && it[item]['fee_list'].length>0) { %]
[% for(var item2 in it[item]['fee_list']){ %]
<tr>
<td>盘方</td>
<td>[%= it[item]['name']+'-'+it[item]['phone'] %]</td>
<td>[%= it[item]['scale'] %]</td>
<td>[%= it[item]['fee'] %]</td>
</tr>
<tr>
<td>客方</td>
<td>[%= it[item]['name']+'-'+it[item]['phone'] %]</td>
<td>[%= it[item]['scale'] %]</td>
<td>[%= it[item]['fee'] %]</td>
<td>[%= getInfoType(it[item]['fee_list'][item2]['role']) %]</td>
<td>[%= it[item]['fee_list'][item2]['name']+'-'+it[item]['fee_list'][item2]['phone'] %]</td>
<td>[%= it[item]['fee_list'][item2]['scale'] %]</td>
<td>[%= it[item]['fee_list'][item2]['fee'] %]</td>
</tr>
[% } %]
[% }else{ %]
<tr>暂无</tr>
[% } %]
</table>
</div>
<div>
<button>编辑</button>
<a class="btn btn-default" href="#modal_new_shuifee">编辑</a>
</div>
</section>
[% } %]
......
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