Skip to content

T
tl_estate
Commit e5331a1b authored by xinyuandu's avatar xinyuandu
Browse files
Options

权限修改

parent 872994e4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 180 deletions
.project
View file @ e5331a1b
...@@ -5,6 +5,11 @@ ...@@ -5,6 +5,11 @@
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand>
<name>com.aptana.editor.php.aptanaPhpBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>com.aptana.ide.core.unifiedBuilder</name> <name>com.aptana.ide.core.unifiedBuilder</name>
<arguments> <arguments>
...@@ -13,6 +18,7 @@ ...@@ -13,6 +18,7 @@
</buildSpec> </buildSpec>
<natures> <natures>
<nature>com.aptana.projects.webnature</nature> <nature>com.aptana.projects.webnature</nature>
<nature>com.aptana.editor.php.phpNature</nature>
</natures> </natures>
<filteredResources> <filteredResources>
<filter> <filter>
...@@ -60,5 +66,14 @@ ...@@ -60,5 +66,14 @@
<arguments>1.0-name-matches-false-false-node_modules</arguments> <arguments>1.0-name-matches-false-false-node_modules</arguments>
</matcher> </matcher>
</filter> </filter>
<filter>
<id>1534838163404</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-node_modules</arguments>
</matcher>
</filter>
</filteredResources> </filteredResources>
</projectDescription> </projectDescription>
application/app_broker/controller/Index.php
View file @ e5331a1b
...@@ -208,6 +208,10 @@ class Index ...@@ -208,6 +208,10 @@ class Index
return view('index/download_b'); return view('index/download_b');
} }
public function edit_modal()
{
return view('index/edit_modal');
}
/* public function index() /* public function index()
{ {
......
application/index/view/finance/account_statement.html
View file @ e5331a1b
...@@ -97,186 +97,11 @@ ...@@ -97,186 +97,11 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 弹出框 详情 -->
<div class="modal fade" id="modal_detail" 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 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>&nbsp;<input class="form-control" id="bargaininfo_yetai" type="text"><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_expect_payback_time"></span><br>-->
<span>预计收款时间：</span><input type="date" id="bargaininfo_expect_payback_time" placeholder="请输入"><br>
<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
<span>成交日期：</span><span id="bargaininfo_create_time"></span><br>
<span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" type="number">元
</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" id="maid_new_btn" href="#modal_new_maid" data-toggle="modal">新增</a>
<a id="maid_add_btn" class="btn btn-primary" data-toggle="modal">增加实收</a>
<a id="maid_count_btn" class="btn btn-primary" title="可自动计算实收佣金和合计">计算</a>
</div>
<p class="text-right" id="maid_count_tips_p"><span>提示：</span>点击<span>计算</span>按钮可自动计算<span>实收佣金</span>和<span>合计</span>的内容</p>
<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>
<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>
<tfoot>
<tr>
<td class="text-center">合计</td>
<td class="text-center"></td>
<td class="text-center"></td>
<td class="text-center" id="maid_count_total_rate"></td>
<td class="text-center" id="maid_count_total_yingfen"></td>
<td class="text-center" id="maid_count_total_yufen"></td>
<td class="text-center" id="maid_count_total_shouxu"></td>
<td class="text-center" id="maid_count_total_cishan"></td>
<td class="text-center" id="maid_count_total_xianjin"></td>
<td class="text-center" id="maid_count_total_shishou"></td>
<td class="text-center"></td>
<td class="text-center"></td>
</tr>
</tfoot>
</table> <div class="modal fade" id="modal_detail" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="width :100% ;height : 100%">
<div class="detail-modal-maid-bottom-btn-area text-right"> <iframe class="iframe-detail" style="width :100% ;height : 100%"></iframe>
<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 -->
</div>
</div> </div>
<!-- 弹出框 通过 --> <!-- 弹出框 通过 -->
<div class="modal fade" id="modal-pass" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-pass" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog button-center-bargain"> <div class="modal-dialog button-center-bargain">
......
application/route.php
View file @ e5331a1b
...@@ -52,6 +52,7 @@ Route::group('app_broker', [ ...@@ -52,6 +52,7 @@ Route::group('app_broker', [
'customerinfo_details_new' => [ 'app_broker/index/customerinfo_details_new', [ 'method' => 'get' ] ], 'customerinfo_details_new' => [ 'app_broker/index/customerinfo_details_new', [ 'method' => 'get' ] ],
'download_b' => [ 'app_broker/index/download_b', [ 'method' => 'get' ] ], 'download_b' => [ 'app_broker/index/download_b', [ 'method' => 'get' ] ],
'imagebody' => [ 'app_broker/index/imagebody', [ 'method' => 'get' ] ], 'imagebody' => [ 'app_broker/index/imagebody', [ 'method' => 'get' ] ],
'edit_modal' => [ 'app_broker/index/edit_modal', [ 'method' => 'get' ] ],
]); ]);
Route::group('index', [ Route::group('index', [
......
public/resource/js/houseList.js
View file @ e5331a1b
...@@ -24,6 +24,8 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -24,6 +24,8 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
isFollowupSaving: false, isFollowupSaving: false,
detailTabIndex:0,//查看 弹出框 tab切换 初始化 detailTabIndex:0,//查看 弹出框 tab切换 初始化
all_shop : true , // false: 本人商铺,true:所有商铺 all_shop : true , // false: 本人商铺,true:所有商铺
is_exclusive_type : 0 , //0非独家 1:独家
auth_edit_exclusive : 0 ,//0:无独家权限 1:有独家权限
init: function() { init: function() {
//初始化dot //初始化dot
business.getDistrict(); business.getDistrict();
...@@ -130,6 +132,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -130,6 +132,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
$("#myModalLabel").html("设置案场权限人"); $("#myModalLabel").html("设置案场权限人");
// 传入data-id // 传入data-id
business.house_id = $(this).attr("data-id"); business.house_id = $(this).attr("data-id");
business.auth_edit_exclusive = $(this).attr("data-exclusive");
business.type = "1"; business.type = "1";
business.Anch(); //获取手机号名字的 business.Anch(); //获取手机号名字的
}); });
...@@ -462,6 +465,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -462,6 +465,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
$("#end_date_dujia").val(data.data.agent_end_time); $("#end_date_dujia").val(data.data.agent_end_time);
$("#exclusive").val(data.data.name); $("#exclusive").val(data.data.name);
business.exclusive_id = data.data.id; business.exclusive_id = data.data.id;
business.is_exclusive_type = data.data.is_exclusive_type ; //是否独家
var img_url = ""; var img_url = "";
$.each(data['data']['exclusive_img'], function(i, item) { $.each(data['data']['exclusive_img'], function(i, item) {
var local_img = location.origin + '/resource/lib/Attachments/images/' + item.img_name; var local_img = location.origin + '/resource/lib/Attachments/images/' + item.img_name;
...@@ -512,9 +516,22 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -512,9 +516,22 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
} }
$("#modal-dujia").addClass("yz"); $("#modal-dujia").addClass("yz");
var url = "" ;
if ( business.is_exclusive_type == 0 ){
if ( business.auth_edit_exclusive == 0 ) {
url = "/index/editExclusive"
} else {
url = "/index/addExclusive"
}
} else if (business.is_exclusive_type == 1){
url = "/index/editExclusive"
} else {
// nothing to do ;
}
$.ajax({ $.ajax({
'type': 'POST', 'type': 'POST',
'url': '/index/editExclusive', 'url': url,
data: { data: {
"houses_id": business.house_id, //楼盘Id "houses_id": business.house_id, //楼盘Id
"is_exclusive_type": $("#sel_dujia").val(), //是否独家 "is_exclusive_type": $("#sel_dujia").val(), //是否独家
......
public/resource/js/reportList.js
View file @ e5331a1b
This diff is collapsed.
public/resource/js/user.js
View file @ e5331a1b
...@@ -1308,7 +1308,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind ...@@ -1308,7 +1308,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
params.industry_type = $(".industry_type_two_1").val(); params.industry_type = $(".industry_type_two_1").val();
params.price_demand = $(".price_demand_1").val(); params.price_demand = $(".price_demand_1").val();
params.area_demand = $(".area_demand_1").val(); params.area_demand = $(".area_demand_1").val();
params.referrer_id = user.user_id_edit_introduce; params.referrer_id = user.user_id_edit_introduce ? user.user_id_edit_introduce : "";
params.referrer_source = 10; params.referrer_source = 10;
if($('#user_city_edit').val() == 310100){ if($('#user_city_edit').val() == 310100){
params.city = '上海市' ; params.city = '上海市' ;
......
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