Skip to content

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

bug 修改

parent ac74fd7b
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 18 deletions
application/index/view/finance/account_statement.html
View file @ 7d9d0afb
......@@ -1368,6 +1368,9 @@
<option value="72">林老师建行卡</option>
<option value="73">新同联福居银行卡</option>
<option value="60">其他</option>
<option value="13">陈志杰支付宝</option>
<option value="23">陈志杰微信</option>
<option value="74">陈志杰招商银行卡</option>
</select>
</td>
<td>
......
application/index/view/finance/daily_details.html
View file @ 7d9d0afb
......@@ -1222,14 +1222,21 @@
<option value="70" class="shanghaipayType">银满谷银行卡</option>
<option value="73" class="shanghaipayType">新同联福居银行卡</option>
<option value="41" class="shanghaipayType">世家公账</option>
<option value="72" class="shanghaipayType">林老师建行卡</option>
<option value="72" class="shanghaipayType">林老师建行卡</option>
<option value="13" class="shanghaipayType">陈志杰支付宝</option>
<option value="23" class="shanghaipayType">陈志杰微信</option>
<option value="74" class="shanghaipayType">陈志杰招商银行卡</option>
<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="72" class="hangzhoupayType">林老师建行卡</option>
<option value="72" class="hangzhoupayType">林老师建行卡</option>
<option value="13" class="hangzhoupayType">陈志杰支付宝</option>
<option value="23" class="hangzhoupayType">陈志杰微信</option>
<option value="74" class="hangzhoupayType">陈志杰招商银行卡</option>
<option value="12" class="shenzhengpayType">筠姐支付宝</option>
......@@ -1237,6 +1244,9 @@
<option value="71" class="shenzhengpayType">筠姐上海银行卡</option>
<option value="41" class="shenzhengpayType">世家公账</option>
<option value="30" class="shenzhengpayType">pos机器</option>
<option value="13" class="shenzhengpayType">陈志杰支付宝</option>
<option value="23" class="shenzhengpayType">陈志杰微信</option>
<option value="74" class="shenzhengpayType">陈志杰招商银行卡</option>
</select>
</div>
</div>
......@@ -1260,7 +1270,7 @@
<strong><span class="col-xs-3 ld-Marheight">是否开业:</span></strong>
<div class="col-xs-6">
<!--<span id="running" class="col-xs-6 ld-Marheight"></span>-->
<select class="form-control" id="running">
<select class="form-control" id="running" disabled="disabled">
<option value="3">请选择</option>
<option value="0">否</option>
<option value="1">是</option>
......
application/index/view/finance/pay_check_list.html
View file @ 7d9d0afb
......@@ -365,7 +365,7 @@
<span class="btn btn-info btn3 ld-Marheight" id="search" style="float:left">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset" style="float:left">重置</span>
<span class="btn btn-info btn3 ld-Marheight" id="export" style="float: left;">导出报表</span>
<span class="money_total_two ld-Marheight " style="float:left">总计：</span><span style="float:left" id="money_total" class="money_total_two_shifu fore-span ld-Marheight">0元</span>
<!--<span class="money_total_two ld-Marheight " style="float:left">总计：</span><span style="float:left" id="money_total" class="money_total_two_shifu fore-span ld-Marheight">0元</span>-->
</form>
</td>
......
application/index/view/realtime/realtimePerformance.html
View file @ 7d9d0afb
......@@ -503,11 +503,11 @@
<div class="detail-modal-bargaininfo-main-right">
<span></span>
<br />
<span>是否开业：</span>
<!--<span>是否开业：</span>
<select class="form-control" id="bargaininfo_is_open">
<option value="0">否</option>
<option value="1">是</option>
</select> <br />
</select> <br />-->
<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
<!--<span>预计收款时间：</span><span id="bargaininfo_expect_payback_time"></span><br>-->
<span>预计收款时间：</span><input type="date" id="bargaininfo_expect_payback_time" placeholder="请输入"><br>
......
application/index/view/report/reportList.html
View file @ 7d9d0afb
......@@ -293,6 +293,9 @@
<option value="72">林老师建行卡</option>
<option value="73">新同联福居银行卡</option>
<option value="60">其他</option>
<option value="13">陈志杰支付宝</option>
<option value="23">陈志杰微信</option>
<option value="74">陈志杰招商银行卡</option>
</select>
</td>
<td>
......
public/app/js/submit_report_pc.js
View file @ 7d9d0afb
......@@ -199,10 +199,10 @@ require(['vue', 'css!style/submit_report_pc.css', 'jquery0325', 'common'], funct
alert('请填写商铺号');
return false;
};
if(_this.is_open == ''){
alert('请填写是否开业');
return false;
};
// if(_this.is_open == ''){
// alert('请填写是否开业');
// return false;
// };
if(_this.industry_type == ''){
alert('请填写业态');
return false;
......
public/resource/js/openCheckList.js
View file @ 7d9d0afb
......@@ -239,8 +239,8 @@ define(['doT', 'text!temp/open_check_template_tpl.html', 'css!style/home.css', '
$('#chengjiaobaogao').text(data.data.bargain_id);
$('#pay_time').text(data.data.income_time);
$('#day_time').text(data.data.create_time);
$('#shop_addr').text(data.data.income_time);
$('#shop_id').text(data.data.create_time);
$('#shop_addr').text(data.data.house_address);
$('#shop_id').text(data.data.house_id);
$('#intro').text(data.data.intro);
$('#back_agent_name').text(data.data.agent_name);//签章
$('#back_shop_name').text(data.data.store_name);
......
public/resource/js/shop_edit.js
View file @ 7d9d0afb
......@@ -61,7 +61,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
_longitudeObj = $('#longitude'), //经度
_latitudeObj = $('#latitude'), //纬度
_trafficObj = $('#traffic'), //交通
_hasMovedObj = $('#hasMoved'), //已入住
// _hasMovedObj = $('#hasMoved'), 已入住
_yingyeTimeObj = $('#yingyeTime'), //营业时间
_kaipanTimeObj = $('#kaipanTime'), //开盘时间,即招商时间
_kaiyeTimeObj = $('#kaiyeTime'), //开业时间
......@@ -344,7 +344,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
_longitudeObj.val(_data['longitude']), //经度
_latitudeObj.val(_data['latitude']), //纬度
_trafficObj.val(_data['traffic']); //交通
_hasMovedObj.val(_data['enter_num']); //已入住
// _hasMovedObj.val(_data['enter_num']); //已入住
_yingyeTimeObj.val(_data['do_business_date']); //营业时间
_data['opening_date'] && _kaipanTimeObj.val(_data['opening_date'].split(' ')[0]); //开盘时间
_data['start_business_date'] && _kaiyeTimeObj.val(_data['start_business_date'].split(' ')[0]); //开业时间
......@@ -920,7 +920,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
_shangpuTypeObj.change(function() {
if($(this).val() == '1') {
//街铺
$('.has-housed').html('当前经营');//
// $('.has-housed').html('当前经营');
_jinchangPriceObj.attr('data-alert','请填写对内转让费！').parent().prev().html('对内转让费');
_roomArea1Obj.attr('data-alert','请填写建筑面积！').parent().prev().html('建筑面积');
_businessAreaObj.attr('data-alert','请填写使用面积！').parent().prev().html('使用面积');
......@@ -930,7 +930,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
_foreignZhuanrangPriceObj.closest('.form-group').css('display', 'block');
} else {
//商场
$('.has-housed').html('已入驻');
// $('.has-housed').html('已入驻');
_jinchangPriceObj.attr('data-alert','请填写进场费！').parent().prev().html('进场费');
_roomArea1Obj.attr('data-alert','请填写商铺面积！').parent().prev().html('商铺面积');
_businessAreaObj.attr('data-alert','请填写项目总面积！').parent().prev().html('项目总面积');
......@@ -1120,7 +1120,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
_longitudeObj, //经度
_latitudeObj, //纬度
_trafficObj, //交通
_hasMovedObj, //已入住
// _hasMovedObj, //已入住
_yingyeTimeObj, //营业时间
_yongjinRuleObj, //佣金规则
_foreignYoushiObj, //周边配套，对外项目优势
......@@ -1300,7 +1300,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
'longitude': _longitudeObj.val(),
'latitude': _latitudeObj.val(),
'traffic': $.trim(_trafficObj.val()),
'enter_num': $.trim(_hasMovedObj.val()),
// 'enter_num': $.trim(_hasMovedObj.val()),
'do_business_date': $.trim(_yingyeTimeObj.val()),
'opening_date': _kaipanTimeObj.val(),
'start_business_date': _kaiyeTimeObj.val(),
......
public/resource/template/financial_manager_daily_list_template_tpl.html
View file @ 7d9d0afb
......@@ -88,6 +88,18 @@
<td>[%= it[item]['income_time'] %]</td>
<td>
<a class="btn1 btn-info record-pic" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a>
[% if(it[item]["is_open"] == 0 && localStorage.getItem('isFinancialDianZhang') == 0){ %]
[% if(it[item]["is_check"] == 0) { %]
<a class="btn1 btn-info apply-open is-show-open" href="#modal_open" data-pay_log_id="[%= it[item]['id'] %]" data-report_id="[%= it[item]['report_id'] %]" data-bargain_id="[%= it[item]['bargain_id'] %]" data-order_id="[%= it[item]['order_id'] %]" data-house_id="[%= it[item]['house_id'] %]" data-house_address="[%= it[item]['house_address'] %]" data-toggle="modal">申请开业</a>
[% } %]
[% if(it[item]["is_check"] == 1) { %]
<a class="btn1 btn-default is-show-open" data-pay_log_id="[%= it[item]['id'] %]" data-report_id="[%= it[item]['report_id'] %]" data-bargain_id="[%= it[item]['bargain_id'] %]" data-order_id="[%= it[item]['order_id'] %]" data-house_id="[%= it[item]['house_id'] %]" data-house_address="[%= it[item]['house_address'] %]">开业审核中</a>
[% } %]
[% } %]
<a class="btn1 btn-info add-pic" href="#modal-addPic" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">编辑</a>
<a class="btn1 btn-info money_back" href="#modal-back" data-toggle="modal" data-id='[%= it[item]["id"]%]' data-income_time='[%= it[item]['income_time'] %]' data-real_money='[%= it[item]['real_money'] %]' data-addr="[%= it[item]['house_address'] %]" data-report_id='[%= it[item]['report_id'] %]' data-order_id='[%= it[item]['order_id'] %]' data-order_no='[%= it[item]['order_no'] %]' data-agent_id='[%= it[item]['agent_id'] %]' data-agent_name='[%= it[item]['current_agent_name'] %]' data-type='案场费'>退款</a>
[% if(check_auth('index/delPayLog')) { %]
......
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