Skip to content

T
tl_estate
Commit b834518f authored by clone's avatar clone
Browse files
Options

Merge branch '0717-v3.3.5' of https://gitee.com/zwyjjc/tl_estate into 0717-v3.3.5

parents b8a9a6ab 60d5a8bf
Hide whitespace changes
Inline Side-by-side
Showing with 204 additions and 187 deletions
application/api_broker/service/StoreFeeService.php
View file @ b834518f
......@@ -35,14 +35,14 @@ class StoreFeeService
* @param $card_no
* @param $count_time
* @param $img_arr
* @param int $id
* @return int|string
* @throws \think\Exception
* @throws \think\exception\PDOException
* @throws \app\model\Exception
*/
public function addApplyFor($type, $fee_item, $total_fee, $agent_id, $store_id, $purpose, $site_id, $card_name,
$bank, $card_no, $count_time, $img_arr)
$bank, $card_no, $count_time, $img_arr, $id = 0)
{
$arr = $this->applyForFeeBin(0, $type, $fee_item, $total_fee, $agent_id, $store_id, $purpose, $site_id, $card_name,
$arr = $this->applyForFeeBin($id, $type, $fee_item, $total_fee, $agent_id, $store_id, $purpose, $site_id, $card_name,
$bank, $card_no, $count_time);
$feeId = $this->applyForFeeModel->saveData($arr);
if ($feeId > 0) {
......
application/api_broker/validate/StoreFeeValidate.php
View file @ b834518f
......@@ -14,6 +14,7 @@ use think\Validate;
class StoreFeeValidate extends Validate
{
protected $rule = [
'id' => 'require|between:1,999999999',
'type' => 'require|number',
'fee_item' => 'require|number',
'total_fee' => 'require|number',
......@@ -35,10 +36,13 @@ class StoreFeeValidate extends Validate
'store_id.number' => '状门店只能为数字',
'site_id.require' => '站点不能为空',
'site_id.number' => '站点只能为数字',
'id.require' => 'id必传',
'id.between' => '请求参数错误',
];
protected $scene = [
'addApplyFor' => ['type', 'fee_item', 'total_fee', 'agent_id', 'store_id', 'site_id'],
'addApplyFor' => ['type', 'fee_item', 'total_fee', 'agent_id', 'store_id', 'assume_fee', 'site_id'],
'editApplyFor' => ['id','type', 'fee_item', 'total_fee', 'agent_id', 'store_id', 'assume_fee', 'site_id'],
];
}
\ No newline at end of file
application/index/controller/StoreFee.php
View file @ b834518f
......@@ -8,6 +8,8 @@ namespace app\index\controller;
*/
use app\api_broker\service\StoreFeeService;
use app\api_broker\validate\StoreFeeValidate;
use app\index\extend\Basic;
use app\model\AAgents;
use app\model\AStore;
......@@ -309,8 +311,70 @@ class StoreFee extends Basic
return $this->response("200", "成功",$store_result);
}
/**
* @return \think\Response
* @throws \think\Exception
* @throws \think\exception\PDOException
*/
public function addApplyFor()
{
$params = $this->params;
/* $params = array(
'type' => 1,//费用类型
'fee_item' => 100,//费用项目
'total_fee' => 123.43,//总费用
'purpose' => 111, //详细用途
'agent_id' => 11,//经纪人id
'store_id' => 12,//门店id
'site_id' => 10001, //站点id
'card_name' => "123123",//收款卡户名 非必填
'bank' => "123123",//开户行 非必填
'card_no' => "123123",//银行卡号 非必填
'count_time' => "2019-07-01",//计入日期， pc后台的字段 非必填
'img_arr' => [],//数组模式 同收款一样
);*/
$check_url = ltrim($this->request->baseUrl(), '/');
$validate = new StoreFeeValidate();
$id = 0;
if ($check_url == 'index/addApplyFor') {
$checkResult = $validate->scene("StoreFeeValidate.addApplyFor")->check($params);
} else {
$id = $params['id'];
$checkResult = $validate->scene("StoreFeeValidate.editApplyFor")->check($params);
}
if (true !== $checkResult) {
return $this->response("101", $checkResult);
}
$type = $params["type"];
$fee_item = $params["fee_item"];
$total_fee = $params["total_fee"];
$agent_id = $params["agent_id"];
$store_id = $params["store_id"];
$purpose = $params["purpose"];
$site_id = $params["site_id"];
$card_name = $params["card_name"];
$bank = $params["bank"];
$card_no = $params["card_no"];
$count_time = $params["count_time"];
$img_arr = isset($params["img_arr"]) ? json_decode($params["img_arr"], true) : "";
if (!$img_arr) {
return $this->response("101", "请上传图片");
}
$service_ = new StoreFeeService();
$if_verify = $service_->verifyType($type, $fee_item);
if(!$if_verify){
return $this->response("101", "类型选择错误");
}
$is_ok = $service_->addApplyFor($type, $fee_item, $total_fee, $agent_id, $store_id, $purpose, $site_id, $card_name,
$bank, $card_no, $count_time, $img_arr, $id);
if ($is_ok > 0) {
return $this->response("200", "request success", []);
} else {
return $this->response("101", "save exception");
}
}
}
\ No newline at end of file
application/index/view/cost/costDetails.html
View file @ b834518f
......@@ -303,41 +303,53 @@
<td colspan="15">
<form id="form_search">
<span class="fore-span ld-Marheight">计入月份:</span>
<input id="comit_time_start" class="form-control btn4 ld-Marheight" type="text" placeholder="请选择"
onClick="WdatePicker({el:this,dateFmt:'yyyy-MM',maxDate:'#F{ $dp.$D(\'comit_time_end\')||\'%y-%M-%d\'}',readOnly:'readonly' })">
<input id="count_time" class="form-control btn4 ld-Marheight" type="text" placeholder="请选择"
onClick="WdatePicker({el:this,dateFmt:'yyyy-MM',readOnly:'readonly' })">
<span class="fore-span ld-Marheight">创建时间:</span>
<input id="comit_time_start" class="form-control btn4 ld-Marheight" type="text" placeholder="开始时间"
onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',maxDate:'#F{ $dp.$D(\'comit_time_end\')||\'%y-%M-%d\'}',readOnly:'readonly' })">
<input id="create_time_start" class="form-control btn4 ld-Marheight" type="text" placeholder="开始时间"
onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',maxDate:'#F{ $dp.$D(\'create_time_end\')||\'%y-%M-%d\'}',readOnly:'readonly' })">
<span class="fore-span ld-Marheight">-</span>
<input id="comit_time_end" class="form-control btn4 ld-Marheight" type="text" placeholder="结束时间"
onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',minDate:'#F{ $dp.$D(\'comit_time_start\' )}',maxDate:'%y-%M-%d',readOnly:'readOnly'})">
<input id="create_time_end" class="form-control btn4 ld-Marheight" type="text" placeholder="结束时间"
onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',minDate:'#F{ $dp.$D(\'create_time_start\' )}',maxDate:'%y-%M-%d',readOnly:'readonly'})">
<select class="form-control btn2 ld-Marheight" id="commit_home">
<option value="">费用承担所属部门</option>
</select>
<select class="form-control btn2 ld-Marheight" id="commit_shop">
<option value="">费用承担所属门店</option>
</select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="back_id_money" placeholder="成本明细ID" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="back_id_money" placeholder="费用ID" type="text" value="">
<select class="form-control btn2 ld-Marheight" id="changed_type">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="details_id" placeholder="成本明细ID" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="cost_id" placeholder="费用ID" type="text" value="">
<select class="form-control btn2 ld-Marheight" id="cost_type">
<option value="">费用类型</option>
<option value="0">退意向金</option>
<option value="1">意向金转定</option>
<option value="2">退保管金</option>
<option value="3">保管金转定</option>
<option value="4">退中介费</option>
<option value="5">退案场费</option>
<option value="0">办公室成本</option>
<option value="1">总部成本</option>
<option value="2">分部成本</option>
<option value="3">门店独有成本</option>
</select>
<select class="form-control btn2 ld-Marheight" id="changed_type">
<select class="form-control btn2 ld-Marheight" id="fee_item">
<option value="">费用项目</option>
<option value="0">退意向金</option>
<option value="1">意向金转定</option>
<option value="2">退保管金</option>
<option value="3">保管金转定</option>
<option value="4">退中介费</option>
<option value="5">退案场费</option>
<!--办公室类型-->
<option value="101" class="choose_office">水电费</option>
<option value="102" class="choose_office">其他费用</option>
<!--总部成本类型-->
<option value="102" class="choose_total">其他费用</option>
<!--分部成本类型-->
<option value="10002" class="choose_siteID">杭州</option>
<option value="10003" class="choose_siteID">深圳</option>
<option value="10004" class="choose_siteID">广州</option>
<option value="10005" class="choose_siteID">北京</option>
<!--门店独有成本类型-->
<option value="506" class="choose_store">区域经理基本工资</option>
<option value="504" class="choose_store">区域秘书基薪</option>
<option value="505" class="choose_store">招聘成本</option>
<option value="507" class="choose_store">宿舍成本</option>
<option value="508" class="choose_store">宿舍亏损</option>
<option value="510" class="choose_store">员工工资成本</option>
<option value="511" class="choose_store">网络报销</option>
<option value="512" class="choose_store">离职员工网络</option>
</select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="changed_id" placeholder="费用用途" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="purpose" placeholder="费用用途" type="text" value="">
<span class="btn btn-info btn3 ld-Marheight" id="search" style="float:left">搜索</span>
......
application/route.php
View file @ b834518f
......@@ -541,6 +541,8 @@ Route::group('index', [
'getCostDetailList' => [ 'index/CostDetail/getCostDetailList', [ 'method' => 'POST|GET' ] ],
'getCostDetailListExcel' => [ 'index/CostDetail/getCostDetailListExcel', [ 'method' => 'POST|GET' ] ],
'getCostInfo' => [ 'index/CostDetail/getCostInfo', [ 'method' => 'POST|GET' ] ],
'addApplyFor' => ['index/StoreFee/addApplyFor', ['method' => 'POST']],//新增报销申请
'editApplyFor' => ['index/StoreFee/addApplyFor', ['method' => 'POST']],//修改报销申请
]);
......
public/resource/js/costDetails.js
View file @ b834518f
......@@ -5,14 +5,7 @@ define(['doT', 'text!temp/cost_details_template_tpl.html', 'css!style/home.css',
pageSize: 10,
/*每页显示多少条*/
id: '',
house_id: '',
house_fatherid: '',
collection_del_id:'',
listData :"",
moneyTotal : "" ,
agent_id_phone : '',
check_status : 1 ,
deleteRefundId:'',
init: function() {
//初始化dot
$(document.body).append(template);
......@@ -36,7 +29,35 @@ define(['doT', 'text!temp/cost_details_template_tpl.html', 'css!style/home.css',
$(document).on('click','#export',function(e){
that.exportExcel();
});
//费用类型切换
$("#cost_type").change(function() {
$("#fee_item").val('');//置空费用项目
if($('#cost_type').val() == 0 ){
$('.choose_office').show();
$('.choose_total').hide();
$('.choose_siteID').hide();
$('.choose_store').hide();
}else if($('#cost_type').val() == 1 ){
$('.choose_office').hide();
$('.choose_total').show();
$('.choose_siteID').hide();
$('.choose_store').hide();
}else if($('#cost_type').val() == 2 ){
$('.choose_office').hide();
$('.choose_total').hide();
$('.choose_siteID').show();
$('.choose_store').hide();
}else if($('#cost_type').val() == 3 ){
$('.choose_office').hide();
$('.choose_total').hide();
$('.choose_siteID').hide();
$('.choose_store').show();
};
});
//二级联动
that.getDistrict(function() {
_doc.on('input', '#commit_home', function() {
......@@ -45,7 +66,7 @@ define(['doT', 'text!temp/cost_details_template_tpl.html', 'css!style/home.css',
$('#commit_shop').html(''); //先清空
if(_id && _id != '0') {
that.getDistrictStoreList(_id, function(_data) {
var _str = '<option value="0">全部</option>';
var _str = '<option value="">全部</option>';
$.each(_data, function(i, item) {
_str += '<option value="' + item.id + '">' + item.store_name + '</option>';
});
......@@ -118,27 +139,6 @@ define(['doT', 'text!temp/cost_details_template_tpl.html', 'css!style/home.css',
}
});
},
//删除退款
deleteRefund: function(id) {
$.ajax({
url: '/index/delRefund',
type: 'POST',
async: true,
data: {
"refund_id": id
},
dataType: 'json',
success: function(data) {
if(data.code == 200) {
cost.getList(cost.pageNo);
alert(data.msg);
} else {
alert(data.msg);
}
}
});
},
//将li里的值 赋给input（分佣方姓名）
addphone: function(obj) {//新增客户 input赋值
var that = cost ;
......@@ -198,7 +198,7 @@ define(['doT', 'text!temp/cost_details_template_tpl.html', 'css!style/home.css',
var params = that.buildSearchParams(0);
params.pageNo = that.pageNo;
params.pageSize = that.pageSize ;
$.get('/index/refundList',params,function(data){
$.post('/index/getCostDetailList',params,function(data){
if(typeof data === 'object') {
if(data.code == 200) {
that.listData = data.data.list;
......@@ -223,30 +223,21 @@ define(['doT', 'text!temp/cost_details_template_tpl.html', 'css!style/home.css',
*/
resetAll : function(){
var that = cost;
$('#comit_time_start').val("");
$('#comit_time_end').val("");
$('#into_time_start').val("");
$('#into_time_end').val("");
$('#changed_type').val("");
$('#changed_id').val("");
$('#back_id').val("");
$('#get_id').val("");
$('#shoped_id').val("");
$('#shoped_addr').val("");
$('#count_time').val("");
$('#create_time_start').val("");
$('#create_time_end').val("");
$('#cost_type').val("");
$('#fee_item').val("");
$('#purpose').val("");
$('#cost_id').val("");
$('#details_id').val("");
$('#commit_home').val("");
$('#commit_shop').val("");
$('#comit_name').val("");
$('#comit_phone').val("");
$('#is_type').val("");
$('#is_open').val("-1");
$('#back_id_money').val("");
that.agent_id_phone="";
},
//退款 审核
//成本明细导出
exportExcel: function() {
var _url = '/index/costListExcel?';
var _url = '/index/getCostDetailListExcel?';
window.open(_url + cost.buildSearchParams(1));
},
/**
......@@ -254,64 +245,56 @@ define(['doT', 'text!temp/cost_details_template_tpl.html', 'css!style/home.css',
*/
buildSearchParams : function(is_excel){
var that = cost;
var commite_time_start = $('#comit_time_start').val();
var commite_time_end = $('#comit_time_end').val();
var into_time_start = $('#into_time_start').val();
var into_time_end = $('#into_time_end').val();
var changed_type = $('#changed_type').val();
var changed_id = $('#changed_id').val();
var back_id_money = $('#back_id_money').val();
var shoped_id = $('#shoped_id').val();
var shoped_addr = $('#shoped_addr').val();
var count_time = $('#count_time').val();
var create_time_start = $('#create_time_start').val();
var create_time_end = $('#create_time_end').val();
var cost_type = $('#cost_type').val();
var fee_item = $('#fee_item').val();
var purpose = $('#purpose').val();
var cost_id = $('#cost_id').val();
var details_id = $('#details_id').val();
var commit_home = $('#commit_home').val();
var commit_shop = $('#commit_shop').val();
var comit_name = that.agent_id_phone;//$('#comit_name').val();
var comit_phone = $('#comit_phone').val();
// var choose_type = $('.btn-group').find('.btn-info').html();
var is_selt = $('#is_type').val();
var get_id = $('#get_id').val();
var is_open = $('#is_open').val();
var params = {};
var paramsStr = "" ;
if ( get_id) {
params.pay_log_id = get_id ;
paramsStr += "pay_log_id=" + get_id +'&';
if ( count_time ) {
params.setting_date = count_time;
paramsStr += "setting_date=" + count_time +'&';
}
if ( commite_time_start ) {
params.start_time = commite_time_start;
paramsStr += "start_time=" + commite_time_start +'&';
if ( create_time_start ) {
params.start_time = create_time_start;
paramsStr += "start_time=" + create_time_start +'&';
}
if ( commite_time_end ) {
params.end_time = commite_time_end;
paramsStr += "end_time=" + commite_time_end +'&';
if ( create_time_end ) {
params.end_time = create_time_end;
paramsStr += "end_time=" + create_time_end +'&';
}
if ( into_time_start ) {
params.income_start_time = into_time_start;
paramsStr += "income_start_time=" + into_time_start +'&';
if ( cost_type ) {
params.type = cost_type;
paramsStr += "type=" + cost_type +'&';
}
if ( into_time_end ) {
params.income_end_time = into_time_end;
paramsStr += "income_end_time=" + into_time_end +'&';
if ( cost_id ) {
params.cost_id = cost_id;
paramsStr += "cost_id=" + cost_id +'&';
}
if ( changed_type ) {
params.type = changed_type;
paramsStr += "type=" + changed_type +'&';
if ( details_id ) {//明细id
params.id = details_id;
paramsStr += "id=" + details_id +'&';
}
if ( changed_id ) {
params.order_id = changed_id;
paramsStr += "order_id=" + changed_id +'&';
if ( purpose ) {
params.purpose = purpose;
paramsStr += "purpose=" + purpose +'&';
}
if ( back_id_money ) {
params.id = back_id_money;
paramsStr += "id=" + back_id_money +'&';
}
if ( shoped_id ) {
params.house_id = shoped_id;
paramsStr += "house_id=" + shoped_id +'&';
}
if ( shoped_addr) {
params.address = shoped_addr;
paramsStr += "address=" + shoped_addr +'&';
if ( fee_item ) {//区分分部
if(cost_type == 2){
params.site_id = fee_item;
paramsStr += "site_id=" + fee_item +'&';
}else{
params.fee_item = fee_item;
paramsStr += "fee_item=" + fee_item +'&';
}
}
if ( commit_home ) {
params.district_id = commit_home;
......@@ -321,30 +304,7 @@ define(['doT', 'text!temp/cost_details_template_tpl.html', 'css!style/home.css',
params.store_id = commit_shop;
paramsStr += "store_id=" + commit_shop +'&';
}
if ( comit_name ) {
params.agent_id = comit_name;
paramsStr += "agent_id=" + comit_name +'&';
}
if ( comit_phone ) {
if ( comit_phone[0] == "1" && comit_phone.length == 11) {
params.phone = comit_phone;
paramsStr += "phone=" + comit_phone +'&';
}else {
alert("请输入正确的手机号码")
}
}
if ( is_selt ){
params.is_self = is_selt;
paramsStr += "is_self=" + is_selt +'&';
}
if ( is_open > -1) {
params.is_open = is_open;
paramsStr += "is_open=" + is_open +'&';
}
params.status = that.check_status;
paramsStr += "status=" + that.check_status;
if (is_excel) {
return paramsStr;
} else {
......
public/resource/template/cost_details_template_tpl.html
View file @ b834518f
......@@ -2,52 +2,25 @@
[% if(it) { %]
[% for(var item in it){ %]
<tr class="text-center">
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['id'] %]</td>
[% if(it[item]['status'] == 0) { %]
<td>审核中</td>
[% }else if (it[item]['status'] == 1) { %]
<td>审核中</td>
[% }else if (it[item]['status'] == 2) { %]
<td>退款成功</td>
[% }else if (it[item]['status'] == 3) { %]
<td>已审核</td>
[% }else if (it[item]['status'] == 4) { %]
<td>驳回</td>
[% } else { %]
<td>--</td>
[% } %]
<td>[%= it[item]['order_id'] %]</td>
<td>[%= it[item]['pay_log_id'] %]</td>
<td>[%= it[item]['refund_money'] %]</td>
<td>[%= it[item]['income_time'] %]</td>
<!--<td>[%= it[item]['type'] %]</td>-->
[% if(it[item]['type'] == 1) { %]
<td>意向金转定</td>
[% }else if (it[item]['type'] == 2) { %]
<td>退保管金</td>
[% }else if (it[item]['type'] == 3) { %]
<td>保管金转定</td>
[% }else if (it[item]['type'] == 4) { %]
<td>退中介费</td>
[% }else if (it[item]['type'] == 5) { %]
<td>退案场费</td>
[% }else if (it[item]['type'] == 0) { %]
<td>退意向金</td>
[% } else { %]
<td>--</td>
[% } %]
<td>[%= it[item]['agent_name'] %]</td>
<td>[%= it[item]['cost_id'] %]</td>
<td>[%= it[item]['setting_date'] %]</td>
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['operator_name'] %]</td>
<td>[%= it[item]['type_name'] %]</td>
<td>[%= it[item]['fee_item_name'] %]</td>
<td>[%= it[item]['purpose'] %]</td>
<td>[%= it[item]['store_name'] %]</td>
<td>[%= it[item]['assume_fee'] %]</td>
<td>
<a class="btn1 btn-success is_del" href="#modal-del" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
<a class="btn1 btn-success is_del" href="#modal-del" data-toggle="modal" data-id='[%= it[item]["cost_id"] %]'>详情</a>
</td>
</tr>
[% } %]
[% }else{ %]
<tr>
<td colspan="8" style="text-align:center;"> 暂无数据</td>
<td colspan="15" style="text-align:center;"> 暂无数据</td>
</tr>
[% } %]
</script>
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