Skip to content

T
tl_estate
Commit bcfb1703 authored by zw's avatar zw
Browse files
Options

Merge remote-tracking branch 'origin/1210-v3.0.2' into 1210-v3.0.2

parents 55c3e4b4 de4a509a
Show whitespace changes
Inline Side-by-side
Showing with 297 additions and 67 deletions
application/index/controller/Finance.php
View file @ bcfb1703
...@@ -3021,22 +3021,20 @@ class Finance extends Basic ...@@ -3021,22 +3021,20 @@ class Finance extends Basic
} }
if (!empty($this->params['march_id'])) { if (!empty($this->params['march_id'])) {
$where['c.id'] = $this->params['march_id']; $where['b.order_id'] = $this->params['march_id'];
} }
$field = 'a.create_time,a.id,c.id as march_id,a.paylog_id,a.money,b.income_time,a.type,a.new_paylog_id,a.operation_id,b.order_id'; $field = 'a.create_time,a.id,b.order_id,a.paylog_id,a.money,b.income_time,a.type,a.new_paylog_id,a.operation_id,b.order_id,e.house_id';
$list = $m_paylog->getAdjustmentListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where); $list = $m_paylog->getAdjustmentListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
$data['total'] = $m_paylog->getAdjustmentListTotal($where); $data['total'] = $m_paylog->getAdjustmentListTotal($where);
$m_agent = new AAgents(); $m_agent = new AAgents();
$m_house = new GHouses(); $m_house = new GHouses();
$m_order = new OrderModel();
foreach ($list as $k => $v) { foreach ($list as $k => $v) {
$list[$k]['name'] = $m_agent->getAgentsById($v['operation_id'], 'name'); $list[$k]['name'] = $m_agent->getAgentsById($v['operation_id'], 'name');
$house_id = $m_order->getFieldValue('house_id', ['id'=>$v['order_id']]); if ($v['house_id']) {
if ($house_id) { $house_data = $m_house->getHouseDetail('id,internal_address', ['id'=>$v['house_id']]);
$house_data = $m_house->getHouseDetail('id,internal_address', ['id'=>$house_id]);
$list[$k]['house_id'] = $house_data['id']; $list[$k]['house_id'] = $house_data['id'];
$list[$k]['address'] = $house_data['internal_address']; $list[$k]['address'] = $house_data['internal_address'];
} else { } else {
......
application/index/view/finance/adjustment.html
View file @ bcfb1703
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="comit_phone" placeholder="提交人手机号" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="comit_phone" placeholder="提交人手机号" type="text" value="">
<span class="btn btn-info btn3 ld-Marheight" id="search" style="float:left">搜索</span> <span class="btn btn-info btn3 ld-Marheight" id="search" style="float:left">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset" style="float:left">重置</span> <span class="btn btn-info btn3 ld-Marheight" id="reset" style="float:left">重置</span>
<span class="btn btn-info btn3 ld-Marheight" id="export" style="float:left">导出excel</span> <!--<span class="btn btn-info btn3 ld-Marheight" id="export" style="float:left">导出excel</span>-->
<span class="btn btn-info btn3 ld-Marheight" id="count" style="float:left">统计</span> <span class="btn btn-info btn3 ld-Marheight" id="count" style="float:left">统计</span>
<span class="money_total_two ld-Marheight " style="float:left">调整统计：</span><span style="float:left" id="money_total" class="money_total_two_shifu fore-span ld-Marheight">1268元</span> <span class="money_total_two ld-Marheight " style="float:left">调整统计：</span><span style="float:left" id="money_total" class="money_total_two_shifu fore-span ld-Marheight">1268元</span>
</form> </form>
......
application/index/view/finance/receivables.html
View file @ bcfb1703
...@@ -259,6 +259,17 @@ ...@@ -259,6 +259,17 @@
height:41px !important; height:41px !important;
width : 102px !important; width : 102px !important;
} }
.active {
color:dodgerblue;
}
#file_input_pic {
opacity: 0;
position: absolute;
top: 0;
left: 145px;
height: 35px;
width: 80px;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -406,7 +417,7 @@ ...@@ -406,7 +417,7 @@
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">调整后商铺ID:</span></strong> <strong><span class="col-xs-4 ld-Marheight">调整后商铺ID:</span></strong>
<span id="shop_id_change" class="col-xs-6 ld-Marheight">123456</span> <span id="shop_id_change" class="col-xs-6 ld-Marheight"></span>
</div> </div>
</div> </div>
<div class="col-xs-6"> <div class="col-xs-6">
...@@ -420,12 +431,12 @@ ...@@ -420,12 +431,12 @@
<strong><span class="col-xs-4 ld-Marheight">调整为:</span></strong> <strong><span class="col-xs-4 ld-Marheight">调整为:</span></strong>
<div class="col-xs-6"> <div class="col-xs-6">
<select class="form-control" id="change_type"> <select class="form-control" id="change_type">
<option class="yixiangjin" value="0">中介费</option> <option class="yixiangjin" value="91">中介费</option>
<option class="yixiangjin" value="1">案场费</option> <option class="yixiangjin" value="92">案场费</option>
<option class="yixiangjin" value="2">意向金</option> <option class="yixiangjin" value="10">意向金</option>
<option class="baoguanjin" value="0">中介费</option> <option class="baoguanjin" value="91">中介费</option>
<option class="baoguanjin" value="1">案场费</option> <option class="baoguanjin" value="92">案场费</option>
<option class="baoguanjin" value="2">保管金</option> <option class="baoguanjin" value="30">保管金</option>
</select> </select>
</div> </div>
</div> </div>
...@@ -433,21 +444,22 @@ ...@@ -433,21 +444,22 @@
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">调整金额(元):</span></strong> <strong><span class="col-xs-4 ld-Marheight">调整金额(元):</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="2018" id="change_price" /></div> <div class="col-xs-6"><input class="form-control" type="text" value="0" id="change_price" /></div>
<!--<strong><span class="col-xs-2 ld-Marheight">元</span></strong>--> <!--<strong><span class="col-xs-2 ld-Marheight">元</span></strong>-->
</div> </div>
</div> </div>
<div class="col-xs-12"> <div class="col-xs-12">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-2 ld-Marheight">成交报告ID:</span></strong> <strong><span class="col-xs-2 ld-Marheight">成交报告ID:</span></strong>
<div class="col-xs-9" style="padding:0px 10px 0px 5px;"><input class="form-control" type="text" value="2018" id="report_id_change" /> <div class="col-xs-9" style="padding:0px 10px 0px 5px;"><input class="form-control" type="text" value="" id="report_id_change" />
<ul class="reportArea" style="display:none"></ul></div> <ul class="reportArea" style="display:none"></ul></div>
</div> </div>
</div> </div>
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">调整后带看ID:</span></strong> <strong><span class="col-xs-4 ld-Marheight">调整后带看ID:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="2018" id="into_id_change" /></div> <!--<div class="col-xs-6"><input class="form-control" type="text" value="" id="into_id_change" readonly="true"/></div>-->
<span id="into_id_change" class="col-xs-6 ld-Marheight"></span>
</div> </div>
</div> </div>
<div class="col-xs-6 choose_topic_1"> <div class="col-xs-6 choose_topic_1">
...@@ -461,10 +473,18 @@ ...@@ -461,10 +473,18 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-6 choose_topic_2">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">商铺号:</span></strong>
<span id="shop_id_change_shop" class="col-xs-6 ld-Marheight"></span>
<!--<div class="col-xs-6"><input class="form-control" type="text" value="" id="" /></div>-->
</div>
</div>
<div class="col-xs-6 choose_topic_2"> <div class="col-xs-6 choose_topic_2">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">最后转定时间:</span></strong> <strong><span class="col-xs-4 ld-Marheight">最后转定时间:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="2018" id="change_time" /></div> <div class="col-xs-6"><input class="form-control" type="text" value="" id="change_time"
onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',minDate:'#F{ $dp.$D(\'comit_time_start\' )}',maxDate:'%y-%M-%d',readOnly:'readonly'})" /></div>
</div> </div>
</div> </div>
<!--上传图片--> <!--上传图片-->
...@@ -502,9 +522,33 @@ ...@@ -502,9 +522,33 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> × </button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true"> × </button>
<h4 class="modal-title"> 收款详情 </h4> <h4 class="modal-title tit_con active shoukuanxiangqing" style="width:auto!important;float:left">收款详情</h4>
<h4 class="modal-title tit_con" style="width:auto!important;float:left;margin-left:20px;">收款图片</h4>
</div>
<div class="modal-body modal-body-height pic-con1">
<ul class="list-group ">
<li class="list-group-item">
<div class="form-group full-width-100 full-pic-area">
<!--input上传图片-->
<div id="container_body">
<label>请选择一个图像文件：</label>
<button type="button btn2" class="btn btn-default">上传图片</button>
<input type="file" id="file_input_pic"/>
<div id="container_body_img_area"></div>
</div>
</div>
<ul class="img-pre-ul" id="xiangqing_pic_ul">
</ul>
</li>
</ul>
</div> </div>
<div class="modal-body modal-body-height"> <div class="modal-footer pic-con1">
<button type="button btn2" class="btn btn-primary" id="saveBtn" data-dismiss="modal">
保存
</button>
</div>
<div class="modal-body modal-body-height pic-con2">
<form class=""> <form class="">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="col-xs-3"> <div class="col-xs-3">
...@@ -550,7 +594,7 @@ ...@@ -550,7 +594,7 @@
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">提交时间:</span></strong> <strong><span class="col-xs-3 ld-Marheight">提交时间:</span></strong>
<span id="comit_time" class="col-xs-6 ld-Marheight">2018.12.12 10:00:00</span> <span id="comit_time" class="col-xs-6 ld-Marheight"></span>
</div> </div>
</div> </div>
<div class="col-xs-6"> <div class="col-xs-6">
...@@ -578,7 +622,7 @@ ...@@ -578,7 +622,7 @@
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">入账日期:</span></strong> <strong><span class="col-xs-3 ld-Marheight">入账日期:</span></strong>
<div class="col-xs-6"> <div class="col-xs-6">
<input class="form-control" type="text" value="2018.12.12" id="intoDate" <input class="form-control" type="text" value="" id="intoDate"
onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',maxDate:'%y-%M-%d',readOnly:true})"/> onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',maxDate:'%y-%M-%d',readOnly:true})"/>
</div> </div>
</div> </div>
...@@ -589,7 +633,7 @@ ...@@ -589,7 +633,7 @@
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">入账金额:</span></strong> <strong><span class="col-xs-3 ld-Marheight">入账金额:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="2018" id="intoPrice" /></div> <div class="col-xs-6"><input class="form-control" type="text" value="" id="intoPrice" /></div>
<strong><span class="col-xs-2 ld-Marheight">元</span></strong> <strong><span class="col-xs-2 ld-Marheight">元</span></strong>
</div> </div>
</div> </div>
...@@ -597,14 +641,14 @@ ...@@ -597,14 +641,14 @@
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">手续费:</span></strong> <strong><span class="col-xs-3 ld-Marheight">手续费:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="2018" id="shouxu" /></div> <div class="col-xs-6"><input class="form-control" type="text" value="" id="shouxu" /></div>
<strong><span class="col-xs-2 ld-Marheight">元</span></strong> <strong><span class="col-xs-2 ld-Marheight">元</span></strong>
</div> </div>
</div> </div>
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">实付金额:</span></strong> <strong><span class="col-xs-3 ld-Marheight">实付金额:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="2018" id="realPrice" /></div> <div class="col-xs-6"><input class="form-control" type="text" value="" id="realPrice" /></div>
<strong><span class="col-xs-2 ld-Marheight">元</span></strong> <strong><span class="col-xs-2 ld-Marheight">元</span></strong>
</div> </div>
</div> </div>
...@@ -612,7 +656,7 @@ ...@@ -612,7 +656,7 @@
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">应收金额:</span></strong> <strong><span class="col-xs-3 ld-Marheight">应收金额:</span></strong>
<!--<div class="col-xs-6"><input class="form-control" type="text" value="2018" id="getPrice" /></div>--> <!--<div class="col-xs-6"><input class="form-control" type="text" value="" id="getPrice" /></div>-->
<span id="getPrice" class=" col-xs-6 ld-Marheight"></span> <span id="getPrice" class=" col-xs-6 ld-Marheight"></span>
<!--<strong><span class="col-xs-2 ld-Marheight">元</span></strong>--> <!--<strong><span class="col-xs-2 ld-Marheight">元</span></strong>-->
</div> </div>
...@@ -620,7 +664,7 @@ ...@@ -620,7 +664,7 @@
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">多收金额:</span></strong> <strong><span class="col-xs-3 ld-Marheight">多收金额:</span></strong>
<!--<div class="col-xs-6"><input class="form-control" type="text" value="2018" id="morePrice" /></div>--> <!--<div class="col-xs-6"><input class="form-control" type="text" value="" id="morePrice" /></div>-->
<span id="morePrice" class=" col-xs-6 ld-Marheight"></span> <span id="morePrice" class=" col-xs-6 ld-Marheight"></span>
<!--<strong><span class="col-xs-2 ld-Marheight">元</span></strong>--> <!--<strong><span class="col-xs-2 ld-Marheight">元</span></strong>-->
</div> </div>
...@@ -648,7 +692,7 @@ ...@@ -648,7 +692,7 @@
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">最后转定时间:</span></strong> <strong><span class="col-xs-3 ld-Marheight">最后转定时间:</span></strong>
<div class="col-xs-6"> <div class="col-xs-6">
<input class="form-control" type="text" value="2018" id="lastTime" <input class="form-control" type="text" value="" id="lastTime"
onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',maxDate:'%y-%M-%d',readOnly:true})"/> onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',maxDate:'%y-%M-%d',readOnly:true})"/>
</div> </div>
</div> </div>
...@@ -677,7 +721,7 @@ ...@@ -677,7 +721,7 @@
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">转账户名:</span></strong> <strong><span class="col-xs-3 ld-Marheight">转账户名:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="2018" id="payNo" /></div> <div class="col-xs-6"><input class="form-control" type="text" value="" id="payNo" /></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -720,7 +764,7 @@ ...@@ -720,7 +764,7 @@
</div> </div>
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer pic-con2">
<button type="button btn2" class="btn btn-primary" id="savePayBtn" data-dismiss="modal"> <button type="button btn2" class="btn btn-primary" id="savePayBtn" data-dismiss="modal">
保存 保存
</button> </button>
......
application/model/OPayLogAdjustment.php
View file @ bcfb1703
...@@ -115,7 +115,6 @@ class OPayLogAdjustment extends BaseModel{ ...@@ -115,7 +115,6 @@ class OPayLogAdjustment extends BaseModel{
return $this->db_->field($field) return $this->db_->field($field)
->alias("a") ->alias("a")
->join("o_paylog b", "a.paylog_id = b.id", "left") ->join("o_paylog b", "a.paylog_id = b.id", "left")
->join("o_march_in c", "b.order_id = c.id", "left")
->join("a_agents d", "a.operation_id = d.id", "left") ->join("a_agents d", "a.operation_id = d.id", "left")
->join("o_order e", "b.order_id = e.id") ->join("o_order e", "b.order_id = e.id")
->limit($pageSize) ->limit($pageSize)
...@@ -132,7 +131,6 @@ class OPayLogAdjustment extends BaseModel{ ...@@ -132,7 +131,6 @@ class OPayLogAdjustment extends BaseModel{
public function getAdjustmentListTotal($params) { public function getAdjustmentListTotal($params) {
return $this->db_->alias('a') return $this->db_->alias('a')
->join("o_paylog b", "a.paylog_id = b.id", "left") ->join("o_paylog b", "a.paylog_id = b.id", "left")
->join("o_march_in c", "b.order_id = c.id", "left")
->join("a_agents d", "a.operation_id = d.id", "left") ->join("a_agents d", "a.operation_id = d.id", "left")
->join("o_order e", "b.order_id = e.id") ->join("o_order e", "b.order_id = e.id")
->where($params) ->where($params)
...@@ -148,7 +146,6 @@ class OPayLogAdjustment extends BaseModel{ ...@@ -148,7 +146,6 @@ class OPayLogAdjustment extends BaseModel{
public function getMoneyTotal($params) { public function getMoneyTotal($params) {
return $this->db_->alias('a') return $this->db_->alias('a')
->join("o_paylog b", "a.paylog_id = b.id", "left") ->join("o_paylog b", "a.paylog_id = b.id", "left")
->join("o_march_in c", "b.order_id = c.id", "left")
->join("a_agents d", "a.operation_id = d.id", "left") ->join("a_agents d", "a.operation_id = d.id", "left")
->join("o_order e", "b.order_id = e.id") ->join("o_order e", "b.order_id = e.id")
->where($params) ->where($params)
......
public/app/dist/index.html
View file @ bcfb1703
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
if(!doc.addEventListener) return; if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false); win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false); doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.18f66e05aeedf4028dbf86453eab6b23.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.567a6c20050f5f09e0f5.js></script></body></html> })(document, window);</script><link href=./static/css/app.a73181a8689d77665f3ecd7635761082.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.d14e5a4ffd862ad14d96.js></script></body></html>
\ No newline at end of file \ No newline at end of file
public/app/dist/static/js/app.567a6c20050f5f09e0f5.js deleted 100644 → 0
View file @ 55c3e4b4
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.d14e5a4ffd862ad14d96.js 0 → 100644
View file @ bcfb1703
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/js/detaila_tuiguang.js
View file @ bcfb1703
...@@ -424,7 +424,7 @@ ...@@ -424,7 +424,7 @@
}); });
//点击 商铺详情的 更多商铺 //点击 商铺详情的 更多商铺
$('.shop-list').click(function() { $('.shop-list').click(function() {
location.href = ServerHost + "/app/dist/#/shopList?city=" + p_city +'&type=' + p_type +'&p_district_id=' + p_district_id+'&p_store_id=' + p_store_id +'&p_agent_id=' + p_agent_id+'&generalizeId=' + generalize_id; location.href = ServerHost + "/app/dist/#/shopList?city=" + p_city +'&type=' + p_type +'&p_district_id=' + p_district_id+'&p_store_id=' + p_store_id +'&p_agent_id=' + p_agent_id+'&generalizeId=' + generalize_id+'&redBag=1';
}); });
}else if(pc_isOfficial){ }else if(pc_isOfficial){
$('.pc-contact-agent').show(); $('.pc-contact-agent').show();
......
public/appnew/config/index.js
View file @ bcfb1703
...@@ -13,7 +13,7 @@ module.exports = { ...@@ -13,7 +13,7 @@ module.exports = {
proxyTable: {}, proxyTable: {},
// Various Dev Server settings // Various Dev Server settings
host: '192.168.0.74', // can be overwritten by process.env.HOST host: '192.168.0.91', // can be overwritten by process.env.HOST
port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true, autoOpenBrowser: true,
errorOverlay: true, errorOverlay: true,
......
public/appnew/src/components/shop/redPackMask.vue
View file @ bcfb1703
<template> <template>
<div class="red-pack-mask flex-center"> <div class="red-pack-mask flex-center">
<div> <div>
<div class="red-pack-area"></div> <div class="red-pack-area" @click="tabFivePage">
<!--<div class="immediately-to-receive" @click="tabFivePage"></div>-->
</div>
<div class="close-btn-area" @click="closeClick"></div> <div class="close-btn-area" @click="closeClick"></div>
</div> </div>
</div> </div>
...@@ -45,6 +47,9 @@ ...@@ -45,6 +47,9 @@
methods: { methods: {
closeClick() { closeClick() {
this.$emit('closeclick'); this.$emit('closeclick');
},
tabFivePage() {
this.$emit('tabFivePage');
} }
} }
} }
...@@ -66,6 +71,7 @@ ...@@ -66,6 +71,7 @@
height: 6.9rem; height: 6.9rem;
background: url(images/img@2x.png) no-repeat center center/5.92rem 6.9rem; background: url(images/img@2x.png) no-repeat center center/5.92rem 6.9rem;
margin-bottom: 1.46rem; margin-bottom: 1.46rem;
position: relative;
} }
.close-btn-area{ .close-btn-area{
...@@ -74,4 +80,15 @@ ...@@ -74,4 +80,15 @@
background: url(images/icon_close@2x.png) no-repeat center center/.72rem .72rem; background: url(images/icon_close@2x.png) no-repeat center center/.72rem .72rem;
margin: 0 auto; margin: 0 auto;
} }
.immediately-to-receive{
width: 4.3rem;
height: .9rem;
position: absolute;
bottom: 0.5rem;
right: .8rem;
z-index: 999;
cursor: pointer;
opacity: 0;
/*background: #ccc;*/
}
</style> </style>
\ No newline at end of file
public/appnew/src/components/shop/shopList.vue
View file @ bcfb1703
...@@ -83,11 +83,11 @@ ...@@ -83,11 +83,11 @@
</div> </div>
<div class="mark-shop-choose-gray" v-for="(item, index) in mainDataChoose" v-show="(initTabNumMainChoose == index) && item.isShow" @click="tabMainChoose(index)"> <div class="mark-shop-choose-gray" v-for="(item, index) in mainDataChoose" v-show="(initTabNumMainChoose == index) && item.isShow" @click="tabMainChoose(index)">
</div> </div>
<div class="to-five-page" v-if='isGif' @click="tabFivePage()"> <!--<div class="to-five-page" v-if='isGif' @click="tabFivePage()">
<img :src="gif_img" class="to-five-page-img"/> <img :src="gif_img" class="to-five-page-img"/>
</div> </div>-->
<red-pack-mask @closeclick="showRedPackMask = false" v-if="showRedPackMask" @tabFivePage="tabFivePage"></red-pack-mask>
<red-pack-mask @closeclick="showRedPackMask = false" v-if="showRedPackMask"></red-pack-mask>
</div> </div>
</template> </template>
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
'isShow': false, 'isShow': false,
}], }],
showRedPackMask: true,//是否显示红包弹窗 showRedPackMask: false,//是否显示红包弹窗
}), }),
created() { created() {
let _this = this; let _this = this;
...@@ -196,6 +196,12 @@ ...@@ -196,6 +196,12 @@
_this.p_agent_id = _this.$route.query.p_agent_id; _this.p_agent_id = _this.$route.query.p_agent_id;
_this.generalizeId = _this.$route.query.generalizeId; _this.generalizeId = _this.$route.query.generalizeId;
_this.site_area = 6; _this.site_area = 6;
if(_this.$route.query.redBag){
_this.showRedPackMask = false;
}else{
_this.showRedPackMask = true;
}
}; };
//H5 官网 //H5 官网
if(_this.$route.query.isOfficial){ if(_this.$route.query.isOfficial){
...@@ -508,8 +514,9 @@ ...@@ -508,8 +514,9 @@
}, },
//到500代金券 //到500代金券
tabFivePage(){ tabFivePage(){
console.log(555)
let _this = this; let _this = this;
var str1 = this.common.ServerHost + "/app/baidu_send?" +'city=' + _this.$route.query.city +'&type=' + _this.$route.query.type +'&p_district_id=' + _this.$route.query.p_district_id+'&p_store_id=' + _this.$route.query.p_store_id +'&p_agent_id=' + _this.$route.query.p_agent_id+'&generalizeId=' + _this.$route.query.generalizeId; var str1 = this.common.ServerHost + "/app/baidu_send?" +'city=' + _this.$route.query.city +'&type=' + _this.$route.query.type +'&p_district_id=' + _this.$route.query.p_district_id+'&p_store_id=' + _this.$route.query.p_store_id +'&p_agent_id=' + _this.$route.query.p_agent_id+'&generalizeId=' + _this.$route.query.generalizeId+'&redBag=1';
location.href = str1; location.href = str1;
}, },
delMore(){ delMore(){
......
public/resource/js/receivables.js
View file @ bcfb1703
...@@ -5,6 +5,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -5,6 +5,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
pageSize: 10, pageSize: 10,
/*每页显示多少条*/ /*每页显示多少条*/
id: '', id: '',
house_fatherid :'',
house_id: '', house_id: '',
house_fatherid: '', house_fatherid: '',
collection_del_id:'', collection_del_id:'',
...@@ -14,6 +15,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -14,6 +15,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
order_id : '' , order_id : '' ,
order_no : '', order_no : '',
report_id : '' , report_id : '' ,
pay_type : '' ,
type_num : '' ,
houseNmuber : '' ,
init: function() { init: function() {
//初始化dot //初始化dot
$(document.body).append(template); $(document.body).append(template);
...@@ -23,6 +27,123 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -23,6 +27,123 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
event: function() { event: function() {
var that = receiv; var that = receiv;
var _doc = $(document); var _doc = $(document);
$('.pic-con2').show();
$('.pic-con1').hide();
$('.tit_con').unbind('click').bind('click',function(e){
$(this).parent('div').find('h4.active').removeClass("active");
$(this).addClass("active");
if (e.currentTarget.innerHTML == "收款图片"){
$('.pic-con1').show();
$('.pic-con2').hide();
} else {
$('.pic-con2').show();
$('.pic-con1').hide();
}
});
$('#file_input_pic').on('change', function(){
var _this = $(this);
var formData = new FormData();
formData.append('type', 'chat');
formData.append('image', _this[0].files[0]);
$.ajax({
type: 'post',
url: '/index/uploadImg',
data: formData,
dataType: 'json',
contentType: false,
cache: false,
processData: false,
beforeSend: function() {},
success: function(_data) {
if(_data.code == 200) {
$('#container_body_img_area').append('<div class="result"><img data-imgname="{0}" src="{1}" alt=""/> <span class="span-del">删除</span></div>'.stringFormatObj({
'0': _data.data.img_path,
'1': _data.data.internet_img_name?urlDeal(_data.data.internet_img_name):_data.data.internet_img_name
}));
} else {
alert(_data.msg);
};
},
error: function() {
alert('enter error');
},
complete: function(xhr, textStatus) {
if(textStatus === 'timeout') {
//处理超时的逻辑
alert('请求超时,请重试');
};
}
});
});
//图片删除事件
_doc.on('click', '.span-del', function(e) {
e.preventDefault();
e.stopPropagation();
$(this).parent().remove();
});
//图片删除，已有的则调用接口删除
_doc.on('click', '.span-del2', function(e) {
var _this = $(this);
e.preventDefault();
e.stopPropagation();
if(confirm('确认删除吗?')){
_this.parent().remove();
that.spandelList(_this.prev().attr('data-imgid'));
};
});
//保存上传的图片
_doc.on('click', '#saveBtn', function(e) {
var _this = $(this);
e.preventDefault();
e.stopPropagation();
var imgname = [];
for(var i = 0; i < $('.result').length; i++) {
imgname[i] = $('.result>img').eq(i).attr('data-imgname');
};
console.log(imgname.join(','));
var id_pic = that.house_fatherid > 0?that.house_fatherid:that.house_id;
var _data = {
img_id: id_pic
};
//无新的图片上传 不调用接口
if(imgname.join(',')) {
_data['img_name'] = imgname.join(',');
} else {
return
};
$.ajax({
type: 'GET',
url: '/index/addReceiptImg',
data: _data,
dataType: 'json',
beforeSend: function() {},
success: function(_data) {
if(typeof _data === 'object') {
alert('保存成功');
$('#container_body_img_area').html("");
$('.pic-con2').show();
$('.pic-con1').hide();
$('.active').removeClass("active");
$('.shoukuanxiangqing').addClass("active");
that.getList(0);
} else {
alert('数据错误');
};
},
error: function() {
alert('enter error');
},
complete: function(xhr, textStatus) {
if(textStatus === 'timeout') {
//处理超时的逻辑
alert('请求超时,请重试');
};
}
});
});
//操作----时间轴 //操作----时间轴
$(document).on('click','.timeline',function(e){ $(document).on('click','.timeline',function(e){
...@@ -35,23 +156,27 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -35,23 +156,27 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
$(document).on('click','.add-pic',function(e){ $(document).on('click','.add-pic',function(e){
var id = e.target.dataset.id; var id = e.target.dataset.id;
that.getMoneyDetail(id); that.getMoneyDetail(id);
that.house_fatherid = id;
console.log(id) console.log(id)
}); });
//操作---调整 //操作---调整
$(document).on('click','.money_change',function(e){ $(document).on('click','.money_change',function(e){
var id = e.target.dataset.id; var id = e.target.dataset.id;
var type = e.target.dataset.type ; var type = e.target.dataset.type ;
// var item = e.target.dataset.item ;
var order_id = e.target.dataset.order_id ; var order_id = e.target.dataset.order_id ;
that.type_num = e.target.dataset.type_num
that.order_id = order_id ; that.order_id = order_id ;
that.order_no = e.target.dataset.order_no ; that.order_no = e.target.dataset.order_no ;
that.report_id = e.target.dataset.report_id; that.report_id = e.target.dataset.report_id;
that.agent_id = e.target.dataset.agent_id; that.agent_id = e.target.dataset.agent_id;
that.pay_type = e.target.dataset.pay_type;
that.getAllPrice(id); that.getAllPrice(id);
if ( type == "意向金" ){ if ( type == "意向金" ){
$('#change_type').val(91);
$('.baoguanjin').hide(); $('.baoguanjin').hide();
$('.yixiangjin').show(); $('.yixiangjin').show();
} else { } else {
$('#change_type').val(91);
$('.yixiangjin').hide(); $('.yixiangjin').hide();
$('.baoguanjin').show(); $('.baoguanjin').show();
} }
...@@ -88,10 +213,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -88,10 +213,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
}); });
//调整 //调整
$("#modal-linetime").on("shown.bs.modal", function(event){ $("#modal-linetime").on("shown.bs.modal", function(event){
//初始化...
//initMoadalData //initMoadalData
that.change_show_hide($('#change_type option:selected').text()); that.change_show_hide($('#change_type option:selected').text());
$('#saveChangeBtn').one('click',function(e){ $('#saveChangeBtn').unbind('click').bind('click',function(e){
that.saveChange(); that.saveChange();
}); });
...@@ -166,6 +293,23 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -166,6 +293,23 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
}); });
}, },
spandelList: function(n) { //删除已经保存的图片都调用
$.ajax({
'type': 'POST',
'url': '/index/deleteReceiptImg',
data: {
id: n
},
dataType: "json",
success: function(data) {
if(data.code == 200) {
} else {}
}
});
},
//将li里的值 赋给input（分佣方姓名） //将li里的值 赋给input（分佣方姓名）
reportIdBuild: function(obj) {//新增客户 input赋值 reportIdBuild: function(obj) {//新增客户 input赋值
var that = receiv ; var that = receiv ;
...@@ -176,6 +320,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -176,6 +320,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
$(".reportArea").html(''); $(".reportArea").html('');
$('.reportArea').hide(); $('.reportArea').hide();
$('#shop_addr_change').text($(obj).attr("data-addr")); $('#shop_addr_change').text($(obj).attr("data-addr"));
$('#into_id_change').text($(obj).attr("data-order_id"));
$('#shop_id_change_shop').text($(obj).attr("data-house_number"));
that.houseNmuber = $(obj).attr("data-house_number");
}, },
search_phone : function(){ search_phone : function(){
...@@ -198,7 +345,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -198,7 +345,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
if(data.code == 200) { if(data.code == 200) {
var user_ul = ""; var user_ul = "";
$.each(data.data.result, function(i, item) { $.each(data.data.result, function(i, item) {
user_ul += '<li class="reportIdBuild" data-addr="'+item.internal_address+'" data-id="' + item.id + '">' + item.internal_address + ',商铺ID：' + item.house_id + '，成交报告ID' + item.id + '，成交价：' + item.price + '，佣金'+ item.commission +'</li>'; user_ul += '<li class="reportIdBuild" data-house_number="'+item.house_number+'"data-order_id="'+item.order_id+'" data-addr="'+item.internal_address+'" data-id="' + item.id + '">' + item.internal_address + ',商铺ID：' + item.house_id + '，成交报告ID' + item.id + '，成交价：' + item.price + '，佣金'+ item.commission +'</li>';
}); });
$('.reportArea').show(); $('.reportArea').show();
$(".reportArea").html(user_ul); $(".reportArea").html(user_ul);
...@@ -330,31 +477,51 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -330,31 +477,51 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
'report_id' : that.report_id_a ? that.report_id_a : that.report_id, 'report_id' : that.report_id_a ? that.report_id_a : that.report_id,
'industry_type' : that.yetai 'industry_type' : that.yetai
}; };
var jsonArray = [] ;
if ($('#shop_id_change').text()){//商铺ID
params.house_number = $('#shop_id_change').text()
};
var obj = { var obj = {
'pay_type' :10 'pay_type' : that.pay_type
}; };
if ($('#change_type').val()){//调整类型 if ($('#change_type').val()){//调整类型
obj.type = $('#change_type').val() obj.type = that.type_num;
//$('#change_type').val()
}; };
//拼接jsonArray to jsonObject
if ($('#change_price').val()){//调整金额 if ($('#change_price').val()){//调整金额
if ( $('#change_price').val() > 0 ){ if ( $('#change_price').val() > 0 ){
if ($('#change_price').val() -$('#could_price').text() > 0 ){ if ($('#change_price').val() -$('#could_price').text() > 0 ){
alert("超出最大限额"); alert("超出最大限额");
return false;
} else { obj.money = $('#change_price').val();}
} else { } else {
obj.money = $('#change_price').val() alert('请选择调整金额');
return false;
} }
};
var jsonArray = [] ;
jsonArray.push(obj);
params.collecting_bill = JSON.stringify(jsonArray) ;
//条件验证
params.house_number = that.houseNmuber;
if ( $('#change_type').val() == 10 || $('#change_type').val() == 30 ){
if ($('#change_time').val()){//最后转定时间
params.last_transfer_time = $('#change_time').val()
};
// if ($('#shop_id_change_shop').text()){//商铺号
//
// };
} else { } else {
alert('请选择调整金额') if ($('#change_fenhong').text()){//分红
params.is_dividend = $('#change_fenhong').val()
};
} }
if ($('#into_id_change').val()){//带看id
params.into_id_change = $('#into_id_change').val()
}; };
jsonArray.push(obj);
params.collecting_bill = jsonArray ;
//图片数据处理
var pictures = $('.img_area').find('.pictures'); var pictures = $('.img_area').find('.pictures');
var picName = ""; var picName = "";
pictures.each(function(i,event){ pictures.each(function(i,event){
...@@ -364,15 +531,13 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -364,15 +531,13 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
alert("请选择图片"); alert("请选择图片");
return false ; return false ;
} else { } else {
params.picName = picName.substr(0,picName.length-1); params.picName = JSON.stringify(picName.substr(0,picName.length-1).split(","));
} }
console.log(picName.substr(0,picName.length-1));
console.log(params);
//上传数据
$.post('/index/collectingBill',params,function( data ){ $.post('/index/collectingBill',params,function( data ){
console.log(data); console.log(data);
$('modal-linetime').modal('hide'); $('#modal-linetime').modal('hide');
},'json'); },'json');
}, },
...@@ -662,9 +827,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -662,9 +827,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
var that = receiv; var that = receiv;
console.log("delete the row from the table while id = " + id ); console.log("delete the row from the table while id = " + id );
var params = { var params = {
'id' : id 'pay_id' : id
}; };
$.post('/index/delAdjustment',params , function(data){ $.post('/index/delPayLog',params , function(data){
console.log(data); console.log(data);
that.getList(1); that.getList(1);
},'json') },'json')
......
public/resource/template/adjustment_template_tpl.html
View file @ bcfb1703
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<tr class="text-center"> <tr class="text-center">
<td>[%= it[item]['create_time'] %]</td> <td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['id'] %]</td> <td>[%= it[item]['id'] %]</td>
<td>[%= it[item]['march_id'] %]</td> <td>[%= it[item]['order_id'] %]</td>
<td>[%= it[item]['paylog_id'] %]</td> <td>[%= it[item]['paylog_id'] %]</td>
<td>[%= it[item]['house_id'] %]</td> <td>[%= it[item]['house_id'] %]</td>
<td>[%= it[item]['address'] %]</td> <td>[%= it[item]['address'] %]</td>
......
public/resource/template/receivables_template_tpl.html
View file @ bcfb1703
...@@ -26,9 +26,10 @@ ...@@ -26,9 +26,10 @@
<td> <td>
<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a> <a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
<a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收款详情</a> <a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收款详情</a>
[% if( it[item]['type'] == "意向金" || it[item]['type'] == "保管金" ) { %] [% if( it[item]['type_num'] == 10 || it[item]['type_num'] == 30 ) { %]
<a class="btn1 btn-success money_change" href="#modal-linetime" data-toggle="modal" data-order_id=[%= it[item]['order_id'] %] <a class="btn1 btn-success money_change" href="#modal-linetime" data-toggle="modal" data-order_id='[%= it[item]['order_id'] %]'
data-agent_id = '[%= it[item]['agent_id'] %]' data-report_id='[%= it[item]['report_id'] %]' data-agent_id = '[%= it[item]['agent_id'] %]' data-report_id='[%= it[item]['report_id'] %]' data-pay_type='[%= it[item]['pay_type_num'] %]'
data-type_num = '[%= it[item]['type_num'] %]'
data-industry_type='[%= it[item]['industry_type'] %]' data-report='[%= it[item]['report_id'] %]' data-order_no = '[%= it[item]['order_no'] %]' data-industry_type='[%= it[item]['industry_type'] %]' data-report='[%= it[item]['report_id'] %]' data-order_no = '[%= it[item]['order_no'] %]'
data-type='[%= it[item]['type'] %]' data-id='[%= it[item]["id"]%]'>调整</a> data-type='[%= it[item]['type'] %]' data-id='[%= it[item]["id"]%]'>调整</a>
[% } %] [% } %]
......
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