Skip to content

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

Merge branch '0308-3.1.2' of https://gitee.com/zwyjjc/tl_estate into 0308-3.1.2

parents f0b49578 7ea9107d
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
application/index/controller/Finance.php
View file @ 88a07fc3
......@@ -3496,6 +3496,7 @@ class Finance extends Basic
$save_data['transfer_name'] = isset($this->params['transfer_name']) ? $this->params['transfer_name']:'';
$save_data['money'] = $this->params['money'];
$save_data['receipt_number'] = isset($this->params['receipt_number'])? $this->params['receipt_number']:'';
$save_data['pay_type'] = $this->params['pay_type'];
}
$m_pay_log = new OPayLogAdjustment();
......@@ -3505,11 +3506,11 @@ class Finance extends Basic
}
if (($id[0]['type'] == 10 && $this->params['type'] == 30) || ($id[0]['type'] == 30 && $this->params['type'] == 10)) {
$save_data['pay_type'] = $this->params['pay_type'];
$save_data['type'] = $this->params['type'];
}
if (($id[0]['type'] == 91 && $this->params['type'] == 92) || ($id[0]['type'] == 92 && $this->params['type'] == 91)) {
$save_data['pay_type'] = $this->params['pay_type'];
$save_data['type'] = $this->params['type'];
}
$save_data['id'] = $this->params['pay_id'];
......
application/index/view/redEnvelope/cashAccountList.html
View file @ 88a07fc3
......@@ -32,7 +32,7 @@
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="create_time_end" name="end_date1" type="date">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="客户ID" type="text" value="" name="groupname">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="客户手机号" type="text" value="" name="store_name">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="客户昵称" type="text" value="" name="store_name">
<!-- <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="客户昵称" type="text" value="" name="store_name">-->
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
<div style="margin-left: 8px;font-size: 18px;font-weight: 600;">
......@@ -48,9 +48,7 @@
<th class="text-center">变动时间</th>
<th class="text-center">变动金额</th>
<th class="text-center">变动类型</th>
<th class="text-center">余额(元)</th>
<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>
......
public/resource/js/getCollection.js
View file @ 88a07fc3
......@@ -1039,6 +1039,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
recervablesParams : function(){
var params = {} ;
if ($('#intoType').val()){//入账类型
params.type = $('#intoType').val()
};
if ($('#ruzhangId').text()){//入账ID
params.pay_id = $('#ruzhangId').text()
};
......
public/resource/template/cash_account_list_template_tpl.html
View file @ 88a07fc3
......@@ -4,12 +4,10 @@
<tr class="text-center">
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['money'] %]</td>
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['status'] %]</td>
<td>[%= it[item]['user_id'] %]</td>
<td>[%= it[item]['create_time1'] %]</td>
<td>[%= it[item]['create_time1'] %]</td>
<td>
<a class="btn1 btn-success is_show" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-target="#modal-show">审核通过</a>
</td>
......@@ -20,4 +18,5 @@
<td colspan="12" style="text-align:center;"> 暂无数据</td>
</tr>
[% } %]
</script>
\ No newline at end of file
</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