Skip to content

T
tl_estate
Commit 0febfd2f authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/0731-v3.3.6' into 0731-v3.3.6

parents d2f19601 2c13e103
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 26 deletions
application/api_broker/controller/Shop.php
View file @ 0febfd2f
......@@ -728,8 +728,6 @@ class Shop extends Basic
}
}
//独家方
// $result['exclusive_info'] = $this->getExclusiveInfo($result['id'], 3);
//案场权限人
$result['stronghold_info'] = $this->getExclusiveInfo($result['id']);
......@@ -737,6 +735,11 @@ class Shop extends Basic
return $this->response("200", 'request success', $result);
}
/**
* 案场权限人
* @param $house_id
* @return null|string
*/
public function getExclusiveInfo($house_id)
{
// $m_agent_house = new GHousesToAgents();
......
application/app_broker/view/index/shop_detail_pc.html
View file @ 0febfd2f
......@@ -170,7 +170,7 @@
<div class="fl">案场权限人：</div>
<div class="fl">
<ul class="oh phone-list">
<li class="fl oh" v-for="(item, index) in d.panParty" :key="index" :data-id="item.phone">{{item.name+'-'+item.phone}}</li>
<li class="fl oh">{{d.stronghold_info}}</li>
</ul>
</div>
</td>
......
application/index/controller/ReceiptOperatingRecords.php
View file @ 0febfd2f
......@@ -19,6 +19,31 @@ class ReceiptOperatingRecords extends Basic
$this->m_receipt_operating_records = new GReceiptOperatingRecords();
}
/**
* 新增记录
* @param $agents_id
* @param $type
* @param $remark
* @param $house_id
* @return bool
*/
public function addOperating($agents_id,$type,$remark,$house_id)
{
$data["agents_id"] = $agents_id;
$data["type"] = $type;
$data["remark"] = $remark;
$data["house_id"] = $house_id;
$result = $this->m_receipt_operating_records->saveOperating($data);//int(1)
if ($result) {
return true;
} else {
return false;
}
}
/**
* 收款操作记录
......
application/index/view/finance/daily_details.html
View file @ 0febfd2f
......@@ -949,8 +949,9 @@
<div class="form-group full-width-100 full-pic-area">
<span style="position: relative;top: 0px;">申请类型<span class="text-danger">(必填)</span>：</span><select style="height: 30px;" class="type-financial-open">
<option value="">请选择</option>
<option value="1">和该地址相关的收款全部开业</option>
<option value="2">该笔收款单独开业</option>
<option value="1">该笔收款单独开业</option>
<option value="2">和该地址相关的收款全部开业</option>
</select>
</div>
<div class="form-group full-width-100 full-pic-area">
......
application/index/view/officeBuilding/getCollectionShop.html
View file @ 0febfd2f
......@@ -1339,8 +1339,9 @@
<div class="form-group full-width-100 full-pic-area">
<span style="position: relative;top: 0px;">申请类型<span class="text-danger">(必填)</span>：</span><select style="height: 30px;" class="type-financial-open">
<option value="">请选择</option>
<option value="1">和该地址相关的收款全部开业</option>
<option value="2">该笔收款单独开业</option>
<option value="1">该笔收款单独开业</option>
<option value="2">和该地址相关的收款全部开业</option>
</select>
</div>
<div class="form-group full-width-100 full-pic-area">
......
application/model/GReceiptOperatingRecords.php
View file @ 0febfd2f
......@@ -17,13 +17,11 @@ class GReceiptOperatingRecords extends Model
$this->db_ = Db::name($this->table);
}
// public function saveOperating($data) {
// $time = date("Y-m-d H:i:s", time());
// $data['create_time'] = $time;
// $data['update_time'] = $time;
// $data['is_del'] = 0;
// return $this->db_ ->insert($data);
// }
public function saveOperating($data) {
$time = date("Y-m-d H:i:s", time());
$data['create_time'] = $time;
return $this->db_ ->insert($data);
}
/**
......
public/resource/js/financial_manager_daily_list.js
View file @ 0febfd2f
......@@ -481,12 +481,20 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
house_id: bargain.house_id_open,
house_address: bargain.house_address_open,
agent_id: user_info_obj.id,
intro:$(".remark-financial-open").val()
intro:$(".remark-financial-open").val(),
type:$(".type-financial-open").val()
};
//无新的图片上传 不调用接口
if(imgname.join(',')) {
_data['open_img'] = JSON.stringify(imgname);;
}
if(!($(".type-financial-open").val())){
alert('请选择申请开业类型');
return;
}
if(!($(".remark-financial-open").val())){
alert('请填写开业说明');
return;
......
public/resource/js/getCollectionShop.js
View file @ 0febfd2f
......@@ -226,12 +226,18 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
house_id: bargain.house_id_open,
house_address: bargain.house_address_open,
agent_id: user_info_obj.id,
intro:$(".remark-financial-open").val()
intro:$(".remark-financial-open").val(),
type:$(".type-financial-open").val()
};
//无新的图片上传 不调用接口
if(imgname.join(',')) {
_data['open_img'] = JSON.stringify(imgname);;
}
if(!($(".type-financial-open").val())){
alert('请选择申请开业类型');
return;
}
if(!($(".remark-financial-open").val())){
alert('请填写开业说明');
return;
......
public/resource/js/receivingLog.js
View file @ 0febfd2f
......@@ -25,11 +25,12 @@ define(['doT', 'text!temp/receiving_log_template_tpl.html', 'css!style/home.css'
var params = {};
params.pageNo = bargain.pageNo;
params.pageSize = bargain.pageSize;
params.create_time = $('#create_time') .val();
params.end_time = $('#end_time') .val();
params.start_date = $('#create_time') .val();
params.end_date = $('#end_time') .val();
params.pay_log_id = $('#house_id') .val();
$.ajax({
url: '/index/partialCommissionList', //获取列表
type: 'GET',
url: '/index/receiptOperatingRecordsList', //获取列表
type: 'POST',
async: true,
data: params,
dataType: 'json',
......@@ -37,10 +38,9 @@ define(['doT', 'text!temp/receiving_log_template_tpl.html', 'css!style/home.css'
if (data.code == 200) {
var temp = document.getElementById('receiving_log_list_tpl').innerHTML;
var doTtmpl = doT.template(temp);
$("#business_list").html(doTtmpl(data.data.data.list));
$("#money_total").html(data.data.data.total_money);//实收总计
$("#business_list").html(doTtmpl(data.data.list));
/*分页代码*/
add_page(data.data.data.total, pageNo, bargain.pageSize, bargain.getList);
add_page(data.data.total, pageNo, bargain.pageSize, bargain.getList);
} else {
alert(data.msg);
}
......
public/resource/template/receiving_log_template_tpl.html
View file @ 0febfd2f
......@@ -2,9 +2,9 @@
[% if(it&&it[0]) { %]
[% for(var item in it){ %]
<tr class="text-center" data-id="[%= it[item]['bargain_id'] %]" data-orderid="[%= it[item]['order_id'] %]" data-fatherid="[%= it[item]['father_id'] %]">
<td>[%= it[item]['district_store'] %]</td>
<td>[%= it[item]['agent'] %]</td>
<td>[%= it[item]['internal_address'] %]</td>
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['remark'] %]</td>
<td>[%= it[item]['agents_name'] %]-[%= it[item]['agents_phone'] %]</td>
</tr>
[% } %]
[% }else{ %]
......
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