Skip to content

T
tl_estate
Commit 19e9392d authored by xishifeng's avatar xishifeng
Browse files
Options

新增商铺修改等

parent 78fdcfec
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 42 deletions
application/index/view/finance/account_statement.html
View file @ 19e9392d
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<a class="btn btn-info liudan_pic_btn">第一级审核</a> <a class="btn btn-info liudan_pic_btn">第一级审核</a>
<a class="btn btn-default liudan_pic_btn">第二级审核</a> <a class="btn btn-default liudan_pic_btn">第二级审核</a>
<a class="btn btn-default liudan_pic_btn">第三级审核</a> <a class="btn btn-default liudan_pic_btn">第三级审核</a>
<a class="btn btn-default liudan_pic_btn">已结单nnnn</a> <a class="btn btn-default liudan_pic_btn">已结单</a>
</td> </td>
</tr> </tr>
...@@ -28,9 +28,15 @@ ...@@ -28,9 +28,15 @@
<tr> <tr>
<td colspan="9"> <td colspan="9">
<form id="maintable_form_search"> <form id="maintable_form_search">
<span class="fore-span">提交时间:</span> <span class="fore-span">商铺类型:</span>
<select class="form-control btn2" name="maintable_shop_type" id="maintable_shop_type">
<option value="">请选择</option>
<option value="0">商场</option>
<option value="1">街铺</option>
</select>
<span class="fore-span margin-left-10">提交时间:</span>
<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_create_time" name="start_date" type="date"> <input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_create_time" name="start_date" type="date">
<span class="fore-span" id="maintable_form_span_zhi">至</span> <span class="fore-span margin-left-10">至</span>
<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_end_time" name="end_date" type="date"> <input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_end_time" name="end_date" type="date">
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_internal_address" placeholder="商铺地址" type="text" value=""> <input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_internal_address" placeholder="商铺地址" type="text" value="">
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_shop_num" placeholder="商铺号" type="text" value=""> <input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_shop_num" placeholder="商铺号" type="text" value="">
......
application/index/view/finance/commission.html
View file @ 19e9392d
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
<br /> <br />
<span>商铺地址：</span><span id="bargaininfo_internal_address"></span><br> <span>商铺地址：</span><span id="bargaininfo_internal_address"></span><br>
<span>业态：</span>&nbsp;<input class="form-control" id="bargaininfo_yetai" disabled="disabled" type="text"><br>
<span>客户姓名：</span><span id="bargaininfo_user_name"></span><br> <span>客户姓名：</span><span id="bargaininfo_user_name"></span><br>
<span>成交类型：</span> <span>成交类型：</span>
<select class="form-control" id="bargaininfo_type" disabled="disabled"> <select class="form-control" id="bargaininfo_type" disabled="disabled">
...@@ -150,6 +151,7 @@ ...@@ -150,6 +151,7 @@
<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br> <span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br> <span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
<span>成交日期：</span><span id="bargaininfo_create_time"></span><br> <span>成交日期：</span><span id="bargaininfo_create_time"></span><br>
<span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" disabled="disabled" type="number">元
</div> </div>
<div class="detail-modal-bargaininfo-commission-inputpar"> <div class="detail-modal-bargaininfo-commission-inputpar">
<div class="detail-modal-bargaininfo-commission-addarea"> <div class="detail-modal-bargaininfo-commission-addarea">
......
application/index/view/finance/tax.html
View file @ 19e9392d
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
<br /> <br />
<span>商铺地址：</span><span id="bargaininfo_internal_address"></span><br> <span>商铺地址：</span><span id="bargaininfo_internal_address"></span><br>
<span>业态：</span>&nbsp;<input class="form-control" id="bargaininfo_yetai" disabled="disabled" type="text"><br>
<span>客户姓名：</span><span id="bargaininfo_user_name"></span><br> <span>客户姓名：</span><span id="bargaininfo_user_name"></span><br>
<span>成交类型：</span> <span>成交类型：</span>
<select class="form-control" id="bargaininfo_type" disabled="disabled"> <select class="form-control" id="bargaininfo_type" disabled="disabled">
...@@ -150,6 +151,7 @@ ...@@ -150,6 +151,7 @@
<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br> <span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br> <span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
<span>成交日期：</span><span id="bargaininfo_create_time"></span><br> <span>成交日期：</span><span id="bargaininfo_create_time"></span><br>
<span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" disabled="disabled" type="number">元
</div> </div>
<div class="detail-modal-bargaininfo-commission-inputpar"> <div class="detail-modal-bargaininfo-commission-inputpar">
<div class="detail-modal-bargaininfo-commission-addarea"> <div class="detail-modal-bargaininfo-commission-addarea">
......
public/resource/css/report_list.css
View file @ 19e9392d
...@@ -16,7 +16,12 @@ addtax_ ...@@ -16,7 +16,12 @@ addtax_
* *
* */ * */
/*页面主要内容table区域*/ /*页面主要内容table区域*/
#maintable_form_span_zhi{ #maintable_form_search>span,
#maintable_form_search>input,
#maintable_form_search>select{
margin-top: 10px;
}
.margin-left-10{
margin-left: 10px; margin-left: 10px;
} }
......
public/resource/js/commission.js
View file @ 19e9392d
...@@ -825,21 +825,27 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_s ...@@ -825,21 +825,27 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_s
$("#bargaininfo_type").val(data.data.trade_type); $("#bargaininfo_type").val(data.data.trade_type);
$("#bargaininfo_total_commission").val(data.data.commission); $("#bargaininfo_total_commission").val(data.data.commission);
$("#bargaininfo_create_time").html(data.data.create_time); $("#bargaininfo_create_time").html(data.data.create_time);
$("#bargaininfo_yetai").val(data.data.industry_type);
$("#bargaininfo_chengjiao_price").val(data.data.price);
bargain.maidTotalCommission = Number(data.data.commission);//总佣金 bargain.maidTotalCommission = Number(data.data.commission);//总佣金
bargain.order_id = Number(data.data.order_id);//订单id bargain.order_id = Number(data.data.order_id);//订单id
var _inputAreaTempObj = $('.detail-modal-bargaininfo-commission-addarea'); var _inputAreaTempObj = $('.detail-modal-bargaininfo-commission-addarea');
if(data.data.practical_fee && data.data.practical_fee.length > 0){ if(data.data.practical_fee){
_inputAreaTempObj.html(''); if(data.data.practical_fee.length > 0){
_inputAreaTempObj.html('');
}else{
_inputAreaTempObj.html('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"></div><mark href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></mark></div>');
};
$.each(data.data.practical_fee, function(i, v) {
_inputAreaTempObj.append('<div data-id="{id}" class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"value="{0}"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"value="{1}"></div></div>'.stringFormatObj({
'0': v.money,
'1': v.income_time,
'id': v.fee_id
}));
});
}; };
$.each(data.data.practical_fee, function(i, v) {
_inputAreaTempObj.append('<div data-id="{id}" class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"value="{0}"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"value="{1}"></div></div>'.stringFormatObj({
'0': v.money,
'1': v.income_time,
'id': v.fee_id
}));
});
} }
} else { } else {
......
public/resource/js/reportList.js
View file @ 19e9392d
...@@ -454,18 +454,21 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -454,18 +454,21 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
bargain.order_id = Number(data.data.order_id);//订单id bargain.order_id = Number(data.data.order_id);//订单id
var _inputAreaTempObj = $('.detail-modal-bargaininfo-commission-addarea'); var _inputAreaTempObj = $('.detail-modal-bargaininfo-commission-addarea');
if(data.data.practical_fee && data.data.practical_fee.length > 0){ if(data.data.practical_fee){
_inputAreaTempObj.html(''); if(data.data.practical_fee.length > 0){
}else{ _inputAreaTempObj.html('');
_inputAreaTempObj.html('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"></div><mark href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></mark></div>'); }else{
} _inputAreaTempObj.html('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"></div><mark href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></mark></div>');
$.each(data.data.practical_fee, function(i, v) { };
_inputAreaTempObj.append('<div data-id="{id}" class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"value="{0}"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"value="{1}"></div></div>'.stringFormatObj({ $.each(data.data.practical_fee, function(i, v) {
'0': v.money, _inputAreaTempObj.append('<div data-id="{id}" class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"value="{0}"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"value="{1}"></div></div>'.stringFormatObj({
'1': v.income_time, '0': v.money,
'id': v.fee_id '1': v.income_time,
})); 'id': v.fee_id
}); }));
});
};
} }
} else { } else {
...@@ -482,7 +485,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -482,7 +485,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
'is_open': $('#bargaininfo_is_open').val(), 'is_open': $('#bargaininfo_is_open').val(),
'trade_type': $('#bargaininfo_type').val(), 'trade_type': $('#bargaininfo_type').val(),
'industry_type': $.trim($('#bargaininfo_yetai').val()), 'industry_type': $.trim($('#bargaininfo_yetai').val()),
'price': $('#bargaininfo_chengjiao_price').val() 'price': $('#bargaininfo_chengjiao_price').val(),
'step': bargain.mainTabIndex+1
}; };
$.each($('.detail-modal-bargaininfo-commission-sec'), function(i, v) { $.each($('.detail-modal-bargaininfo-commission-sec'), function(i, v) {
...@@ -578,6 +582,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -578,6 +582,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
"source": 1, "source": 1,
"status": 10, "status": 10,
"remark": $.trim($("#pass_beizhu").val()), "remark": $.trim($("#pass_beizhu").val()),
'step': bargain.mainTabIndex+1
}, },
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
...@@ -670,6 +675,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -670,6 +675,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
'scale_fee': $('#addmaid_input_cash').val(), 'scale_fee': $('#addmaid_input_cash').val(),
'role': $('#addmaid_input_servant').val(), 'role': $('#addmaid_input_servant').val(),
'scale': $('#addmaid_input_ratio').val(), 'scale': $('#addmaid_input_ratio').val(),
'step': bargain.mainTabIndex+1,
'source': 1 'source': 1
}, },
timeout: 30000, timeout: 30000,
...@@ -745,7 +751,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -745,7 +751,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
'service_charge': _sxf,//手续费 'service_charge': _sxf,//手续费
'charity_fund': _csjj,//慈善基金 'charity_fund': _csjj,//慈善基金
'cash': _xjj,//现金奖 'cash': _xjj,//现金奖
'practical_fee': _ssyj//实收佣金 'practical_fee': _ssyj,//实收佣金,
'step': bargain.mainTabIndex+1
}; };
} }
...@@ -1017,6 +1024,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -1017,6 +1024,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
var params = { var params = {
'pageNo': pageNo, 'pageNo': pageNo,
'pageSize': bargain.pageSize, 'pageSize': bargain.pageSize,
'shop_type': $('#maintable_shop_type').val(),
'create_time': $.trim($('#maintable_create_time').val()), 'create_time': $.trim($('#maintable_create_time').val()),
'end_time': $.trim($('#maintable_end_time').val()), 'end_time': $.trim($('#maintable_end_time').val()),
'internal_address': $.trim($('#maintable_internal_address').val()), 'internal_address': $.trim($('#maintable_internal_address').val()),
......
public/resource/js/shop_edit.js
View file @ 19e9392d
...@@ -1068,11 +1068,12 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function ...@@ -1068,11 +1068,12 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
// $.each(_acrPhoneArr, function(i, item) { // $.each(_acrPhoneArr, function(i, item) {
// _data['phone['+i+']'] = item; // _data['phone['+i+']'] = item;
// }); // });
$.each(_landlordPhoneArr, function(i, item) { // $.each(_landlordPhoneArr, function(i, item) {
_data['landlord_phone['+i+']'] = item; // _data['landlord_phone['+i+']'] = item;
//_data['landlord_phone['+i+'][name]'] = item.name; // //_data['landlord_phone['+i+'][name]'] = item.name;
//_data['landlord_phone['+i+'][phone]'] = item.phone; // //_data['landlord_phone['+i+'][phone]'] = item.phone;
}); // });
_data['landlord_phone'] = _landlordPhoneArr;
$.each(_liebiaoPicObj, function(i, item) { $.each(_liebiaoPicObj, function(i, item) {
_data['cover[' + i + ']'] = item.src.replace(_urlCut, ''); _data['cover[' + i + ']'] = item.src.replace(_urlCut, '');
}); });
......
public/resource/js/tax.js
View file @ 19e9392d
...@@ -829,21 +829,28 @@ define(['doT', 'text!temp/tax_template_tpl.html', 'text!temp/reportList_shuiFee_ ...@@ -829,21 +829,28 @@ define(['doT', 'text!temp/tax_template_tpl.html', 'text!temp/reportList_shuiFee_
$("#bargaininfo_type").val(data.data.trade_type); $("#bargaininfo_type").val(data.data.trade_type);
$("#bargaininfo_total_commission").val(data.data.commission); $("#bargaininfo_total_commission").val(data.data.commission);
$("#bargaininfo_create_time").html(data.data.create_time); $("#bargaininfo_create_time").html(data.data.create_time);
$("#bargaininfo_yetai").val(data.data.industry_type);
$("#bargaininfo_chengjiao_price").val(data.data.price);
bargain.maidTotalCommission = Number(data.data.commission);//总佣金 bargain.maidTotalCommission = Number(data.data.commission);//总佣金
bargain.order_id = Number(data.data.order_id);//订单id bargain.order_id = Number(data.data.order_id);//订单id
var _inputAreaTempObj = $('.detail-modal-bargaininfo-commission-addarea'); var _inputAreaTempObj = $('.detail-modal-bargaininfo-commission-addarea');
if(data.data.practical_fee && data.data.practical_fee.length > 0){ if(data.data.practical_fee){
_inputAreaTempObj.html(''); if(data.data.practical_fee.length > 0){
}; _inputAreaTempObj.html('');
$.each(data.data.practical_fee, function(i, v) { }else{
_inputAreaTempObj.append('<div data-id="{id}" class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"value="{0}"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"value="{1}"></div></div>'.stringFormatObj({ _inputAreaTempObj.html('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"></div><mark href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></mark></div>');
'0': v.money, };
'1': v.income_time, $.each(data.data.practical_fee, function(i, v) {
'id': v.fee_id _inputAreaTempObj.append('<div data-id="{id}" class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"value="{0}"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"value="{1}"></div></div>'.stringFormatObj({
})); '0': v.money,
}); '1': v.income_time,
'id': v.fee_id
}));
});
}
} }
} else { } else {
......
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