办公楼

application/index/view/finance/daily_details.html

@@ -1072,13 +1072,13 @@
 			<div class="modal-body modal-body-height pic-con2" style="height: 528px;">
 				<form class="">
 					<div class="col-xs-12">
-						<div class="col-xs-3">
+						<div class="col-xs-2">
 							<div class="form-group">
 								<strong><span>入账ID:</span></strong>
 								<span id="ruzhangId">45122</span>
 							</div>
 						</div>
-						<div class="col-xs-3">
+						<div class="col-xs-2">
 							<div class="form-group">
 								<strong><span>带看ID:</span></strong>
 								<span id="dingdanId">45122</span>
@@ -1086,16 +1086,22 @@
 						</div>
 						<div class="col-xs-3">
 							<div class="form-group">
-								<strong><span>成交报告ID:</span></strong>
-								<span id="chengjiaobaogaoId"></span>
+								<strong><span>所属门店:</span></strong>
+								<span id="store_name"></span>
 							</div>
 						</div>
-						<div class="col-xs-3">
+						<div class="col-xs-2">
 							<div class="form-group">
 								<strong><span>房源ID:</span></strong>
 								<span id="fangyuanId">45122</span>
 							</div>
 						</div>
+						<div class="col-xs-3">
+							<div class="form-group" style="margin-top: 3px;">
+								<strong><span>成交报告ID:</span></strong>
+								<span id="chengjiaobaogaoId"></span>
+							</div>
+						</div>
 					</div>
 					<div class="col-xs-12">
 						<div class="col-xs-6">

application/index/view/officeBuilding/adjustmentOffice.html

@@ -400,6 +400,15 @@
 								</div>
 							</div>
 						</div>
+						
+					</div>
+					<div class="col-xs-12">
+						<div class="col-xs-12">
+							<div class="form-group">
+								<strong><span class="col-xs-2 ld-Marheight">所属门店:</span></strong>
+								<span id="store_name" class="col-xs-6 ld-Marheight"></span>
+							</div>
+						</div>
 					</div>
 					<div class="col-xs-6">
 						<div class="col-xs-12">

application/index/view/officeBuilding/getCollectionOffice.html

@@ -679,13 +679,13 @@
 			</div>
 			<div class="modal-body modal-body-height pic-con2">
 					<div class="col-xs-12">
-						<div class="col-xs-3">
+						<div class="col-xs-2">
 							<div class="form-group">
 								<strong><span>入账ID:</span></strong>
 								<span id="ruzhangId">45122</span>
 							</div>
 						</div>
-						<div class="col-xs-3">
+						<div class="col-xs-2">
 							<div class="form-group">
 								<strong><span>带看ID:</span></strong>
 								<span id="dingdanId">45122</span>
@@ -693,17 +693,24 @@
 						</div>
 						<div class="col-xs-3">
 							<div class="form-group">
-								<strong><span>成交报告ID:</span></strong>
-								<span id="chengjiaobaogaoId">45122</span>
-								<a  class="btn btn-info btn-small modifyReport" href="#modifyReport_modal" data-toggle="modal">修改</a> 
+								<strong><span>所属门店:</span></strong>
+								<span id="store_name"></span>
 							</div>
 						</div>
-						<div class="col-xs-3">
+						<div class="col-xs-2">
 							<div class="form-group">
 								<strong><span>房源ID:</span></strong>
 								<span id="fangyuanId">45122</span>
 							</div>
 						</div>
+						<div class="col-xs-3">
+							<div class="form-group" style="margin-top: 3px;">
+								<strong><span>成交报告ID:</span></strong>
+								<span id="chengjiaobaogaoId">45122</span>
+								<a  class="btn btn-info btn-small modifyReport" href="#modifyReport_modal" data-toggle="modal">修改</a> 
+							</div>
+						</div>
+						
 					</div>
 					<div class="col-xs-12">
 						<div class="col-xs-6">

public/resource/js/adjustmentOffice.js

@@ -228,6 +228,8 @@ define(['doT', 'text!temp/adjustment_office_template_tpl.html', 'css!style/home.
 			$('#after_into_date').text(data.adjustment[0].income_time);
 			$('#after_into_type').text(data.adjustment[0].type);
 			$('#after_into_price').text(data.money);
+			$("#store_name").text(data.reckon_in_store_name);//所属门店
+			
 		},
 		
 		/**

public/resource/js/agent.js

@@ -640,9 +640,9 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
 							$("input[name = phone]").val(data.data.phone);
 							$("input[name = name]").val(data.data.name);
 							$("input[name = identity]").val(data.data.id_card);//身份证号
-							$(".card-name").val(data.data.account);
-							$(".card-num").val(data.data.card_no);
-							$(".card-account").val(data.data.bank);
+							$(".card-name").html(data.data.account);
+							$(".card-num").html(data.data.card_no);
+							$(".card-account").html(data.data.bank);
 							$("[name = district_id]").val(data.data.district_id);
 							if(data.data.district_id) {
 								agent.getDistrictStoreList(data.data.district_id, function(_data) {
@@ -1031,7 +1031,12 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
 //			params.site_id = $("#district_id2_city").val();//站点筛选
 			params.status = $("select[name=agent_status]").val();
 			params.id_card = $("#identity_id").val();
-			
+			if($("#district_id2_city").val()){
+				if(!$("#district_id2").val()){
+				   alert('请选择部门进行搜索');
+				   return
+				}
+			}
 			$.ajax({
 				url: '/index/AgentList',
 				type: 'GET',

public/resource/js/financial_manager_daily_list.js

@@ -1620,6 +1620,7 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 			doc.find("#address").text(data.address);
 			doc.find("#comit_time").text(data.create_time);
 			doc.find("#open_time").text(data.open_time);//开业确定时间
+			doc.find("#store_name").text(data.reckon_in_store_name);//所属门店
 			
 			//判断收款详情的类型
 			if(data.type == 91){

public/resource/js/getCollectionOffice.js

@@ -1538,6 +1538,9 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home
 			doc.find("#tijiaoren").text(data.agent_name);
 			doc.find("#address").text(data.address);
 			doc.find("#comit_time").text(data.create_time);
+			doc.find("#store_name").text(data.reckon_in_store_name);//所属门店
+			
+			
 //			doc.find("#open_time").text(data.open_time);//开业确定时间
 			
 			//判断收款详情的类型