c端商铺列表 商铺详情 h5 增加租金模式

application/index/view/finance/daily_list.html

@@ -81,6 +81,11 @@
 												<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="create_time" name="start_date" type="date">
 												<span class="fore-span margin-left-10">至</span>
 												<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="end_time" name="end_date" type="date">
+												<select class="form-control btn2 margin-top-ld" id="my-review">
+													<option value="-1">我是否审核过</option>
+													<option value="1">我审核过</option>
+													<option value="0">我未审核过</option>
+												</select>
 												<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="financial_id" placeholder="财务日报ID" type="text" value="">
                                                 <select name="district_id" class="form-control btn4">
                                                     <option value="">提交人所在部门</option>
@@ -92,9 +97,7 @@
 													<input class="form-control" data-rule-phoneus="false" data-rule-required="false" id="partical_name" placeholder="提交人姓名" type="text" value="">
 												    <ul class="user-ul"></ul>
 												</div>
-												<!--<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="agent_name" placeholder="提交人姓名" type="text" value="">-->
-												<!--<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="agent_phone" placeholder="提交人手机号" type="text" value="">-->
-												<!--<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="bargain_id" placeholder="成交报告ID" type="text" value="">-->
+												
 												<div style="float: left;margin-top: 10px;">
 													<span class="btn btn-info btn3 search" id="maintable_search">搜索</span>
 													<span class="btn btn-info btn3" id="maintable_reset">重置</span>

public/app/js/detaila_tl.js

@@ -101,6 +101,11 @@
 						_tempStr = response.data.rent_price + '元/年';
 						$(".pu_price").html(_tempStr);
 						
+					}else if(response.data.rent_type == '5') {
+						$(".pu_price_type").html("租金");
+						_tempStr = response.data.rent_price + '元/月/m²';
+						$(".pu_price").html(_tempStr);
+						
 					};
 					line_a = '<p class="a_fonta">' + title + '</p>';
 					$(".line_a").html(line_a);

public/app/js/detaila_tuiguang.js

@@ -93,6 +93,11 @@
 						_tempStr = response.data.rent_price + '元/年';
 						$(".pu_price").html(_tempStr);
 						
+					}else if(response.data.rent_type == '5') {
+						$(".pu_price_type").html("租金");
+						_tempStr = response.data.rent_price + '元/月/m²';
+						$(".pu_price").html(_tempStr);
+						
 					};
 					line_a = '<p class="a_fonta">' + title + '</p>';
 					$(".line_a").html(line_a);

public/appnew/src/components/shop/shopList.vue

@@ -569,6 +569,9 @@
 				if(item.rent_type == 4){
 				    _rent_type ='' + item.rent_price;
 				};
+				if(item.rent_type == 5){
+				    _rent_type ='' + item.rent_price;
+				};
 				return _rent_type;
 			},
 			selesctRentType(item){
@@ -585,6 +588,9 @@
 				if(item.rent_type == 4){
 				    _rent_type_item ='元/年';
 				};
+				if(item.rent_type == 5){
+				    _rent_type_item ='元/月/m²';
+				};
 				return _rent_type_item;
 			},
 			resetConditions(){

public/resource/js/financial_daily_list.js

@@ -12,6 +12,9 @@ define(['doT', 'text!temp/financial_daily_list_template_tpl.html', 'css!style/ho
 		init: function() {
 			//初始化dot
 			$(document.body).append(template);
+			//初始化财务日报日期
+			$('#create_time').val(getBeforeDate(1));
+			$('#end_time').val(getBeforeDate(0));
 			bargain.getList(1);
 			bargain.event();
 		},
@@ -105,7 +108,13 @@ define(['doT', 'text!temp/financial_daily_list_template_tpl.html', 'css!style/ho
 		},
 		//获取一级审核，二级审核，三级审核，结单数据列表共用的方法
 		getList: function(pageNo){
-			console.count('bar');
+			//判断财务日报日期的时间差不能大于7天
+			if((getTimeStamp($('#end_time').val())*1-getTimeStamp($('#create_time').val())*1)>604800000){
+				alert('财务日报日期搜索不能大于7天!');
+				return
+			}
+			
+			
 			var params = {
 				'pageNo': pageNo,
 				'pageSize': bargain.pageSize,
@@ -118,6 +127,7 @@ define(['doT', 'text!temp/financial_daily_list_template_tpl.html', 'css!style/ho
                 'agent_id': bargain.agent_id_phone,
                 'id': $('#financial_id').val(),
                 'status': bargain.switchStatus(),
+                'is_self':$('#my-review').val(),
                 
 			};
 			$.ajax({

public/resource/js/public.js

@@ -362,3 +362,31 @@ function getFlatternDistance(lat1,lng1,lat2,lng2){
     s = Math.round(s * 10000) / 10000;
     return s;
 }
+//获取前n天的时间
+function getBeforeDate(n){
+			    var d = new Date();
+			    var year = d.getFullYear();
+			    var mon=d.getMonth()+1;
+			    var day=d.getDate();
+			    if(day <= n){
+			            if(mon>1) {
+			               mon=mon-1;
+			            }
+			           else {
+			             year = year-1;
+			             mon = 12;
+			             }
+			    }
+			          d.setDate(d.getDate()-n);
+			          year = d.getFullYear();
+			          mon=d.getMonth()+1;
+			          day=d.getDate();
+			     s = year+"-"+(mon<10?('0'+mon):mon)+"-"+(day<10?('0'+day):day)
+			     return s;
+          };
+//年-月-日 转化为时间戳
+function getTimeStamp(date){
+        var oDate = new Date(date);
+	    var time_cha=oDate.getTime();
+	    return time_cha;
+	};