Commit 1ad20729 authored by agping's avatar agping

修改

parent 23811bae
......@@ -37,7 +37,7 @@
<tr>
<td>业态:{{d.industry_type}}</td>
<td>{{(d.shop_type==1)?'当前经营':'已入驻'}}:{{d.enter_num}}</td>
<td></td>
<td>楼层:{{'楼层'}}</td>
<td></td>
</tr>
<tr>
......
......@@ -44,15 +44,7 @@
.input {
width: 16%!important;
}
/*.text-left {
float: left;
display: inline-block;
height: 26px;
line-height: 26px;
font-size: 14px;
}
*/
.text-right {
float: right;
display: inline-block;
......@@ -346,7 +338,7 @@
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" 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_date" name="end_date" type="date">
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="house_id" placeholder="房源ID" type="phone" value="">-->
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="call_id" placeholder="通话ID" type="phone" value="">
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
......@@ -354,12 +346,12 @@
</td>
</tr>
<tr>
<th class="text-center">通话ID</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>
......
......@@ -132,6 +132,11 @@
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="bargain_id" placeholder="成交报告id" type="text" value="">
<div class="clear"></div>
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_user_ID" placeholder="客户ID" type="text" value="">
<select class="form-control btn2" id="isPayment">
<option value="-1">是否收款</option>
<option value="1"></option>
<option value="0"></option>
</select>
<span class="total-commission">应收佣金总计:<span class="total-commission-should"></span></span>
<span class="total-commission">已收佣金总计:<span class="total-commission-real"></span></span>
<span class="total-commission">未收佣金总计:<span class="total-commission-no">0</span></span>
......
......@@ -279,7 +279,7 @@
<thead>
<tr class="maintable-tr-bar">
<th class="text-center">收款ID</th>
<!--<th class="text-center">成交报告ID</th>-->
<th class="text-center">成交报告ID</th>
<th class="text-center">成交商铺地址</th>
<th class="text-center">成交价</th>
<th class="text-center">应收金额</th>
......@@ -309,7 +309,7 @@
<thead>
<tr class="maintable-tr-bar">
<th class="text-center">收款ID</th>
<!--<th class="text-center">成交报告ID</th>-->
<th class="text-center">成交报告ID</th>
<th class="text-center">成交商铺地址</th>
<th class="text-center">应收案场费</th>
<th class="text-center">本次收佣</th>
......
......@@ -124,6 +124,9 @@
<label class="checkbox-inline">
<input type="checkbox" class="yetai" value="其他">其他
</label>
<!--楼层新增-->
<label style="margin-left: 128px;">楼层:</label>
<input type="text" class="form-control" id="loucengfloor" placeholder="请输入楼层" data-alert="请输入楼层!">
</li>
<li class="list-group-item">
<div class="suitable-yetai">
......
......@@ -218,7 +218,7 @@
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<td colspan="12">
<td colspan="16">
<form id="form_search">
<div class="col-xs-12" style="padding:0px">
<select class="form-control btn2-city shop_city_choose_site_list"></select>
......@@ -332,13 +332,14 @@
<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>
</tr>
</thead>
......
......@@ -108,7 +108,10 @@
<span class="btn btn-info btn3" id="maintable_export">导出excel</span>
</div>
<div class="col-sm-4" style="float:right; text-align:right ; padding:15px 0px 0px">
<span class="margin-top-ld-mingxi">业绩总计:</span><span id="performance_subsidiary_total" class="margin-top-ld-mingxi"></span>
<span class="margin-top-ld-mingxi">业绩总计:</span><span id="performance_subsidiary_total" class="margin-top-ld-mingxi" style="margin-right: 15px;"></span>
<span class="margin-top-ld-mingxi">预分业绩总计:</span><span id="performance_subsidiary_total2" class="margin-top-ld-mingxi" style="margin-right: 15px;">666</span>
<span class="margin-top-ld-mingxi">未分业绩总计:</span><span id="performance_subsidiary_total3" class="margin-top-ld-mingxi" style="margin-right: 15px;">888</span>
</div>
</form>
</td>
......
......@@ -1579,7 +1579,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
var params = {
'pageNo': pageNo,
'pageSize': bargain.pageSize,
'shop_type': $('#maintable_shop_type').val(),
'shop_type': $('#maintable_shop_type').val(),//导出加是否收款
'create_time': $.trim($('#maintable_create_time').val()),
'end_time': $.trim($('#maintable_end_time').val()),
'internal_address': $.trim($('#maintable_internal_address').val()),
......
......@@ -26,6 +26,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
_exclusiveTypeObj = $('#exclusiveType'), //是否独家
_yetaiObj = $('.yetai'), //业态
_miankuanObj = $('#miankuan'),//面宽
_loucengfloorObj = $('#loucengfloor'),//楼层
_jinshenObj = $('#jinshen'),//进深
_dianliangObj = $('#dianliang'),//电量
_dianyaObj = $('#dianya'),//电压
......@@ -351,8 +352,8 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
_qianyueNianxianObj.val(_data['age_limit'].split('-')[0]); //签约年限上限
_qianyueNianxian2Obj.val(_data['age_limit'].split('-')[1]); //签约年限下限
_weilouLinkObj.val(_data['tiny_brochure_url']); //微楼书
_miankuanObj.val(_data['area_width']);//面宽
_loucengfloorObj.val('楼层');//楼层
_jinshenObj.val(_data['depth']);//进深
_dianliangObj.val(_data['electric_quantity']);//电量
_dianyaObj.val((_data['voltage']==220||_data['voltage']==380)?_data['voltage']:'');//电压
......@@ -1029,6 +1030,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
//多个input输入框验证
$.each([
_loucengfloorObj,//楼层
_miankuanObj, //面宽
_jinshenObj, //进深
_dianliangObj, //电量
......@@ -1288,6 +1290,8 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
'shop_sign': _roomTagArr.join(','),
'area_width':_miankuanObj.val(),
'area_width2':_loucengfloorObj.val(),//楼层
'depth':_jinshenObj.val(),
'electric_quantity':_dianliangObj.val(),
'voltage':_dianyaObj.val(),
......
......@@ -2,7 +2,7 @@
[% if(it[0]) { %]
[% for(var item in it){ %]
<tr class="text-center">
<!--<td>[%= it[item]['call_time'] %]</td>-->
<td>[%= it[item]['id'] %]</td>
<td>
[% if(it[item]['call_time'] != null) { %]
[%= it[item]['call_time'] %]
......
......@@ -5,7 +5,7 @@
[% for(var item in it){ %]
<tr>
<td>[%= it[item]['id'] %]</td>
<!--<td>[%= it[item]['bargain_id'] %]</td>-->
<td>[%= it[item]['bargain_id'] %]</td>
<td>[%= it[item]['house_address'] %]</td>
<td>[%= it[item]['price']%]</td>
<td>[%= (it[item]['price']*0.7).toFixed(2) %]</td>
......@@ -39,7 +39,7 @@
[% for(var item in it){ %]
<tr>
<td>[%= it[item]['id'] %]</td>
<!--<td>[%= it[item]['bargain_id'] %]</td>-->
<td>[%= it[item]['bargain_id'] %]</td>
<td>[%= it[item]['house_address'] %]</td>
<td>[%= it[item]['price']%]</td>
<td>[%= it[item]['money']%]</td>
......
......@@ -24,6 +24,8 @@
</td>
<td>[%= it[item]['disc'] %]</td>
<td>[%= hideStr(it[item]['internal_title']) %]</td>
<td>[%= '楼层' %]</td>
<td>
[% if (it[item]['rent_type'] == 1) { %]
[%= it[item]["rent_price"] / 100 %]
......@@ -58,7 +60,7 @@
无效
[% } %]
</td>
<td>[%= '是否对客户展示' %]</td>
<td>
[% if(it[item]["is_lock"] == 0 || check_auth('index/lockHouse') || it[item]["auth_edit_exclusive"] == 1 || it[item]["auth_edit_house"] == 1) { %]
......@@ -130,7 +132,7 @@
[% } %]
[% }else{ %]
<tr>
<td colspan="10" style="text-align:center;"> 暂无数据</td>
<td colspan="16" style="text-align:center;"> 暂无数据</td>
</tr>
[% } %]
</script>
\ No newline at end of file
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