Skip to content

T
tl_estate
Commit 3a430964 authored by agping's avatar agping
Browse files
Options

1

parent d67c301c
Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 82 deletions
application/index/view/cost/costDetails.html
View file @ 3a430964
...@@ -363,7 +363,7 @@ ...@@ -363,7 +363,7 @@
</tr> </tr>
<tr> <tr>
<th class="text-center">成本明细ID</th> <th class="text-center">成本明细ID</th>
<th class="text-center">费用总ID</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>
<th class="text-center">提交人</th> <th class="text-center">提交人</th>
......
application/index/view/cost/publicCostDetails.html
View file @ 3a430964
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
</table> </table>
</div> </div>
<!--详情 审核记录--> <!--详情 审核记录-->
<div class="detail_jilu"> <div class="detail_jilu" style="display: none;">
<div style="font-size: 16px;margin-bottom: 20px;font-weight: 600;">核对记录：</div> <div style="font-size: 16px;margin-bottom: 20px;font-weight: 600;">核对记录：</div>
<div style="margin-bottom: 10px;">门店考勤：<span class="kaoqin1"></span></div> <div style="margin-bottom: 10px;">门店考勤：<span class="kaoqin1"></span></div>
<div style="margin-bottom: 10px;">社保报销：<span class="kaoqin2"></span></div> <div style="margin-bottom: 10px;">社保报销：<span class="kaoqin2"></span></div>
......
public/resource/js/publicCostDetails.js
View file @ 3a430964
...@@ -262,36 +262,36 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', ' ...@@ -262,36 +262,36 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', '
$("#check_list").html(doTtmpl2(data.data.check_log)); $("#check_list").html(doTtmpl2(data.data.check_log));
//审核记录显示 门店明细 //审核记录显示 门店明细
var str1 = ''; // var str1 = '';
var str2 = ''; // var str2 = '';
var str3 = ''; // var str3 = '';
var str4 = ''; // var str4 = '';
var str5 = ''; // var str5 = '';
// 审核类型， 1考勤审核 2社保审核 3手续费审核 4办公室房租+当月办公门店审核 5费用参数审核 // 审核类型， 1考勤审核 2社保审核 3手续费审核 4办公室房租+当月办公门店审核 5费用参数审核
$.each(data.data, function(i, item) { // $.each(data.data, function(i, item) {
if(data.data[i].type == 1){ // if(data.data[i].type == 1){
str1 += data.data[i].operator_name + '、'; // str1 += data.data[i].operator_name + '、';
//
}else if(data.data[i].type == 2){ // }else if(data.data[i].type == 2){
str2 += data.data[i].operator_name + '、'; // str2 += data.data[i].operator_name + '、';
//
}else if(data.data[i].type == 3){ // }else if(data.data[i].type == 3){
str3 += data.data[i].operator_name + '、'; // str3 += data.data[i].operator_name + '、';
//
}else if(data.data[i].type == 5){ // }else if(data.data[i].type == 5){
str4 += data.data[i].operator_name + '、'; // str4 += data.data[i].operator_name + '、';
//
}else if(data.data[i].type == 4){ // }else if(data.data[i].type == 4){
str5 += data.data[i].operator_name + '、'; // str5 += data.data[i].operator_name + '、';
//
} // }
//
}); // });
$(".kaoqin1").html(str1); // $(".kaoqin1").html(str1);
$(".kaoqin2").html(str2); // $(".kaoqin2").html(str2);
$(".kaoqin3").html(str3); // $(".kaoqin3").html(str3);
$(".kaoqin4").html(str4); // $(".kaoqin4").html(str4);
$(".kaoqin5").html(str5); // $(".kaoqin5").html(str5);
...@@ -350,58 +350,58 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', ' ...@@ -350,58 +350,58 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', '
//费用类型 1办公室成本 2上海总部成本 3分部成本 4同联发展基金 5门店单独成本。 //费用类型 1办公室成本 2上海总部成本 3分部成本 4同联发展基金 5门店单独成本。
if(cost.is_self == 1){//明细详情 if(cost.is_self == 1){//明细详情
if(data.data.type == 1){//办公室 // if(data.data.type == 1){//办公室
$('.pic_jilu').show();//转账图片 // $('.pic_jilu').show();//转账图片
$('.check_jilu').show();//报销审核记录 // $('.check_jilu').show();//报销审核记录
$('.detail_jilu').hide();//明细审核记录 // $('.detail_jilu').hide();//明细审核记录
$('.is_hide_kaoqin').show();//考勤 // $('.is_hide_kaoqin').show();//考勤
$('kaoqin_con').html('当月门店所在办公室考勤：'); // $('kaoqin_con').html('当月门店所在办公室考勤：');
$('.is_hide_bank').show();//收款账户 // $('.is_hide_bank').show();//收款账户
$('.is_hide_costID').show();//费用id // $('.is_hide_costID').show();//费用id
//
}else if(data.data.type == 2 ){//上海总部 // }else if(data.data.type == 2 ){//上海总部
$('.pic_jilu').hide();//转账图片 // $('.pic_jilu').hide();//转账图片
$('.check_jilu').hide();//报销审核记录 // $('.check_jilu').hide();//报销审核记录
$('.detail_jilu').show();//明细审核记录 // $('.detail_jilu').show();//明细审核记录
$('.is_hide_kaoqin').show();//考勤 // $('.is_hide_kaoqin').show();//考勤
$('kaoqin_con').html('当月公司考勤总人数：'); // $('kaoqin_con').html('当月公司考勤总人数：');
$('.is_hide_bank').hide();//收款账户 // $('.is_hide_bank').hide();//收款账户
$('.is_hide_costID').hide();//费用id // $('.is_hide_costID').hide();//费用id
//
}else if(data.data.type == 3){//分部成本 // }else if(data.data.type == 3){//分部成本
$('.pic_jilu').hide();//转账图片 // $('.pic_jilu').hide();//转账图片
$('.check_jilu').hide();//报销审核记录 // $('.check_jilu').hide();//报销审核记录
$('.detail_jilu').show();//明细审核记录 // $('.detail_jilu').show();//明细审核记录
$('.is_hide_kaoqin').show();//考勤 // $('.is_hide_kaoqin').show();//考勤
$('kaoqin_con').html('当月门店所在城市考勤：'); // $('kaoqin_con').html('当月门店所在城市考勤：');
$('.is_hide_bank').hide();//收款账户 // $('.is_hide_bank').hide();//收款账户
$('.is_hide_costID').hide();//费用id // $('.is_hide_costID').hide();//费用id
//
}else if(data.data.type == 4){//同联基金 // }else if(data.data.type == 4){//同联基金
$('.pic_jilu').hide();//转账图片 // $('.pic_jilu').hide();//转账图片
$('.check_jilu').hide();//报销审核记录 // $('.check_jilu').hide();//报销审核记录
$('.detail_jilu').show();//明细审核记录 // $('.detail_jilu').show();//明细审核记录
$('.is_hide_kaoqin').show();//考勤 // $('.is_hide_kaoqin').show();//考勤
$('kaoqin_con').html('当月门店考勤人数：'); // $('kaoqin_con').html('当月门店考勤人数：');
$('.is_hide_bank').hide();//收款账户 // $('.is_hide_bank').hide();//收款账户
$('.is_hide_costID').hide();//费用id // $('.is_hide_costID').hide();//费用id
//
}else if(data.data.type == 5){//门店单独成本 // }else if(data.data.type == 5){//门店单独成本
$('.pic_jilu').show();//转账图片 // $('.pic_jilu').show();//转账图片
$('.check_jilu').show();//报销审核记录 // $('.check_jilu').show();//报销审核记录
$('.detail_jilu').hide();//明细审核记录 // $('.detail_jilu').hide();//明细审核记录
$('.is_hide_kaoqin').hide();//考勤 // $('.is_hide_kaoqin').hide();//考勤
$('.is_hide_bank').show();//收款账户 // $('.is_hide_bank').show();//收款账户
$('.is_hide_costID').show();//费用id // $('.is_hide_costID').show();//费用id
//
} // }
}else{//报销详情 }else{//报销详情
$('.pic_jilu').show();//转账图片 // $('.pic_jilu').show();//转账图片
$('.check_jilu').show();//报销审核记录 // $('.check_jilu').show();//报销审核记录
$('.detail_jilu').hide();//明细审核记录 // $('.detail_jilu').hide();//明细审核记录
$('.is_hide_bank').show();//收款账户 // $('.is_hide_bank').show();//收款账户
$('.is_hide_costID').show();//费用id // $('.is_hide_costID').show();//费用id
if(data.data.type == 1){ if(data.data.type == 1){
$('.is_hide_kaoqin').show();//考勤 $('.is_hide_kaoqin').show();//考勤
$('kaoqin_con').html('当月门店所在办公室考勤：'); $('kaoqin_con').html('当月门店所在办公室考勤：');
......
public/resource/template/accountingTable_list_template_tpl.html
View file @ 3a430964
...@@ -18,7 +18,10 @@ ...@@ -18,7 +18,10 @@
<td>[%= it[item]['assume_fee'] %]</td> <td>[%= it[item]['assume_fee'] %]</td>
<td>[%= it[item]['purpose'] %]</td> <td>[%= it[item]['purpose'] %]</td>
<td> <td>
[% if(it[item]['apply_for_id'] != 0) { %]
<a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["apply_for_id"] %]' data-status='[%= it[item]["status"] %]'>详情</a> <a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["apply_for_id"] %]' data-status='[%= it[item]["status"] %]'>详情</a>
[% } %]
</td> </td>
</tr> </tr>
[% } %] [% } %]
...@@ -44,7 +47,9 @@ ...@@ -44,7 +47,9 @@
<td>[%= it[item]['assume_fee'] %]</td> <td>[%= it[item]['assume_fee'] %]</td>
<td>[%= it[item]['purpose'] %]</td> <td>[%= it[item]['purpose'] %]</td>
<td> <td>
[% if(it[item]['apply_for_id'] != 0) { %]
<a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["apply_for_id"] %]' data-status='[%= it[item]["status"] %]'>详情</a> <a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["apply_for_id"] %]' data-status='[%= it[item]["status"] %]'>详情</a>
[% } %]
</td> </td>
</tr> </tr>
[% } %] [% } %]
...@@ -70,7 +75,9 @@ ...@@ -70,7 +75,9 @@
<td>[%= it[item]['assume_fee'] %]</td> <td>[%= it[item]['assume_fee'] %]</td>
<td>[%= it[item]['purpose'] %]</td> <td>[%= it[item]['purpose'] %]</td>
<td> <td>
[% if(it[item]['apply_for_id'] != 0) { %]
<a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["apply_for_id"] %]' data-status='[%= it[item]["status"] %]'>详情</a> <a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["apply_for_id"] %]' data-status='[%= it[item]["status"] %]'>详情</a>
[% } %]
</td> </td>
</tr> </tr>
[% } %] [% } %]
...@@ -96,7 +103,9 @@ ...@@ -96,7 +103,9 @@
<td>[%= it[item]['assume_fee'] %]</td> <td>[%= it[item]['assume_fee'] %]</td>
<td>[%= it[item]['purpose'] %]</td> <td>[%= it[item]['purpose'] %]</td>
<td> <td>
[% if(it[item]['apply_for_id'] != 0) { %]
<a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["apply_for_id"] %]' data-status='[%= it[item]["status"] %]'>详情</a> <a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["apply_for_id"] %]' data-status='[%= it[item]["status"] %]'>详情</a>
[% } %]
</td> </td>
</tr> </tr>
[% } %] [% } %]
...@@ -126,7 +135,10 @@ ...@@ -126,7 +135,10 @@
<td>[%= it[item]['assume_fee'] %]</td> <td>[%= it[item]['assume_fee'] %]</td>
<td>[%= it[item]['purpose'] %]</td> <td>[%= it[item]['purpose'] %]</td>
<td> <td>
[% if(it[item]['apply_for_id'] != 0) { %]
<a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["apply_for_id"] %]' data-status='[%= it[item]["status"] %]'>详情</a> <a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["apply_for_id"] %]' data-status='[%= it[item]["status"] %]'>详情</a>
[% } %]
</td> </td>
</tr> </tr>
[% } %] [% } %]
......
public/resource/template/cost_details_template_tpl.html
View file @ 3a430964
...@@ -3,7 +3,11 @@ ...@@ -3,7 +3,11 @@
[% for(var item in it){ %] [% for(var item in it){ %]
<tr class="text-center"> <tr class="text-center">
<td>[%= it[item]['id'] %]</td> <td>[%= it[item]['id'] %]</td>
<td>[%= it[item]['cost_id'] %]</td> <td>
[% if(it[item]['apply_for_id'] != 0) { %]
[%= it[item]['apply_for_id'] %]
[% } %]
</td>
<td>[%= it[item]['setting_date'] %]</td> <td>[%= it[item]['setting_date'] %]</td>
<td>[%= it[item]['create_time'] %]</td> <td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['operator_name'] %]</td> <td>[%= it[item]['operator_name'] %]</td>
...@@ -13,7 +17,15 @@ ...@@ -13,7 +17,15 @@
<td>[%= it[item]['store_name'] %]</td> <td>[%= it[item]['store_name'] %]</td>
<td>[%= it[item]['assume_fee'] %]</td> <td>[%= it[item]['assume_fee'] %]</td>
<td> <td>
[% if(check_auth('index/getDetailCost')) { %]
[% if(it[item]['apply_for_id'] != 0) { %]
<a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["cost_id"] %]' data-status='[%= it[item]["status"] %]'>详情</a> <a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["cost_id"] %]' data-status='[%= it[item]["status"] %]'>详情</a>
[% } %]
[% } %]
</td> </td>
</tr> </tr>
[% } %] [% } %]
......
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