Skip to content

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

罚款

parent cda2b0af
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 29 deletions
application/index/view/finance/daily_details.html
View file @ ff8b9760
......@@ -1318,7 +1318,7 @@
<option value="30" class="shanghaipayType">pos机器</option>
<option value="40" class="shanghaipayType">地产转账</option>
<option value="42" class="shanghaipayType">3000账号</option>
<option value="70" class="shanghaipayType">银满谷银行卡</option>
<option value="70" class="shanghaipayType">上海银满谷银行卡</option>
<option value="73" class="shanghaipayType">新同联福居银行卡</option>
<option value="41" class="shanghaipayType">世家公账</option>
<option value="72" class="shanghaipayType">林老师建行卡</option>
......@@ -1331,7 +1331,7 @@
<option value="11" class="hangzhoupayType">林老师支付宝</option>
<option value="21" class="hangzhoupayType">林老师微信</option>
<option value="30" class="hangzhoupayType">pos机器</option>
<option value="70" class="hangzhoupayType">银满谷银行卡</option>
<option value="70" class="hangzhoupayType">上海银满谷银行卡</option>
<option value="72" class="hangzhoupayType">林老师建行卡</option>
<option value="13" class="hangzhoupayType">陈志杰支付宝</option>
<option value="23" class="hangzhoupayType">陈志杰微信</option>
......@@ -1346,6 +1346,28 @@
<option value="13" class="shenzhengpayType">陈志杰支付宝</option>
<option value="23" class="shenzhengpayType">陈志杰微信</option>
<option value="74" class="shenzhengpayType">陈志杰招商银行卡</option>
<option value="75" class="shenzhengpayType">深圳银满谷银行卡</option>
<option value="10" class="beijingpayType">施总支付宝</option>
<option value="11" class="beijingpayType">林老师支付宝</option>
<option value="20" class="beijingpayType">施总微信</option>
<option value="21" class="beijingpayType">林老师微信</option>
<option value="30" class="beijingpayType">pos机器</option>
<option value="40" class="beijingpayType">地产转账</option>
<option value="42" class="beijingpayType">3000账号</option>
<option value="70" class="beijingpayType">上海银满谷银行卡</option>
<option value="73" class="beijingpayType">新同联福居银行卡</option>
<option value="41" class="beijingpayType">世家公账</option>
<option value="72" class="beijingpayType">林老师建行卡</option>
<option value="13" class="beijingpayType">陈志杰支付宝</option>
<option value="23" class="beijingpayType">陈志杰微信</option>
<option value="74" class="beijingpayType">陈志杰招商银行卡</option>
<option value="71" class="beijingpayType">筠姐上海银行卡</option>
<option value="41" class="beijingpayType">世家公账</option>
</select>
</div>
</div>
......
application/index/view/finance/fineMoney.html
View file @ ff8b9760
......@@ -339,7 +339,7 @@
<div class="form-group full-width-100 full-pic-area">
<div id="container_body">
<!--<label>请选择一个图像文件：</label>-->
<button type="button btn2" class="btn btn-default">上传图片</button>
<button type="button btn2" class="btn btn-default edit-pic">上传图片</button>
<input type="file" id="file_input_positive_edit">
<div id="container_body_img_area_positive_edit"></div>
</div>
......
public/resource/js/financial_manager_daily_list.js
View file @ ff8b9760
......@@ -1682,18 +1682,32 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$('.shanghaipayType').show();
$('.hangzhoupayType').hide();
$('.shenzhengpayType').hide();
$('.beijingpayType').hide();
}else if(user_info_obj.site_id == 10002){
$('.shanghaipayType').hide();
$('.hangzhoupayType').show();
$('.shenzhengpayType').hide();
$('.beijingpayType').hide();
}else if(user_info_obj.site_id == 10003){
$('.shanghaipayType').hide();
$('.hangzhoupayType').hide();
$('.shenzhengpayType').show();
}else{//北京 广州
$('.beijingpayType').hide();
}else if(user_info_obj.site_id == 10005){//北京
$('.shanghaipayType').hide();
$('.hangzhoupayType').hide();
$('.shenzhengpayType').hide();
$('.beijingpayType').show();
}else{//广州
$('.shanghaipayType').show();
$('.hangzhoupayType').hide();
$('.shenzhengpayType').hide();
$('.beijingpayType').hide();
}
var persent = 0.7;
bargain.payment_details_price = data.price;
......
public/resource/js/fineMoney.js
View file @ ff8b9760
......@@ -279,26 +279,6 @@ define(['doT', 'text!temp/fineMoney_list_template_tpl.html', 'text!temp/phoneBin
$("#money_sum").html(data.data.money_sum);
$("#fine_money_edit").val(data.data.money);
if(data.data.status*1 == 0){
$("#edit_status").html('待支付');
$(".submit_edit").show();
$(".to-pay-hide").hide();
}else if(data.data.status*1 == 1){
$("#edit_status").html('已支付');
$(".submit_edit").hide();
$(".to-pay-hide").show();
}else{
$("#edit_status").html('已取消');
$(".submit_edit").hide();
$(".to-pay-hide").hide();
}
if(data.data.type) {
agent.getDistrictStoreList(data.data.type, function(_data) {
var _str = '<option value="">罚款类型</option>';
......@@ -313,13 +293,35 @@ define(['doT', 'text!temp/fineMoney_list_template_tpl.html', 'text!temp/phoneBin
$('#container_body_img_area_positive_edit').html('');//每回先清空所有图片
if(data.data.img){
for(i = 0; i < data.data.img.length; i++) {
$('#container_body_img_area_positive_edit').append('<div class="result-positive-edit"><img data-imgname="{0}" src="{1}" alt="" class="diagram-image J_preview"/> <span class="span-del-positive">删除</span></div>'.stringFormatObj({
$('#container_body_img_area_positive_edit').append('<div class="result-positive-edit"><img data-imgname="{0}" data-imgid="{2}" src="{1}" alt="" class="diagram-image J_preview"/> <span class="span-del2">删除</span></div>'.stringFormatObj({
'0': data.data.img[i].file_name,
'1':ServerHostImageLiu + '/static/amercement_img/' + data.data.img[i].file_name
'1':ServerHostImageLiu + '/static/amercement_img/' + data.data.img[i].file_name,
'2': data.data.img[i].id,
}));
};
}
if(data.data.status*1 == 0){
$("#edit_status").html('待支付');
$(".submit_edit").show();
$(".to-pay-hide").hide();
$(".edit-pic,.span-del2").show();
}else if(data.data.status*1 == 1){
$("#edit_status").html('已支付');
$(".submit_edit").hide();
$(".to-pay-hide").show();
$(".edit-pic,.span-del2").hide();
}else{
$("#edit_status").html('已取消');
$(".submit_edit").hide();
$(".to-pay-hide").hide();
$(".edit-pic,.span-del2").hide();
}
......@@ -475,10 +477,11 @@ define(['doT', 'text!temp/fineMoney_list_template_tpl.html', 'text!temp/phoneBin
maintableExport: function(pageNo) {
window.open('/index/getAmercementListExcel?' + 'create_time=' + $("#submit_start_date").val() + '&end_time=' + $("#submit_end_date").val() + '&status=' + $(".state-pay").val() + '&type=' + $(".fine-item").val() + '&submit_name=' + $("#submit_fine_name").val() + '&name=' + $("#fine_name").val() + '&id=' + $("#fine_id").val());
},
spandelList: function(n) { //删除已经保存的图片都调用
//罚款详情 删除图片
spandelList: function(n) {
$.ajax({
'type': 'POST',
'url': '/index/deleteReceiptImg',
'url': '/index/delAmercementImage',
data: {
id: n
},
......
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