Commit 887a5468 authored by xishifeng's avatar xishifeng

暂存

parent 03154cc8
...@@ -90,6 +90,11 @@ class Index ...@@ -90,6 +90,11 @@ class Index
return view('index/timeline_pc'); return view('index/timeline_pc');
} }
public function bargaininfo_detail_pc()
{
return view('index/bargaininfo_detail_pc');
}
public function customerinfo_details_new() public function customerinfo_details_new()
{ {
return view('index/customerinfo_details_new'); return view('index/customerinfo_details_new');
......
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>同联商业</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" />
<meta name="Keywords" content="" />
<meta name="Description" content="" />
</head>
<body style="display: none;">
<div>
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title detail-modal-header-tab">
<a href="javascript:;" class="btn btn-info">成交信息</a>
<a href="javascript:;" class="btn btn-default">分佣提成</a>
<a href="javascript:;" class="btn btn-default">开票税费</a>
</h4>
</div>
<div class="modal-body detail-modal-body">
<div>
<div class="detail-modal-body-sec">
<form class="detail-modal-bargaininfo-form">
<div class="detail-modal-bargaininfo-main-left">
<span>商铺类型:</span>
<span id="bargaininfo_shop_type"></span>
<br />
<span>商铺地址:</span><span id="bargaininfo_internal_address"></span><br>
<span>客户姓名:</span><span id="bargaininfo_user_name"></span><br>
<span>成交类型:</span>
<select class="form-control" id="bargaininfo_type">
<option value="10">出租</option>
<option value="20">增佣</option>
<option value="30">代理</option>
<option value="40">好处费</option>
</select>
<br />
<span>应收总佣金:</span>&nbsp;<input class="form-control" id="bargaininfo_total_commission" type="number"><br>
</div>
<div class="detail-modal-bargaininfo-main-right">
<span>是否开业:</span>
<select class="form-control" id="bargaininfo_is_open">
<option value="0"></option>
<option value="1"></option>
</select> <br />
<span>商铺号:</span><span id="bargaininfo_shop_num"></span><br>
<span>客户电话:</span><span id="bargaininfo_user_phone"></span><br>
<span>成交日期:</span><span id="bargaininfo_create_time"></span><br>
</div>
<div class="detail-modal-bargaininfo-commission-inputpar">
<div class="detail-modal-bargaininfo-commission-addarea">
<div class="form-group detail-modal-bargaininfo-commission-sec">
<label class="">实收佣金:</label>
<div class="input-group">
<input type="number" class="form-control" placeholder="请输入">
<div class="input-group-addon"></div>
</div>
<label class="">收佣日期:</label>
<div class="input-group">
<input type="date" class="form-control" placeholder="请输入">
</div>
<!--<mark href="javascript:;" class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png" /></mark>-->
</div>
</div>
<div id="bargaininfo_commission_add_btn">
<img src="/resource/image/jia2@2x.png" />
</div>
</div>
<div>
<span class="detail-modal-bargaininfo-span-beizhu">备注:</span>
<textarea id="bargaininfo_beizhu"></textarea>
</div>
</form>
<div class="tc">
<button type="button" class="btn btn-primary" id="bargaininfo_btn_save">保存</button>
</div>
</div>
<div class="detail-modal-body-sec">
<div class="detail-modal-maid-top-btn-area oh">
<a class="btn btn-success" href="#modal_new_maid" data-toggle="modal">新增</a>
<a id="maid_new_btn" class="btn btn-primary" data-toggle="modal">增加实收</a>
</div>
<table class="table table-striped table-bordered table-hover table-condensed" id="maid_table_main">
<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>
<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="maid_new_table_list">
<!--<tr>
<td>盘方</td>
<td>刘丹丹-13918937741</td>
<td>同联一部南京东路店</td>
<td contenteditable>30%</td>
<td contenteditable>350000</td>
<td colspan="6" class="detail-modal-maid-mix-td oh">
<div class="oh">
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span></span>
</div>
</td>
</tr>
<tr>
<td>盘方</td>
<td>刘丹丹-13918937741</td>
<td>同联一部南京东路店</td>
<td contenteditable>30%</td>
<td contenteditable>350000</td>
<td colspan="6" class="detail-modal-maid-mix-td oh">
<div class="oh">
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span></span>
</div>
</td>
</tr>-->
</tbody>
</table>
<div class="detail-modal-maid-bottom-btn-area text-right">
<a id="maid_ok_btn" class="btn btn-primary" data-toggle="modal">确认分佣</a>
<a id="maid_save_btn" class="btn btn-primary" data-toggle="modal">保存</a>
</div>
<!--分佣提成-->
</div>
<div class="detail-modal-body-sec">
<div>
<div class="tc">
<a class="btn btn-success" href="#modal_new_tax" data-toggle="modal">新增开票</a>
</div>
<div id="tax_main_box">
<!--内容为模板生成-->
</div>
</div>
</div>
</div>
</div>
<!-- /.modal-content -->
</div>
<script src="/app/js/libs/require.min.js" data-js="/app/js/bargaininfo_detail_pc.js" data-main="/app/js/main" data-norem="yes" defer async="true"></script>
</body>
</html>
\ No newline at end of file
...@@ -71,156 +71,10 @@ ...@@ -71,156 +71,10 @@
<!-- 弹出框 详情 --> <!-- 弹出框 详情 -->
<div class="modal fade" id="modal_detail" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal_detail" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <!--<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> </div>-->
× <iframe class="modal-content"></iframe>
</button>
<h4 class="modal-title detail-modal-header-tab">
<a href="javascript:;" class="btn btn-info">成交信息</a>
<a href="javascript:;" class="btn btn-default">分佣提成</a>
<a href="javascript:;" class="btn btn-default">开票税费</a>
</h4>
</div>
<div class="modal-body detail-modal-body">
<div>
<div class="detail-modal-body-sec">
<form class="detail-modal-bargaininfo-form">
<div class="detail-modal-bargaininfo-main-left">
<span>商铺类型:</span>
<span id="bargaininfo_shop_type"></span>
<br />
<span>商铺地址:</span><span id="bargaininfo_internal_address"></span><br>
<span>客户姓名:</span><span id="bargaininfo_user_name"></span><br>
<span>成交类型:</span>
<select class="form-control" id="bargaininfo_type">
<option value="10">出租</option>
<option value="20">增佣</option>
<option value="30">代理</option>
<option value="40">好处费</option>
</select>
<br />
<span>应收总佣金:</span>&nbsp;<input class="form-control" id="bargaininfo_total_commission" type="number"><br>
</div>
<div class="detail-modal-bargaininfo-main-right">
<span>是否开业:</span>
<select class="form-control" id="bargaininfo_is_open">
<option value="0"></option>
<option value="1"></option>
</select> <br />
<span>商铺号:</span><span id="bargaininfo_shop_num"></span><br>
<span>客户电话:</span><span id="bargaininfo_user_phone"></span><br>
<span>成交日期:</span><span id="bargaininfo_create_time"></span><br>
</div>
<div class="detail-modal-bargaininfo-commission-inputpar">
<div class="detail-modal-bargaininfo-commission-addarea">
<div class="form-group detail-modal-bargaininfo-commission-sec">
<label class="">实收佣金:</label>
<div class="input-group">
<input type="number" class="form-control" placeholder="请输入">
<div class="input-group-addon"></div>
</div>
<label class="">收佣日期:</label>
<div class="input-group">
<input type="date" class="form-control" placeholder="请输入">
</div>
<!--<mark href="javascript:;" class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png" /></mark>-->
</div>
</div>
<div id="bargaininfo_commission_add_btn">
<img src="/resource/image/jia2@2x.png" />
</div>
</div>
<div>
<span class="detail-modal-bargaininfo-span-beizhu">备注:</span>
<textarea id="bargaininfo_beizhu"></textarea>
</div>
</form>
<div class="tc">
<button type="button" class="btn btn-primary" id="bargaininfo_btn_save">保存</button>
</div>
</div>
<div class="detail-modal-body-sec">
<div class="detail-modal-maid-top-btn-area oh">
<a class="btn btn-success" href="#modal_new_maid" data-toggle="modal">新增</a>
<a id="maid_new_btn" class="btn btn-primary" data-toggle="modal">增加实收</a>
</div>
<table class="table table-striped table-bordered table-hover table-condensed" id="maid_table_main">
<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>
<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="maid_new_table_list">
<!--<tr>
<td>盘方</td>
<td>刘丹丹-13918937741</td>
<td>同联一部南京东路店</td>
<td contenteditable>30%</td>
<td contenteditable>350000</td>
<td colspan="6" class="detail-modal-maid-mix-td oh">
<div class="oh">
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span></span>
</div>
</td>
</tr>
<tr>
<td>盘方</td>
<td>刘丹丹-13918937741</td>
<td>同联一部南京东路店</td>
<td contenteditable>30%</td>
<td contenteditable>350000</td>
<td colspan="6" class="detail-modal-maid-mix-td oh">
<div class="oh">
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span></span>
</div>
</td>
</tr>-->
</tbody>
</table>
<div class="detail-modal-maid-bottom-btn-area text-right">
<a id="maid_ok_btn" class="btn btn-primary" data-toggle="modal">确认分佣</a>
<a id="maid_save_btn" class="btn btn-primary" data-toggle="modal">保存</a>
</div>
<!--分佣提成-->
</div>
<div class="detail-modal-body-sec">
<div>
<div class="tc">
<a class="btn btn-success" href="#modal_new_tax" data-toggle="modal">新增开票</a>
</div>
<div id="tax_main_box">
<!--内容为模板生成-->
</div>
</div>
</div>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal --> <!-- /.modal -->
</div> </div>
</div> </div>
......
This diff is collapsed.
...@@ -45,6 +45,7 @@ Route::group('app_broker', [ ...@@ -45,6 +45,7 @@ Route::group('app_broker', [
'daily_achieve_ywy' => [ 'app_broker/index/daily_achieve_ywy', [ 'method' => 'get' ] ], 'daily_achieve_ywy' => [ 'app_broker/index/daily_achieve_ywy', [ 'method' => 'get' ] ],
'customerinfo_genjin' => [ 'app_broker/index/customerinfo_genjin', [ 'method' => 'get' ] ], 'customerinfo_genjin' => [ 'app_broker/index/customerinfo_genjin', [ 'method' => 'get' ] ],
'timeline_pc' => [ 'app_broker/index/timeline_pc', [ 'method' => 'get' ] ], 'timeline_pc' => [ 'app_broker/index/timeline_pc', [ 'method' => 'get' ] ],
'bargaininfo_detail_pc' => [ 'app_broker/index/bargaininfo_detail_pc', [ 'method' => 'get' ] ],
'customerinfo_customer_add' => [ 'app_broker/index/customerinfo_customer_add', [ 'method' => 'get' ] ], 'customerinfo_customer_add' => [ 'app_broker/index/customerinfo_customer_add', [ 'method' => 'get' ] ],
'customerinfo_details_new' => [ 'app_broker/index/customerinfo_details_new', [ 'method' => 'get' ] ], 'customerinfo_details_new' => [ 'app_broker/index/customerinfo_details_new', [ 'method' => 'get' ] ],
'xiazai' => [ 'app_broker/index/xiazai', [ 'method' => 'get' ] ], 'xiazai' => [ 'app_broker/index/xiazai', [ 'method' => 'get' ] ],
......
.detail-modal-body {
height: 660px;
overflow-y: scroll;
}
.detail-modal-body-sec+.detail-modal-body-sec{
display: none;
}
/*详情弹出框,成交信息*/
.detail-modal-bargaininfo-main-left {
float: left;
width: 340px;
line-height: 36px;
}
#bargaininfo_is_open,
#bargaininfo_type {
width: 100px !important;
display: inline-block;
}
.detail-modal-bargaininfo-main-right {
line-height: 36px;
width: 560px;
}
#bargaininfo_total_commission {
width: 150px;
display: inline-block;
height: 26px;
padding: 3px 6px
}
.detail-modal-bargaininfo-form {
line-height: 48px;
width: 620px;
margin: 0 auto;
}
.detail-modal-bargaininfo-commission-inputpar {
float: left;
width: 100%;
overflow: hidden;
clear: both;
}
.detail-modal-bargaininfo-commission-sec,
.addtax-modal-tax-commission-sec {
overflow: hidden;
}
.detail-modal-bargaininfo-commission-sec>label,
.addtax-modal-tax-commission-sec>label {
float: left;
}
.detail-modal-bargaininfo-commission-sec>label:nth-of-type(2),
.addtax-modal-tax-commission-sec>label:nth-of-type(2) {
margin-left: 50px;
}
.detail-modal-bargaininfo-commission-sec>div,
.addtax-modal-tax-commission-sec>div {
float: left;
width: 160px;
}
.detail-modal-bargaininfo-commission-sec>mark,
.addtax-modal-tax-commission-sec>mark {
float: left;
overflow: hidden;
background-color: transparent;
padding-top: 5px;
padding-left: 10px;
}
.detail-modal-bargaininfo-commission-sec>mark>img,
.addtax-modal-tax-commission-sec>mark>img {
float: left;
width: 20px;
}
#bargaininfo_commission_add_btn {
width: 100%;
margin-bottom: 20px;
}
#bargaininfo_commission_add_btn>img {
display: block;
margin: 0 auto;
}
/*详情弹出框,分佣提成*/
.detail-modal-maid-top-btn-area{
padding: 0 10px 10px;
}
.detail-modal-maid-bottom-btn-area>a{
}
[href="#modal_new_maid"]{
float: left;
display: none;
}
#maid_new_btn{
float: right;
}
#maid_table_main>thead th:nth-last-of-type(-n+6){
width: 91px;
}
#maid_table_main>thead th:nth-last-of-type(1){
width: 149px;
}
.detail-modal-maid-mix-td{
padding: 0!important;
}
.detail-modal-maid-mix-td>div{
width: 100%;
height: 100%;
}
.detail-modal-maid-mix-td>div>span{
float: left;
width: 91px;
height: 30px;
line-height: 30px;
border-right: 1px solid #ddd;
border-bottom: 1px solid #ddd;
}
.detail-modal-maid-mix-td>div:nth-last-of-type(1)>span{
border-bottom: none;
}
.detail-modal-maid-mix-td>div>span:nth-last-of-type(1){
width: 146px;
border-right: none;
}
/*详情弹出框,开票税费*/
.addtax-modal-tax-table{
width:600px;
}
.addtax-modal-tax-table td{
line-height: 36px;
text-align: center;
}
#tax_main_box{
margin-top: 30px;
}
#tax_main_box>section{
overflow: hidden;
width: 680px;
margin: 0 auto;
}
#tax_main_box>section+section{
margin-top: 40px;
}
#tax_main_box>section>div{
float: left;
}
#tax_main_box>section>div:nth-of-type(2){
padding-left: 20px;
padding-top: 50px;
}
.addtax-modal-tax-table{
width: 500px;
margin: 0 auto;
}
.addtax-modal-tax-table td{
text-align: center;
line-height: 40px;
}
/********************/
/*新增分佣提成弹框部分样式*/
#addmaid_input_area>div{
overflow: hidden;
padding: 5px 0;
}
#addmaid_input_area>div>span{
float: left;
height: 34px;
line-height: 34px;
}
#addmaid_input_area>div>select,
#addmaid_input_area>div>input{
float: left;
width: 60%;
}
#addmaid_input_area>div>span:nth-of-type(1){
display: inline-block;
width: 80px;
}
#addmaid_input_area>div>span:nth-of-type(2){
padding-left: 10px;
}
[href="#modal_new_maid_select"]{
display: none;
}
#addmaid_select_ul{
list-style: none;
padding: 0;
margin: 0;
}
#addmaid_select_ul>li{
height: 50px;
line-height: 50px;
cursor: pointer;
}
#addmaid_select_ul>li:hover{
background-color: rgba(0, 0, 0, .2);
}
/*新增分佣提成*/
#addmaid_input_ywy+ul{
width: 60%;
margin-left: 80px;
list-style: none;
padding-left: 0;
border: 1px solid #ccc;
border-top: none;
background-color: white;
display: none;
}
#addmaid_input_ywy+ul>li{
line-height: 40px;
}
/*成交信息tab*/
.detail-modal-bargaininfo-span-beizhu{
/*display: inline-block;
height: 150px;
line-height: 150px;*/
}
#bargaininfo_beizhu{
width: 480px;
height: 150px;
}
/*详情弹出框,开票税费下的表格*/
.detail-modal-tax-table{
width: 600px;
}
.detail-modal-tax-table td{
height: 40px;
text-align: center;
}
\ No newline at end of file
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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