财务日报

application/index/view/finance/daily_details.html

@@ -358,6 +358,7 @@
 					<table class="table table-striped table-bordered table-hover table-condensed">
 							<thead>
             	                <tr class="maintable-tr-bar">
+									<th class="text-center">类型</th>
 									<th class="text-center">收款ID</th>
 									<th class="text-center">成交报告ID</th>
 									<th class="text-center">成交商铺地址</th>
@@ -390,6 +391,7 @@
 					<table class="table table-striped table-bordered table-hover table-condensed">
 							<thead>
             	                <tr class="maintable-tr-bar">
+									<th class="text-center">类型</th>
 									<th class="text-center">收款ID</th>
 									<th class="text-center">成交报告ID</th>
 									<th class="text-center">成交商铺地址</th>
@@ -421,6 +423,7 @@
 					<table class="table table-striped table-bordered table-hover table-condensed">
 							<thead>
             	                <tr class="maintable-tr-bar">
+									<th class="text-center">类型</th>
 									<th class="text-center">收款ID</th>
 									<th class="text-center">订单ID</th>
 									<th class="text-center">房源ID</th>
@@ -449,6 +452,7 @@
 					<table class="table table-striped table-bordered table-hover table-condensed">
 							<thead>
             	                <tr class="maintable-tr-bar">
+									<th class="text-center">类型</th>
 									<th class="text-center">收款ID</th>
 									<th class="text-center">订单ID</th>
 									<th class="text-center">房源ID</th>
@@ -477,6 +481,7 @@
 					<table class="table table-striped table-bordered table-hover table-condensed">
 							<thead>
             	               <tr class="maintable-tr-bar">
+									<th class="text-center">类型</th>
 									<th class="text-center">调整ID</th>
 									<th class="text-center">调整前收款ID</th>
 									<th class="text-center">调整前房源ID</th>

application/index/view/houses/edit.html

@@ -274,7 +274,6 @@
 								</li>
 								
 								<li class="list-group-item">
-									
 									<div class="form-group" id="li_landlord_phone_input">
 										<label>房东称呼和手机号</label>
 										<div class="landlord-form-group">
@@ -287,7 +286,12 @@
 										<img src="/resource/image/jia2@2x.png" class="input-add-tel-landlord" id="landlord_tel_jia" />
 									</div>
 								</li>
-								
+								<li class="list-group-item">
+									<div class="form-group">
+										<label>房东备注：(选填)</label>
+										<input type="text"  id="landlord_remark" class="form-control" style="width: 300px;"/>
+									</div>
+								</li>
 								<li class="list-group-item" >
 									<div class="form-group">
 										<label for="shangpuType">付款规则</label>

public/resource/js/officeBuildingList.js

@@ -1013,7 +1013,7 @@ define(['doT', 'text!temp/office_building_list_template_tpl.html', 'css!style/ho
 			var caozuo_table = "";
 			$.ajax({
 				'type': 'GET',
-				'url': '/index/getRecords', //获取操作记录
+				'url': '/office_index/getRecords', //获取操作记录
 				data: {
 					"houses_id": business.house_id
 				},
@@ -1292,7 +1292,7 @@ if(data.code == 200) {
 			}
 
 			$.ajax({
-				url: '/index/batchChangDish',
+				url: '/office_index/batchChangDish',
 				type: 'POST',
 				async: true,
 				data: {
@@ -1667,7 +1667,7 @@ if(data.code == 200) {
 		getFollowupList: function(){
 			$.ajax({
 				'type': 'get',
-				'url': '/broker/getListByHouseId',
+				'url': '/office/getListByHouseId',
 				data: {
 					'house_id': business.id,
 					'AuthToken': business.AuthToken
@@ -1689,7 +1689,7 @@ if(data.code == 200) {
 							$('#modal_followup_table_list').html('<tr><td class="text-center">暂无数据</td></tr>');
 						}
 						//判断用户是否有权限跟进
-						if(check_auth('broker/addShopFollowUp')){
+						if(check_auth('office/addShopFollowUp')){
 							$('#modal_followup_submit_btn').show();
 						}else{
 							$('#modal_followup_submit_btn').hide();
@@ -1710,7 +1710,7 @@ if(data.code == 200) {
 				business.isFollowupSaving = true;
 				$.ajax({
 					'type': 'post',
-					'url': '/broker/addShopFollowUp',
+					'url': '/office/addShopFollowUp',
 					data: {
 						'house_id': business.id,
 						'AuthToken': business.AuthToken,

public/resource/js/shop_edit.js

@@ -66,6 +66,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 				_kaipanTimeObj = $('#kaipanTime'), //开盘时间,即招商时间
 				_kaiyeTimeObj = $('#kaiyeTime'), //开业时间
 				_yongjinRuleObj = $('#yongjinRule'), //佣金规则
+				_landlordRemarkObj = $('#landlord_remark'), //房东备注
 				_guizeFuObj = $('#guizeFu'), //签约规则,付
 				_guizeYaObj = $('#guizeYa'), //签约规则，押
 				_qianyueNianxianObj = $('#qianyueNianxian'), //签约年限
@@ -350,6 +351,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 									_data['start_business_date'] && _kaiyeTimeObj.val(_data['start_business_date'].split(' ')[0]); //开业时间
 									_hasGasObj.val(_data['is_has_gas']); //是否有燃气
 									_yongjinRuleObj.val(_data['fee_rule']); //佣金规则
+									_landlordRemarkObj.val(_data['landlord_remark']); //房东备注
 									_guizeFuObj.val(_data['payment_month']); //签约规则,付
 									_guizeYaObj.val(_data['deposit_month']); //签约规则，押
 									_qianyueNianxianObj.val(_data['age_limit'].split('-')[0]); //签约年限上限
@@ -1306,6 +1308,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 					'start_business_date': _kaiyeTimeObj.val(),
 					'is_has_gas': _hasGasObj.val(),
 					'fee_rule': $.trim(_yongjinRuleObj.val()),
+					'landlord_remark': $.trim(_landlordRemarkObj.val()),//房东备注
 					'payment_month': _guizeFuObj.val(),
 					'deposit_month': _guizeYaObj.val(),
 					'age_limit': _qianyueNianxianObj.val() + '-' + _qianyueNianxian2Obj.val(),

public/resource/template/financial_manager_daily_list_template_tpl.html

@@ -4,6 +4,12 @@
     [% if(it.length) { %]
     [% for(var item in it){ %]
     <tr>
+    	<td>[% if(it[item]["type"] == 1) { %]
+    		商铺
+		[% }else{ %]
+			办公楼
+		[% } %]
+		</td>
     	<td>[%= it[item]['id'] %]</td>
         <!--<td>[%= it[item]['bargain_id'] %]</td>-->
         <td><a class="details-btn-liu" href="#modal_detail_liu" data-toggle="modal" data-id='[%= it[item]["bargain_id"] %]'>[%= it[item]['bargain_id'] %]</a></td>
@@ -71,6 +77,12 @@
     [% if(it.length) { %]
     [% for(var item in it){ %]
     <tr>
+    	<td>[% if(it[item]["type"] == 1) { %]
+    		商铺
+		[% }else{ %]
+			办公楼
+		[% } %]
+		</td>
     	<td>[%= it[item]['id'] %]</td>
         <td><a class="details-btn-liu" href="#modal_detail_liu" data-toggle="modal" data-id='[%= it[item]["bargain_id"] %]'>[%= it[item]['bargain_id'] %]</a></td>
         <td>[%= it[item]['house_address'] %]</td>
@@ -119,6 +131,12 @@
     [% if(it.length) { %]
     [% for(var item in it){ %]
     <tr>
+    	<td>[% if(it[item]["type"] == 1) { %]
+    		商铺
+		[% }else{ %]
+			办公楼
+		[% } %]
+		</td>
     	<td>[%= it[item]['id'] %]</td>
         <!--<td>[%= it[item]['order_id'] %]</td>-->
         <td><a href="#modal-time-liu" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>[%= it[item]['order_id'] %]</a></td>
@@ -157,6 +175,12 @@
     [% if(it.length) { %]
     [% for(var item in it){ %]
     <tr>
+    	<td>[% if(it[item]["type"] == 1) { %]
+    		商铺
+		[% }else{ %]
+			办公楼
+		[% } %]
+		</td>
     	<td>[%= it[item]['id'] %]</td>
         <!--<td>[%= it[item]['order_id'] %]</td>-->
         <td><a href="#modal-time-liu" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>[%= it[item]['order_id'] %]</a></td>
@@ -197,6 +221,12 @@
     [% if(it.length) { %]
     [% for(var item in it){ %]
     <tr>
+    	<td>[% if(it[item]["type"] == 1) { %]
+    		商铺
+		[% }else{ %]
+			办公楼
+		[% } %]
+		</td>
     	<td>[%= it[item]['id'] %]</td>
     	<td>[%= it[item]['old_paylog_id'] %]</td>
         <td>[%= it[item]['house_id'] %]</td>