时间轴修改

application/app_broker/view/index/timeline_pc.html

@@ -32,11 +32,20 @@
 								<p v-if="item.step_name==='follow_up_log'">对面积的要求：<span>{{item.area_requirement}}</span></p>
 								<p v-if="item.step_name==='follow_up_log'">对价格的要求：<span>{{item.price_requirement}}</span></p>
 								<p v-if="item.step_name==='follow_up_log'">所在区域：<span>{{item.area_detail+' '+item.business_area}}</span></p>
-								<p v-if="item.step_name==='pay_log'">入账类型：<span>{{switchRzType(item.type)}}</span></p>
-								<p v-if="item.step_name==='pay_log'">支付方式：<span>{{switchPayType(item.pay_type)}}</span></p>
-								<p v-if="item.step_name==='pay_log'">入账金额：<span class="span-active">{{item.money}}元</span></p>
+								<div v-if="item.step_name==='pay_log'">
+									<div class="sp-pay-log-div" v-for="(item2, idnex2) in item.list">
+										<p>入账类型：<span>{{switchRzType(item2.type)}}</span></p>
+										<p>支付方式：<span>{{switchPayType(item2.pay_type)}}</span></p>
+										<p>入账金额：<span class="span-active">{{item2.money}}元</span></p>
+									</div>
+								</div>
 								<p v-if="item.step_name==='pay_log'">商铺号：<span class="span-active">{{item.house_number}}</span></p>
 								<p v-if="item.step_name==='pay_log'">业态/品牌：<span>{{item.industry_type}}</span></p>
+								<ol v-if="item.step_name==='pay_log'" class="li-img-list">
+									<li v-for="(item2, idnex2) in item.img">
+										<a href="javascript:;" data-id="item2.id"><img :src="item.img_path+item2.img_name"></a>
+									</li>
+								</ol>
 								<p v-if="item.step_name==='refund'">退款金额：<span class="span-active">{{item.refund_money}}元</span></p>
 								<p v-if="item.step_name==='refund'" class="yinhangka-info">退款银行卡信息</p>
 								<p v-if="item.step_name==='refund'">姓名：<span>{{item.agent_name}}</span></p>
@@ -74,4 +83,14 @@
 		<script src="/app/js/libs/require.min.js" data-js="/app/js/timeline_pc.js" data-main="/app/js/main" defer async="true"></script>
 	</body>
 
-</html>
\ No newline at end of file
+</html>
+
+
+<!--
+	report	报备
+	march_in	进场
+	follow_up_log	跟进
+	pay_log	收款
+	refund	退款
+	bargain	成交报告
+-->
\ No newline at end of file

application/index/view/finance/account_statement.html

@@ -119,8 +119,7 @@
 								</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>
+								<span>预计收款时间：</span><input type="date" id="bargaininfo_expect_payback_time" placeholder="请输入"><br>
 								<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
 								<span>成交日期：</span><span id="bargaininfo_create_time"></span><br>
 								<span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" type="number">元

application/index/view/finance/commission.html

@@ -150,6 +150,7 @@
 								</select> <br />
 								<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
 								<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
+								<span>预计收款时间：</span><input type="date" id="bargaininfo_expect_payback_time" readonly="readonly" placeholder="请输入"><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>

application/index/view/finance/tax.html

@@ -150,6 +150,7 @@
 								</select> <br />
 								<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
 								<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
+								<span>预计收款时间：</span><input type="date" id="bargaininfo_expect_payback_time" readonly="readonly" placeholder="请输入"><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>

public/app/css/timeline_pc.css

@@ -129,4 +129,8 @@ body{
 }
 #main_list>li.main-li-first>.main-area>.right-area>h6{
 	color: #ff9419;
-}
\ No newline at end of file
+}
+
+.sp-pay-log-div+.sp-pay-log-div{
+	padding-top: .3rem;
+}

public/resource/js/commission.js

@@ -472,6 +472,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_s
 							$("#bargaininfo_type").val(data.data.trade_type);
 							$("#bargaininfo_total_commission").val(data.data.commission);
 							$("#bargaininfo_create_time").html(data.data.create_time);
+							$("#bargaininfo_expect_payback_time").val(data.data.estimated_receipt_date);
 							$("#bargaininfo_yetai").val(data.data.industry_type);
 							$("#bargaininfo_chengjiao_price").val(data.data.price);
 							

public/resource/js/reportList.js

@@ -450,7 +450,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
 							$("#bargaininfo_type").val(data.data.trade_type);
 							$("#bargaininfo_total_commission").val(data.data.commission);
 							$("#bargaininfo_create_time").html(data.data.create_time);
-							$("#bargaininfo_expect_payback_time").html(data.data.payback_time);
+							$("#bargaininfo_expect_payback_time").val(data.data.estimated_receipt_date);
 							$("#bargaininfo_yetai").val(data.data.industry_type);
 							$("#bargaininfo_chengjiao_price").val(data.data.price);
 							
@@ -490,7 +490,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
 				'trade_type': $('#bargaininfo_type').val(),
 				'industry_type': $.trim($('#bargaininfo_yetai').val()),
 				'price': $('#bargaininfo_chengjiao_price').val(),
-				'payback_time': $('#bargaininfo_expect_payback_time').val(),
+				'estimated_receipt_date': $('#bargaininfo_expect_payback_time').val(),
 				'step': bargain.mainTabIndex+1
 				
 			};

public/resource/js/tax.js

@@ -468,6 +468,7 @@ define(['doT', 'text!temp/tax_template_tpl.html', 'text!temp/reportList_shuiFee2
 							$("#bargaininfo_type").val(data.data.trade_type);
 							$("#bargaininfo_total_commission").val(data.data.commission);
 							$("#bargaininfo_create_time").html(data.data.create_time);
+							$("#bargaininfo_expect_payback_time").val(data.data.estimated_receipt_date);
 							$("#bargaininfo_yetai").val(data.data.industry_type);
 							$("#bargaininfo_chengjiao_price").val(data.data.price);