id补充

application/index/view/finance/commission.html

@@ -167,6 +167,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 />
@@ -186,6 +189,8 @@
 
 							</div>
 							<div class="detail-modal-bargaininfo-main-right">
+								<span></span>
+								<br />
 								<span>是否开业：</span>
 								<select class="form-control" id="bargaininfo_is_open" disabled="disabled">
 									<option value="0">否</option>
@@ -233,6 +238,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>

application/index/view/finance/tax.html

@@ -147,6 +147,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 />
@@ -166,6 +169,8 @@
 
 							</div>
 							<div class="detail-modal-bargaininfo-main-right">
+								<span></span>
+								<br />
 								<span>是否开业：</span>
 								<select class="form-control" id="bargaininfo_is_open" disabled="disabled">
 									<option value="0">否</option>
@@ -213,6 +218,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>

application/index/view/finance/wait_back_out.html

@@ -114,6 +114,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 />
@@ -133,6 +136,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>
@@ -183,6 +188,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>
@@ -239,6 +245,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/performancesubsidiary/performancesubsidiaryList.html

@@ -152,6 +152,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 />
@@ -173,6 +176,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>
@@ -225,6 +230,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>
@@ -281,6 +287,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/realtime/realtimePerformance.html

@@ -444,6 +444,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 />
@@ -463,6 +466,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>
@@ -513,6 +518,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>
@@ -536,6 +542,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>

public/resource/js/commission.js

@@ -471,6 +471,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_n
 				success: function(data) {
 					if(data.code == 200) {
 						if(data.data) {
+							$('#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/js/performance_subsidiary.js

@@ -544,6 +544,7 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r
 						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/js/tax.js

@@ -458,6 +458,7 @@ define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_no_edit_t
 				success: function(data) {
 					if(data.code == 200) {
 						if(data.data) {
+							$('#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/js/waitBackout.js

-define(['doT', 'text!temp/wait_backout_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
+define(['doT', 'text!temp/wait_backout_template_tpl.html', 'text!temp/reportList_no_edit_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax) {
 	bargain = {
 		pageNo: 1,
 		/*第几页*/
@@ -12,7 +12,7 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'css!style/home.css',
 		maidTotalCommission: 0,//应收总佣金
 		init: function() {
 			//初始化dot
-			$(document.body).append(template);
+			$(document.body).append(template + template_tax);
 			bargain.getList(1);
 			bargain.event();
 		},
@@ -521,6 +521,7 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'css!style/home.css',
 				success: function(data) {
 					if(data.code == 200) {
 						if(data.data) {
+							$('#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_no_edit_template_tpl.html

@@ -88,6 +88,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>[%= 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

@@ -30,112 +30,4 @@
         <td colspan="9" style="text-align:center;"> 暂无数据</td>
     </tr>
     [% } %]
-</script>
-
-<script id="reportList_shuiFee_list_tpl" type="text/template">
-	[% if(it && it.length && it.length>0) { %]
-    [% for(var item in it){ %]
-    [% var getInfoType=function(r){switch(Number(r)){case 1:return"盘方";case 2:return"客方";case 3:return"反签";case 4:return"独家";case 5:return"合作方";default:return"未定义"}}; %]
-	    <section>
-			<div>
-				<table class="detail-modal-tax-table table-haveborder">
-					<tr>
-						<td>开票金额</td>
-						<td>[%= it[item]['total_fee'] %]</td>
-						<td>开票日期</td>
-						<td>[%= it[item]['operation_date'] %]</td>
-					</tr>
-					<tr>
-						<td>分佣方</td>
-						<td>业务员</td>
-						<td>分佣比例</td>
-						<td>税费</td>
-					</tr>
-					[% if(it[item]['fee_list'] && it[item]['fee_list'].length && it[item]['fee_list'].length>0) { %]
-    				[% for(var item2 in it[item]['fee_list']){ %]
-						<tr data-feeid="[%= it[item]['fee_list'][item2]['fee_id'] %]">
-							<td>[%= getInfoType(it[item]['fee_list'][item2]['role']) %]</td>
-							<td>[%= it[item]['fee_list'][item2]['name']+'-'+it[item]['fee_list'][item2]['phone'] %]</td>
-							<td>[%= it[item]['fee_list'][item2]['scale'] %]</td>
-							<td>[%= it[item]['fee_list'][item2]['fee'] %]</td>
-						</tr>
-					[% } %]
-				    [% }else{ %]
-				    	<tr>暂无</tr>
-				    [% } %]
-				</table>
-			</div>
-			<div>
-				<!--<a class="btn btn-default" href="#modal_new_tax" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">编辑</a>-->
-				<br /><br />
-				<!--<a class="btn btn-danger detail-modal-shuiFee-del-btn" href="javascript:;" data-recordid="[%= it[item]['id'] %]">删除</a>-->
-			</div>
-		</section>
-	[% } %]
-    [% }else{ %]
-    	<section>暂无数据</section>
-    [% } %]
-</script>
-
-<script id="reportList_maid_list_tpl" type="text/template">
-	[% if(it['data'] && it['data'].length && it['data'].length>0) { %]
-	[% 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]['role_name'] %]</td>
-        <td>[%= it['data'][i]['agent'] %]</td>
-        <td>[%= it['data'][i]['district_store'] %]</td>
-        <td><span contenteditable class="detail-modal-maid-span-scale">[%= it['data'][i]['scale'] %]</span><span>%</span></td>
-        <td contenteditable class="detail-modal-maid-td-should-commission">[%= it['data'][i]['scale_fee'] %]</td>
-        <td colspan="7" class="detail-modal-maid-mix-td oh">
-        	[% if(it['data'][i]['partial_commission'] && it['data'][i]['partial_commission'].length && it['data'][i]['partial_commission'].length>0) { %]
-        		[% for(var j in it['data'][i]['partial_commission']){ %]
-				<div class="oh" data-id="[%= it['data'][i]['partial_commission'][j]['id'] %]">
-					<span contenteditable class="detail-modal-maid-span-real-fee">[%= it['data'][i]['partial_commission'][j]['real_fee'] %]</span>
-					<span contenteditable class="detail-modal-maid-span-service-charge">[%= it['data'][i]['partial_commission'][j]['service_charge'] %]</span>
-					<span contenteditable class="detail-modal-maid-span-charity-fund">[%= it['data'][i]['partial_commission'][j]['charity_fund'] %]</span>
-					<span contenteditable class="detail-modal-maid-span-cash">[%= it['data'][i]['partial_commission'][j]['cash'] %]</span>
-					<span contenteditable class="detail-modal-maid-span-practical-fee">[%= it['data'][i]['partial_commission'][j]['practical_fee'] %]</span>
-					<span class="detail-modal-maid-span-date" data-dateid="[%= it['data'][i]['partial_commission'][j]['income_time']['id'] %]">[%= it['data'][i]['partial_commission'][j]['income_time']['income_time'] %]</span>
-					<span class="detail-modal-maid-span-time">[%= dealT(it['data'][i]['partial_commission'][j]['confirm_date']) %]</span>
-				</div>
-				[% } %]
-    		[% }else{ %]
-	    		<div class="oh">
-					<span contenteditable class="detail-modal-maid-span-real-fee"></span>
-					<span contenteditable class="detail-modal-maid-span-service-charge">0</span>
-					<span contenteditable class="detail-modal-maid-span-charity-fund">0</span>
-					<span contenteditable class="detail-modal-maid-span-cash">0</span>
-					<span contenteditable class="detail-modal-maid-span-practical-fee"></span>
-					<span class="detail-modal-maid-span-date" data-dateid=""></span>
-					<span class="detail-modal-maid-span-time"></span>
-				</div>	
-    		[% } %]
-		</td>
-		<td>
-			[% if(check_auth('account_commission')) { %]
-				<!--<a href="#modal_new_maid" class="btn-success detail-modal-maid-a-edit" data-toggle="modal">编辑</a>-->
-			[% } %]
-			[% if(check_auth('index/delPartialCommission') && (it['data'][i]['father_id'] != 0)) { %]
-				<!--<a href="javascript:;" class="btn-danger detail-modal-maid-a-del">删除</a>-->
-			[% } %]
-		</td>
-    </tr>
-    [% } %]
-    [% }else{ %]
-    <tr>
-        <td colspan="11" style="text-align:center;"> 暂无数据</td>
-    </tr>
-    [% } %]
-</script>
-
-<script id="reportList_maid_sub1_list_tpl" type="text/template">
-	<div class="oh">
-		<span contenteditable class="detail-modal-maid-span-real-fee"></span>
-		<span contenteditable class="detail-modal-maid-span-service-charge">0</span>
-		<span contenteditable class="detail-modal-maid-span-charity-fund">0</span>
-		<span contenteditable class="detail-modal-maid-span-cash">0</span>
-		<span contenteditable class="detail-modal-maid-span-practical-fee"></span>
-		<span class="detail-modal-maid-span-time"></span>
-	</div>
 </script>
\ No newline at end of file