11

application/app_broker/view/index/daily_achieve_dz.html

@@ -87,7 +87,7 @@
 								<tr>
 									<td>房源</td>
 									<td><input type="number" placeholder="填写" data-alert="团队房源须填写完整" class="input-bitian-17"/></td>
-									<td>{{fangyuan}}</td>
+									<td>{{duandui_fangyuan}}</td>
 									<td><input type="number" placeholder="填写" data-alert="团队房源须填写完整" class="input-bitian-18"/></td>
 									<td><input type="number" placeholder="填写"  data-alert="团队房源须填写完整" class="input-bitian-19"/></td>
 									
@@ -95,7 +95,7 @@
 								<tr>
 									<td>客源</td>
 									<td><input type="number" placeholder="填写"  data-alert="团队客源须填写完整" class="input-bitian-20"/></td>
-									<td><input type="number" placeholder="填写" v-model.number="keyuan" readonly="" /></td>
+									<td><input type="number" placeholder="填写" v-model.number="duandui_keyuan" readonly="" /></td>
 									<td><input type="number" placeholder="填写"  data-alert="团队客源须填写完整" class="input-bitian-21"/></td>
 									<td><input type="number" placeholder="填写"  data-alert="团队客源须填写完整" class="input-bitian-22"/></td>
 									
@@ -103,7 +103,7 @@
 								<tr>
 									<td>带看进场</td>
 									<td><input type="number" placeholder="填写"  data-alert="团队带看进场须填写完整" class="input-bitian-23"/></td>
-									<td>{{daikan}}</td>
+									<td>{{duandui_daikan}}</td>
 									<td><input type="number" placeholder="填写"  data-alert="团队带看进场须填写完整" class="input-bitian-24"/></td>
 									<td><input type="number" placeholder="填写"  data-alert="团队带看进场须填写完整" class="input-bitian-25"/></td>
 									
@@ -111,14 +111,14 @@
 								<tr>
 									<td>业绩(元)</td>
 									<td><input type="number" placeholder="填写"  data-alert="团队业绩须填写完整" class="input-bitian-26"/></td>
-									<td>{{daikan}}</td>
+									<td>{{duandui_yeji}}</td>
 									<td><input type="number" placeholder="填写"  data-alert="团队业绩须填写完整" class="input-bitian-27"/></td>
 									<td><input type="number" placeholder="填写"  data-alert="团队业绩须填写完整" class="input-bitian-28"/></td>
 								</tr>
 								<tr>
 									<td>实收(元)</td>
 									<td><input type="number" placeholder="填写"  data-alert="团队实收须填写完整" class="input-bitian-29"/></td>
-									<td>{{daikan}}</td>
+									<td>{{duandui_shishou}}</td>
 									<td><input type="number" placeholder="填写"  data-alert="团队实收须填写完整" class="input-bitian-30"/></td>
 									<td><input type="number" placeholder="填写"  data-alert="团队实收须填写完整" class="input-bitian-31"/></td>
 								</tr>
@@ -198,7 +198,7 @@
 								<td>{{item.user_num}}</td>
 								<td>{{item.follow_up_num}}</td>
 								<td>{{item.performance_week}}</td>
-								<td><input type="number" placeholder="填写" /></td>
+								<td><input type="number" placeholder="填写" class="check-dianping"/></td>
 								
 								<!--<td>
 									<div class="div-textarea" contenteditable="true">点击填写</div>

application/index/view/office/officeBuildingList.html

@@ -304,7 +304,7 @@
                                                 </div>
                                                 <div class="main-select col-xs-12" style="padding:0px;">
 		                                            <select class="form-control btn11 ld-Marheight" id="is_show">
-		                                                <option value="">是否给商户看</option>
+		                                                <option value="">是否给客户看</option>
 		                                                <option value="0">是</option>
 		                                                <option value="1">否</option>
 		                                            </select>

public/app/js/daily_achieve_dz.js

@@ -9,7 +9,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 	var _appToken = getUrlParam('token');
 	//变量 验证所有input
 	var	_isBreakFlag = false;
-	
+	var dianpingLength = 0;
 	var vm = new Vue({
 		el: '#app',
 		data: {
@@ -40,7 +40,13 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 			peopleNum: 1,
 			peopleList: [],
 			nowDayNum: parseInt(new Date().getDate()),
-			canClickFlag: true
+			canClickFlag: true,
+			duandui_fangyuan: 0,//团队日数据
+			duandui_keyuan: 0,
+			duandui_daikan: 0,
+			duandui_yeji: 0,
+			duandui_shishou: 0,
+
 		},
 		components: {
 			
@@ -119,8 +125,17 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 								_this.keyuan = _data.data.add_user_num_day;
 								_this.daikan = _data.data.follow_up_num;
 								_this.genjing_day = _data.data.phone_follow_up_num;//店长 日报跟进 日数据
-								//团队日数据
-								
+								//团队日数据   每个员工叠加
+								dianpingLength = _data.data.store_list.length;
+								if(_data.data.store_list){
+									$.each(_data.data.store_list,function(i,item){
+									_this.duandui_fangyuan += item.house_num;   
+									_this.duandui_keyuan += item.user_num;
+									_this.duandui_daikan += item.follow_up_num;
+									_this.duandui_yeji += item.performance_week;
+									_this.duandui_shishou += item.add_user_num;
+								  });
+								}
 								
 								_this.yeji_day = _data.data.performance_day;
 								if(_data.data.agent_total>0){
@@ -227,6 +242,12 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 				if($(".input-limit-11").html() != '点击填写' && $(".input-limit-11").html() != ''){
 					yanzhengArr.push(1);
 				}
+				var dianpingArr=[];
+				for (var i = 0; i < dianpingLength; i++) { 
+					if(!($(".check-dianping").eq(i).val()==='' || $(".check-dianping").eq(i).val()=='填写')){
+						dianpingArr.push(1);
+					}
+                 };
 				//验证div 字数要求
 				if(_isBreakFlag){//true 不进行义验证
 				    return
@@ -259,6 +280,11 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 						alert('提高方法至少填两项');
 						return;
 					}
+					//验证对不同员工的点评
+					if(!(dianpingArr.length == dianpingLength)){
+						alert('点评须填写完整');
+						return;
+					}
 				};
 				
 				

public/app/js/daily_achieve_mdzj.js

@@ -523,108 +523,118 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 			save: function() {
 				//验证不同城市
 				if(shanghai_bitian){//上海
-						$.each([
-						$(".shanghai-bitian-1"),
-						$(".shanghai-bitian-2"),
-						$(".shanghai-bitian-3"),
-						$(".shanghai-bitian-4"),
-						$(".shanghai-bitian-5")
-					], function(i, item) {
-		                if($.trim(item.val()) === '') {
-							alert(item.attr('data-alert'));
-						    _isBreakFlag = true;
-							return false;
-						}else{
-						    _isBreakFlag = false;
-						};
-					});
-				}
+					
+					if($(".shanghai-bitian-1").val() === ''){
+						alert($(".shanghai-bitian-1").attr('data-alert'));
+						return;
+					}
+					if($(".shanghai-bitian-2").val() === ''){
+						alert($(".shanghai-bitian-2").attr('data-alert'));
+						return;
+					}
+					if($(".shanghai-bitian-3").val() === ''){
+						alert($(".shanghai-bitian-3").attr('data-alert'));
+						return;
+					}
+					if($(".shanghai-bitian-4").val() === ''){
+						alert($(".shanghai-bitian-4").attr('data-alert'));
+						return;
+					}
+					if($(".shanghai-bitian-5").val() === ''){
+						alert($(".shanghai-bitian-5").attr('data-alert'));
+						return;
+					}
+				};
 				if(hangzhou_bitian){//杭州
-					if(_isBreakFlag){//验证分数
+					if($(".hangzhou-bitian-1").val() === ''){
+						alert($(".hangzhou-bitian-1").attr('data-alert'));
+						return;
+					}
+					if($(".hangzhou-bitian-2").val() === ''){
+						alert($(".hangzhou-bitian-2").attr('data-alert'));
+						return;
+					}
+					if($(".hangzhou-bitian-3").val() === ''){
+						alert($(".hangzhou-bitian-3").attr('data-alert'));
+						return;
+					}
+					if($(".hangzhou-bitian-4").val() === ''){
+						alert($(".hangzhou-bitian-4").attr('data-alert'));
+						return;
+					}
+					if($(".hangzhou-bitian-5").val() === ''){
+						alert($(".hangzhou-bitian-5").attr('data-alert'));
 						return;
-					}else{
-						$.each([
-						$(".hangzhou-bitian-1"),
-						$(".hangzhou-bitian-2"),
-						$(".hangzhou-bitian-3"),
-						$(".hangzhou-bitian-4"),
-						$(".hangzhou-bitian-5")
-					], function(i, item) {
-		                if($.trim(item.val()) === '') {
-							alert(item.attr('data-alert'));
-						    _isBreakFlag = true;
-							return false;
-						}else{
-						    _isBreakFlag = false;
-						};
-					});
 					}
 					
 				}
 				if(shenzhen_bitian){//深圳
-					if(_isBreakFlag){//验证分数
+					if($(".shenzhen-bitian-1").val() === ''){
+						alert($(".shenzhen-bitian-1").attr('data-alert'));
+						return;
+					}
+					if($(".shenzhen-bitian-2").val() === ''){
+						alert($(".shenzhen-bitian-2").attr('data-alert'));
+						return;
+					}
+					if($(".shenzhen-bitian-3").val() === ''){
+						alert($(".shenzhen-bitian-3").attr('data-alert'));
+						return;
+					}
+					if($(".shenzhen-bitian-4").val() === ''){
+						alert($(".shenzhen-bitian-4").attr('data-alert'));
+						return;
+					}
+					if($(".shenzhen-bitian-5").val() === ''){
+						alert($(".shenzhen-bitian-5").attr('data-alert'));
 						return;
-					}else{
-						$.each([
-						$(".shenzhen-bitian-1"),
-						$(".shenzhen-bitian-2"),
-						$(".shenzhen-bitian-3"),
-						$(".shenzhen-bitian-4"),
-						$(".shenzhen-bitian-5")
-					], function(i, item) {
-		                if($.trim(item.val()) === '') {
-							alert(item.attr('data-alert'));
-						    _isBreakFlag = true;
-							return false;
-						}else{
-						    _isBreakFlag = false;
-						};
-					});
 					}
 					
 				}
 				if(guangzhou_bitian){//广州
-					if(_isBreakFlag){//验证分数
+					if($(".guangzhou-bitian-1").val() === ''){
+						alert($(".guangzhou-bitian-1").attr('data-alert'));
+						return;
+					}
+					if($(".guangzhou-bitian-2").val() === ''){
+						alert($(".guangzhou-bitian-2").attr('data-alert'));
+						return;
+					}
+					if($(".guangzhou-bitian-3").val() === ''){
+						alert($(".guangzhou-bitian-3").attr('data-alert'));
+						return;
+					}
+					if($(".guangzhou-bitian-4").val() === ''){
+						alert($(".guangzhou-bitian-4").attr('data-alert'));
+						return;
+					}
+					if($(".guangzhou-bitian-5").val() === ''){
+						alert($(".guangzhou-bitian-5").attr('data-alert'));
 						return;
-					}else{
-						$.each([
-						$(".guangzhou-bitian-1"),
-						$(".guangzhou-bitian-2"),
-						$(".guangzhou-bitian-3"),
-						$(".guangzhou-bitian-4"),
-						$(".guangzhou-bitian-5")
-					], function(i, item) {
-		                if($.trim(item.val()) === '') {
-							alert(item.attr('data-alert'));
-						    _isBreakFlag = true;
-							return false;
-						}else{
-						    _isBreakFlag = false;
-						};
-					});
 					}
 					
 				}
 				if(beijing_bitian){//北京
-					if(_isBreakFlag){//验证分数
+				    if($(".beijing-bitian-1").val() === ''){
+						alert($(".beijing-bitian-1").attr('data-alert'));
 						return;
-					}else{
-						$.each([
-						$(".beijing-bitian-1"),
-						$(".beijing-bitian-2"),
-						$(".beijing-bitian-3"),
-						$(".beijing-bitian-4"),
-						$(".beijing-bitian-5")
-					], function(i, item) {
-		                if($.trim(item.val()) === '') {
-							alert(item.attr('data-alert'));
-						    _isBreakFlag = true;
-							return false;
-						}else{
-						    _isBreakFlag = false;
-						};
-					});
-				  }
+					}
+					if($(".beijing-bitian-2").val() === ''){
+						alert($(".beijing-bitian-2").attr('data-alert'));
+						return;
+					}
+					if($(".beijing-bitian-3").val() === ''){
+						alert($(".beijing-bitian-3").attr('data-alert'));
+						return;
+					}
+					if($(".beijing-bitian-4").val() === ''){
+						alert($(".beijing-bitian-4").attr('data-alert'));
+						return;
+					}
+					if($(".beijing-bitian-5").val() === ''){
+						alert($(".beijing-bitian-5").attr('data-alert'));
+						return;
+					}
 				}
 				//公共部分验证
 				var yanzhengArr=[];
@@ -643,10 +653,8 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 				if($(".input-limit-12").html() != '点击填写' && $(".input-limit-7").html() != ''){
 					yanzhengArr.push(1);
 				}
-				if(_isBreakFlag){//验证分数
-					return;
-				}else{
-					$.each([
+			    //验证分数
+				$.each([
 						$(".input-bitian-1"),
 						$(".input-bitian-2"),
 						$(".input-bitian-3"),
@@ -664,8 +672,8 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 						}else{
 						    _isBreakFlag = false;
 						};
-					});
-				}
+				});
+				
 				
 				//验证div 字数要求
 				if(_isBreakFlag){//true 不进行义验证

public/app/js/office_detail_pc.js

@@ -229,7 +229,7 @@ require(['vue','css!style/office_detail_pc.css','jquery0325', 'common'], functio
             		var _this = this;
 					$.ajax({
 						type: 'post',
-						url: '/index/isShow',
+						url: '/office_index/isShow',
 						data: {
 							'id': shop_id,
 							'is_show': _this.select_public

public/resource/js/buildingDictionary.js

@@ -32,6 +32,7 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
 		addStredit:'',//编辑获取地铁
 		buildingStations:'',
 		delArr:[],
+		businessDistrictId:0,//编辑商圈id
 		init: function() {
 			//初始化dot
 			$("body").append(template);
@@ -794,7 +795,7 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
 					   _longitudeObj.val(data.data.longitude),
 					   _latitudeObj.val(data.data.latitude),
 					  $('.louceng_num').html(data.data.id);
-					  $('#business_rong').html('');
+					  business.businessDistrictId = data.data.business_district_id;
 					  $.ajax({
 							type: 'GET',
 							url: '/index/getBusinessAll',
@@ -806,14 +807,15 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
 									if(data.code == 200) {
 									var tag = "" ;
 										$.each(data.data,function(i,target){
-											if ( target.id == data.data.business_district_id){
-												tag += '<option value="'+target.id+'" selected>'+target.name+'</option>'
-											} else {
+//											if ( target.id == data.data.business_district_id){
+//												tag += '<option value="'+target.id+'" selected>'+target.name+'</option>'
+//											} else {
 												tag += '<option value="'+target.id+'">'+target.name+'</option>'
-											}
+//											}
 											
 										});
 										$('#business_rong').append(tag);
+					                    $('#business_rong').val(business.businessDistrictId);
 									} else {
 										alert(data['msg']);
 									};

public/resource/js/officeBuildingList.js

@@ -1302,7 +1302,8 @@ if(data.code == 200) {
 				dataType: 'json',
 				success: function(data) {
 					if(data.code == 200) {
-						alert(data.msg)
+//						alert(data.msg)
+						alert("修改成功")
 					}else{
 						alert(data.msg)
 					}

public/resource/js/officeEdit.js

@@ -1006,7 +1006,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 					item.checked && _roomTagArr.push(item.value);
 				});
 				if(_roomTagArr.length < 1) {
-					alert('商铺标签至少需要填写一个!');
+					alert('办公楼标签至少需要填写一个!');
 					return false;
 				};
 				if(_isBreakFlag) {
@@ -1215,8 +1215,13 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 					success: function(data) {
 						if(typeof data === 'object') {
 							if(data.code == 200) {
-								alert('添加成功!');
-								location.replace('/admin.php/index/officeBuildingList.html');
+								if(data.data. is_alert == 1){
+									alert('该房源所在楼盘因信息不完整导致下架状态，请联系店长在后台楼盘列表补充楼盘信息!楼盘信息补充完整后，该房源会自动上架!');
+								}else{
+									alert('添加成功!');
+								    location.replace('/admin.php/index/officeBuildingList.html');
+								}
+								
 							} else {
 								alert(data['msg']);
 								return;

public/resource/js/remarkFollowOffice.js

@@ -1674,7 +1674,8 @@ define(['doT', 'text!temp/remark_follow_office_template_tpl.html', 'css!style/ho
 				user.isAjaxSaving = true;
 				$.ajax({
 			    type: 'GET',
-			    url: '/index/RemarkFollowList',
+//			    url: '/index/RemarkFollowList',
+			    url: '/office_index/followUpList',
 			    data: params,
 			    timeout: 30000,
 			    dataType: 'json',