Commit e3e20554 authored by agping's avatar agping

xiugai

parent 8ea42836
......@@ -56,7 +56,6 @@
text-align: center;
}
.is-submit,.is-print{
display: inline-block;
background-color: #286090;
color: white;
padding: 0 3px;
......@@ -67,11 +66,27 @@
font-size: 15px;
text-align: center;
cursor: pointer;
float: left;
}
.is-print{
width: 80px;
width: 80px;
display: none;
}
.is-submit-pass,.is-submit-passed{
background-color: #286090;
color: white;
padding: 0 3px;
border-radius: 6px;
width: 111px;
height: 32px;
line-height: 32px;
font-size: 15px;
text-align: center;
cursor: pointer;
display: none;
float: left;
margin-left: 100px;
}
</style>
<div id="page-content-wrapper">
<div class="container">
......@@ -244,18 +259,38 @@
<th class="text-center">提交时间</th>
</tr>
</thead>
<tbody class="text-center" id="maintable_list_a">
<tbody class="text-center" id="">
<tr>
<td class="text-center">555</td>
<td class="text-center">5</td>
<td class="text-center">6</td>
<td class="text-center">3</td>
<td class="text-center">2</td>
<td class="text-center">2</td>
<td class="text-center">33</td>
<td class="text-center">22</td>
<td class="text-center">15517301736</td>
<td class="text-center">2017.3.6</td>
<td class="text-center">
<span id="pay_a"></span>
</td>
<td class="text-center">
<span id="pay_a"></span>
</td>
<td class="text-center">
<span id="pay_a"></span>
</td>
<td class="text-center">
<span id="pay_a"></span>
</td>
<td class="text-center">
<span id="pay_a"></span>
</td>
<td class="text-center">
<span id="pay_a"></span>
</td>
<td class="text-center">
<span id="pay_a"></span>
</td>
<td class="text-center">
<span id="pay_a"></span>
</td>
<td class="text-center">
<span id="pay_a"></span>
</td>
<td class="text-center">
<span id="pay_a"></span>
</td>
</tr>
</tbody>
</table>
......@@ -298,11 +333,9 @@
</div>
<div class="is-submit-div">
<span class="is-submit">提交</span>
<span>
<span class="is-submit">审核通过</span>
<span class="is-submit">转到已审核</span>
</span>
<div class="is-submit">提交</div>
<div class="is-submit-pass">审核通过</div>
<div class="is-submit-passed">转到已审核</div>
</div>
</div>
......
......@@ -10,8 +10,20 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
bargain_id: '',
order_id: 0,//订单id
maidTotalCommission: 0,//应收总佣金
financialTime: '',//应收总佣金
init: function() {
//初始化dot
if(getUrlParam('time')){
$('#create_time_start').hide();
$('.is-submit').hide();
$('.is-print').show();
$('.is-submit-pass').show();
$('.is-submit-passed').show();
bargain.financialTime = getUrlParam('time');
}else{
bargain.financialTime = $('#create_time_start').val();
}
$(document.body).append(template);
bargain.getList(1);
bargain.event();
......@@ -92,10 +104,10 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
getList: function(pageNo){
console.count('bar');
var params = {
'AuthToken':'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjo1Nzc1LCJuYW1lIjoiXHU2ZDRiXHU4YmQ1MiIsInBob25lIjoiMTU2MDE2NTIzNTIiLCJsZXZlbCI6MjB9LCJ0aW1lU3RhbXBfIjoxNTQ1MDQ1Mjc3fQ.xo7hqzw-eeWaLeP6xxbu9xJrynPC4krNBa4U-QUcM-U',
'AuthToken':user_info_obj.AuthToken,
'store_id': 730,
'is_store': 0,
'daily_data': '2018-12-01',
'daily_data': bargain.financialTime
};
$.ajax({
type: 'GET',
......@@ -125,6 +137,17 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
//调整出账
var doTtmpl = doT.template(document.getElementById('e_financial_daily_list_tpl').innerHTML);
$("#maintable_list_e").html(doTtmpl(data.data.list.adjustment));
//总计
if(data.data.is_commit*1){
$('#pay_a').html(data.data.commit_info.other_bank);
}
//判断店长是否提交过
if(data.data.is_commit*1){
$('.is-submit').html('已提交');
}else{
$('.is-submit').html('未提交');
}
......
......@@ -8,7 +8,7 @@
<td>[%= it[item]['agent_name']%]</td>
<td>[%= it[item]['store_name'] %]</td>
<td>
<a class="btn1 btn-info" href="/index/dailyDetails" data-recordid="[%= it[item]['id'] %]" data-toggle="modal"></a>
<a class="btn1 btn-info" href="/index/dailyDetails?time=[%= it[item]['daily_date'] %]" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">22</a>
</td>
</tr>
[% } %]
......
......@@ -24,7 +24,7 @@
[% } %]
[% }else{ %]
<tr>
<td colspan="8" style="text-align:center;"> 暂无数据</td>
<td colspan="15" style="text-align:center;"> 暂无数据</td>
</tr>
[% } %]
</script>
......@@ -53,7 +53,7 @@
[% } %]
[% }else{ %]
<tr>
<td colspan="8" style="text-align:center;"> 暂无数据</td>
<td colspan="15" style="text-align:center;"> 暂无数据</td>
</tr>
[% } %]
</script>
......@@ -80,7 +80,7 @@
[% } %]
[% }else{ %]
<tr>
<td colspan="8" style="text-align:center;"> 暂无数据</td>
<td colspan="15" style="text-align:center;"> 暂无数据</td>
</tr>
[% } %]
</script>
......@@ -106,7 +106,7 @@
[% } %]
[% }else{ %]
<tr>
<td colspan="8" style="text-align:center;"> 暂无数据</td>
<td colspan="15" style="text-align:center;"> 暂无数据</td>
</tr>
[% } %]
</script>
......@@ -131,10 +131,11 @@
[% } %]
[% }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