Skip to content

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

Merge branch '0225-v3.1.0' of https://gitee.com/zwyjjc/tl_estate into 0225-v3.1.0

parents 7acdd387 60cadb71
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 7 deletions
public/appnew/src/components/reportDetails/reportDetails.vue
View file @ 798a77c3
...@@ -162,7 +162,46 @@ ...@@ -162,7 +162,46 @@
</ul> </ul>
</section> </section>
<section v-show="3 === initTabNumMain">
<ul class="li-box">
<li class="main-sec-li no-background-color">
<div class="special-style">提交时间:<span class="margin-left">0000</span></div>
</li>
<li class="main-sec-li half no-background-color">
<div class="special-style">提交人:<span class="margin-left">0000</span></div>
</li>
<li class="main-sec-li half no-background-color">
<div class="special-style">收款ID:<span class="margin-left">0000</span></div>
</li>
<li class="main-sec-li half no-background-color">
<div class="special-style">呈交报告ID:<span class="margin-left">0000</span></div>
</li>
<li class="main-sec-li half no-background-color">
<div class="special-style">入账金额:<span class="margin-left">0000</span></div>
</li>
<li class="main-sec-li half no-background-color">
<div class="special-style">入账类型:<span class="margin-left">0000</span></div>
</li>
<li class="main-sec-li half no-background-color">
<div class="special-style">入账日期:<span class="margin-left">0000</span></div>
</li>
<li class="main-sec-li half no-background-color">
<div class="special-style">来源:<span class="margin-left">0000</span></div>
</li>
<li class="main-sec-li half no-background-color">
<div class="special-style">对应业务员:<span class="margin-left">0000</span></div>
</li>
<li class="main-sec-li half no-background-color">
<div class="special-style">状态:<span class="margin-left">0000</span></div>
</li>
<li class="main-sec-li half no-background-color">
<div class="special-style">所属门店:<span class="margin-left">0000</span></div>
</li>
</ul>
</section>
</main> </main>
<!--<footer class="tc "> <!--<footer class="tc ">
...@@ -184,6 +223,8 @@ ...@@ -184,6 +223,8 @@
'title': '分佣提成', 'title': '分佣提成',
}, { }, {
'title': '开票税费', 'title': '开票税费',
}, {
'title': '收款详情',
}], }],
internal_title: '', internal_title: '',
internal_address: '', internal_address: '',
...@@ -409,6 +450,26 @@ ...@@ -409,6 +450,26 @@
font-size: .3rem; font-size: .3rem;
} }
.li-box {
/*padding :.1rem;*/
border : 1px solid #D2D2D2 ;
overflow : hidden ;
width :7.1rem;
margin : .2rem;
/*background-color : #D2D2D2;*/
}
.half {
width : 2.75rem;
float : left ;
}
.no-background-color {
background-color:initial;
}
.special-style{
font-size:.28rem;
color : #999999;
line-height : 2;
}
.main-sec-li-26 { .main-sec-li-26 {
background: #fff; background: #fff;
line-height: .9rem; line-height: .9rem;
...@@ -434,6 +495,12 @@ ...@@ -434,6 +495,12 @@
float: right; float: right;
} }
.margin-left {
margin-left : .1rem ;
color : #1A1A1A;
line-height : 1;
}
.color { .color {
color: #FA903F; color: #FA903F;
} }
......
public/resource/js/getCollection.js
View file @ 798a77c3
...@@ -352,8 +352,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -352,8 +352,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
//操作----详情 //操作----详情
$(document).on('click','.add-status',function(e){ $(document).on('click','.add-status',function(e){
var id = e.target.dataset.id; var id = e.target.dataset.id;
var orderId=$(this).attr("data-orderId");
// that.deleteId = id ; // that.deleteId = id ;
that.getStatusList(id); that.getStatusList(id,orderId);
}); });
//操作----删除 //操作----删除
...@@ -1650,11 +1652,13 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -1650,11 +1652,13 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
* 获取表格数据 * 获取表格数据
* @param {Object} no * @param {Object} no
*/ */
getStatusList : function(id){ getStatusList : function(id,orderId){
var that = receiv; var that = receiv;
// that.pageNo = no; // that.pageNo = no;
var params = { var params = {
'pay_id' : id 'pay_id' : id,
'order_id' : orderId
} }
// params.pageNo = that.pageNo; // params.pageNo = that.pageNo;
// params.pageSize = that.pageSize ; // params.pageSize = that.pageSize ;
......
public/resource/template/receivables_template_tpl.html
View file @ 798a77c3
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
[% if(it[item]['is_refund'] != 1 && !it[item]['is_adjustment']){ %] [% if(it[item]['is_refund'] != 1 && !it[item]['is_adjustment']){ %]
正常 正常
[% } else if(it[item]['is_refund'] == 1 && it[item]['is_adjustment']){ %] [% } else if(it[item]['is_refund'] == 1 && it[item]['is_adjustment']){ %]
被调整+被退款 <a class="btn1 btn-success add-status" href="#modal-status" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a> 被调整+被退款 <a class="btn1 btn-success add-status" href="#modal-status" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-orderId='[%= it[item]["order_id"] %]'>详情</a>
[% } else if ( it[item]['is_refund'] == 1 ) { %] [% } else if ( it[item]['is_refund'] == 1 ) { %]
被退款 <a class="btn1 btn-success add-status" href="#modal-status" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a> 被退款 <a class="btn1 btn-success add-status" href="#modal-status" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-orderId='[%= it[item]["order_id"] %]'>详情</a>
[% } else { %] [% } else { %]
被调整 <a class="btn1 btn-success add-status" href="#modal-status" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a> 被调整 <a class="btn1 btn-success add-status" href="#modal-status" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-orderId='[%= it[item]["order_id"] %]'>详情</a>
[% } %] [% } %]
</td> </td>
<!--<td>[%= it[item]['source_id'] %]</td>--> <!--<td>[%= it[item]['source_id'] %]</td>-->
......
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