1

application/index/view/finance/account_statement.html

@@ -181,6 +181,9 @@
 					<div class="detail-modal-body-sec">
 						<form class="detail-modal-bargaininfo-form">
 							<div class="detail-modal-bargaininfo-main-left">
+								<span>成交报告ID：</span>
+								<span id="bargaininfo_id_span"></span>
+								<br />
 								<span>商铺类型：</span>
 								<span id="bargaininfo_shop_type"></span>
 								<br />
@@ -203,6 +206,8 @@
 
 							</div>
 							<div class="detail-modal-bargaininfo-main-right">
+								<span></span>
+								<br />
 								<span>是否开业：</span>
 								<select class="form-control" id="bargaininfo_is_open">
 									<option value="0">否</option>
@@ -260,6 +265,7 @@
 						<table class="table table-striped table-bordered table-hover table-condensed" id="maid_table_main">
 							<thead>
 								<tr>
+									<th class="text-center">分佣ID</th>
 									<th class="text-center">分佣方</th>
 									<th class="text-center">业务员</th>
 									<th class="text-center">所属部门/门店</th>
@@ -316,6 +322,7 @@
 									<td class="text-center">合计</td>
 									<td class="text-center"></td>
 									<td class="text-center"></td>
+									<td class="text-center"></td>
 									<td class="text-center" id="maid_count_total_rate"></td>
 									<td class="text-center" id="maid_count_total_yingfen"></td>
 									<td class="text-center" id="maid_count_total_yufen"></td>

application/index/view/finance/wait_back_out.html

@@ -23,7 +23,7 @@
 							<table class="table table-striped table-bordered table-hover table-condensed">
 								<thead>
 									<tr>
-										<td colspan="9" class="maintable-top-sub-tr">
+										<td colspan="10" class="maintable-top-sub-tr">
 											<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>
@@ -33,7 +33,7 @@
 									</tr>
 									<!--三级审核的搜索功能-->
 									<tr>
-										<td colspan="9">
+										<td colspan="10">
 											<form id="maintable_form_search">
 												<span class="fore-span">商铺类型:</span>
 												<select class="form-control btn2" name="maintable_shop_type" id="maintable_shop_type">
@@ -67,6 +67,7 @@
 										</td>
 									</tr>
 									<tr class="maintable-tr-bar">
+										<th class="text-center">ID</th>
 										<th class="text-center">提交时间</th>
 										<th class="text-center">是否开业</th>
 										<th class="text-center">商铺地址</th>

public/appnew/src/components/achieveMain/achieveFork.vue

 <template>
 	<div>
 		<header-pulic :data="headerData"></header-pulic>
+		
+		<div>
+			<select>
+				<option value="上海">上海</option>
+				<option value="杭州">杭州</option>
+			</select>
+		</div>
 		<!--时间搜索区域-->
 		<nav>
 			<div class="nav-main">

public/resource/css/report_list.css

@@ -162,12 +162,15 @@ addtax_
 	width: 70px;
 }
 #maid_table_main>thead th:nth-of-type(2){
-	width: 100px;
+	width: 70px;
 }
 #maid_table_main>thead th:nth-of-type(3){
-	width: 120px;
+	width: 100px;
 }
 #maid_table_main>thead th:nth-of-type(4){
+	width: 120px;
+}
+#maid_table_main>thead th:nth-of-type(5){
 	width: 100px;
 }
 
@@ -355,7 +358,7 @@ addtax_
 
 
 #modal_detail>div {
-	width: 1384px;
+	width: 1454px;
 }
 
 /*成交信息tab*/

public/resource/js/reportList.js

@@ -669,6 +669,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 						if(data.data) {
 							bargain.detail_shop_id = data.data.house_id;
 							bargain.detail_user_id = data.data.user_id;
+							$('#bargaininfo_id_span').html(data.data.id);
 							$('#bargaininfo_shop_type').html(data.data.shop_type=='1'?'街铺':'商场');
 							$('#bargaininfo_is_open').val(data.data.is_open);
 							$('#bargaininfo_beizhu').val(data.data.content);

public/resource/template/reportList_template_tpl.html

@@ -104,6 +104,7 @@
 	[% var dealT=function(g){if(g&&(g!="null")){return g}else{return""}}; %]
     [% for(var i in it['data']){ %]
     <tr class="text-center" data-id="[%= it['data'][i]['id'] %]" data-agentid="[%= it['data'][i]['agent_id'] %]" data-role="[%= it['data'][i]['role'] %]" data-lastid="[%= it['data'][i]['last_commission_id'] %]">
+        <td>[%= it['data'][i]['id'] %]</td>
         <td data-role="[%= it['data'][i]['role'] %]">[%= it['data'][i]['role_name'] %]</td>
         <td>[%= it['data'][i]['agent'] %]</td>
         <td>[%= it['data'][i]['district_store'] %]</td>

public/resource/template/wait_backout_template_tpl.html

@@ -3,6 +3,7 @@
     [% var sw=function(s){switch(Number(s)){case 10:return"出租";case 20:return"增佣";case 30:return"代理";case 40:return"好处费";default:return s}}; %]
     [% for(var item in it["list"]){ %]
     <tr data-id="[%= it['list'][item]['id'] %]" data-orderid="[%= it['list'][item]['order_id'] %]">
+    	<td class="text-center" >[%= it["list"][item]['id'] %]</td>
         <td class="text-center" width="10%">[%= it["list"][item]['create_time'] %]</td>
         <td class="text-center" width="8%">[%= it["list"][item]['is_open']?'是':'否' %]</td>
         <td class="text-left">[%= it["list"][item]['internal_address'] %]</td>