经纪人管理 修改

application/index/view/broker/agent.html

@@ -46,6 +46,11 @@
 												<select class="form-control btn2 input ld-Marheight" name="" id="guest_stores">
 												</select>
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="姓名/手机号" name="search" type="text" value="">
+												<select class="form-control btn2 ld-Marheight" name="agent_status" placeholder="状态是否正常">
+													<option value="">状态是否正常</option>
+													<option value="0">是</option>
+													<option value="1">否</option>
+												</select>
 												<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
 												<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
 

public/resource/js/agent.js

@@ -4,9 +4,11 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
 		pageSize: 15,
 		agent_id: 0,
 		idArray: '',
+		confirm_old:'',//是否转勤
 		init: function() {
 			//初始化dot
 			$("body").append(template + template_binding + pctemplate_binding);
+	        $("select[name=agent_status]").val('0');
 			agent.getList();
 			agent.event();
 		},
@@ -23,7 +25,7 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
 					if(_id && _id != '0') {
 						agent.getDistrictStoreList(_id, function(_data) {
 							//							var _str = '';
-							var _str = '<option value="0">全部</option>';
+							var _str = '<option value="">全部</option>';
 							$.each(_data, function(i, item) {
 								_str += '<option value="' + item.id + '">' + item.store_name + '</option>';
 							});
@@ -109,7 +111,12 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
 				agent.emptyInput(); //清空表单
 			});
 
+			$(document).delegate(".agent_add", "click", function() { //点击新增
+	              agent.confirm_old=''//是否转勤 置空
+							
+			});
 			$(document).delegate(".edit", "click", function() { //点击编辑
+	            agent.confirm_old=''//是否转勤 置空
 				$("#title").html("编辑经纪人");
 				$(".form-horizontal")[0].reset(); //重置表单
 				agent.agent_id = $(this).attr("data-id");
@@ -152,6 +159,8 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
             	if(!confirm('是否继续？')) {
 					return;
 				};
+				var params = {};
+				params.id = $(this).attr("data-id");
             	if ( $(this).hasClass("isCheck") ){	//取消选中
             		if($(this).html() == '已离职'){
             			$(this).html('离职')
@@ -159,35 +168,36 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
             		if($(this).html() == '已长假'){
             			$(this).html('长假')
             		}
-            		if($(this).html() == '已转勤'){
-            			$(this).html('转勤')
-            		}
             		$(this).removeClass("isCheck").addClass("btn-info").removeClass('btn-warning');
             	} else {//选中 
             		if($(this).html() == '离职'){
             			$(this).html('已离职');
             			$(".yetai_checkbox:eq(1)").html('长假'); 
-            			$(".yetai_checkbox:eq(2)").html('转勤');  
             		}
             		if($(this).html() == '长假'){
             			$(this).html('已长假');
             			$(".yetai_checkbox:eq(0)").html('离职'); 
-            			$(".yetai_checkbox:eq(2)").html('转勤');  
-            		}
-            		if($(this).html() == '转勤'){
-            			$(this).html('已转勤');
-            			$(".yetai_checkbox:eq(0)").html('离职'); 
-            			$(".yetai_checkbox:eq(1)").html('长假');  
             		}
             		$(this).siblings(".yetai_checkbox").removeClass("isCheck").addClass("btn-info").removeClass('btn-warning');
             		$(this).addClass("isCheck").removeClass("btn-info").addClass('btn-warning');
             	};
-            	$.ajax({ //经纪人 离职 长假 转勤
+            	if($('.isCheck').length != 0){
+            		if($('.isCheck').html() == '已离职'){
+            			params.type=2;
+            		}
+            		if($('.isCheck').html() == '已长假'){
+            			params.type=1;
+            		}
+            	}else{
+            			params.type=$(this).attr("data-status");
+            			console.log(11)
+            	};
+            	$.ajax({ //经纪人 离职 长假
 					'type': 'POST',
 					'url': '/index/updateStatus',
 					data: {
-						"ids": agent.id,
-						"status": $('.isCheck').html()
+						"ids": params.id,
+						"status": params.type
 					},
 					dataType: "json",
 					success: function(data) {
@@ -394,7 +404,7 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
 			params.remarks = $("#remarks").val();
 			params.status = $("#status").val();
 			params.password = $("input[name='password']").val();
-
+			params.confirm_old = agent.confirm_old;
 			if(params.phone == '') {
 				alert('手机号必填！');
 				return false;
@@ -428,7 +438,16 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
 						alert('提交成功');
 						$("#modal-edit").modal('hide');
 					} else {
-						alert(data.msg);
+						layer.open({
+							    content: '改账号已经有相同账号，请问是否转勤？（转勤 即人员调配另外一个城市）转勤后，所有商铺和客户也都会转到新建的相同手机号里，请确定是否转勤。',
+							    btn: ['确定转勤', '取消转勤'],
+							    yes: function(_index){
+							        layer.close(_index);
+							        console.log(555);
+							        agent.confirm_old=1;
+							        agent.Submit_edit();
+							    }
+							});
 					}
 				}
 			});
@@ -455,7 +474,7 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
 			params.group_name = $("input[name='groupname']").val();
 			params.district_id = $("#district_id2").val();
 			params.store_id = $("#guest_stores").val();
-
+			params.status = $("select[name=agent_status]").val();
 			$.ajax({
 				url: '/index/AgentList',
 				type: 'GET',

public/resource/template/agent_template_tpl.html

@@ -27,16 +27,25 @@
         <td class="text-center">[%= it[item]["district_name"] %]</td>
         <td class="text-center">[%= it[item]["store_name"] %]</td>
         <td class="text-center">[%= it[item]["name"] %]</td>
-        <td class="text-center">[%= it[item]["phone"] %]</td>
+        <td class="text-center">
+        	[%= it[item]["phone"] %]
+        	[% if(it[item]["status"] == 3) { %]
+				<span class="btn1 btn-warning btn-xs">已转勤</span>
+			[% } %]
+        </td>
         <td class="text-center">[%= it[item]["groupname"] %]</td>
         <td class="number-evaluation text-center" data-id='[%= it[item]["id"] %]'>--</td>
         <td class="score-evaluation text-center" data-id='[%= it[item]["id"] %]'>--</td>
         <td class="text-center">
             <a class="btn1 btn-success edit" href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>编辑</a>
-
-            <a class="btn1 btn-info yetai_checkbox" data-toggle="modal" data-id='[%= it[item]["id"] %]'>离职</a>
-            <a class="btn1 btn-info yetai_checkbox" data-toggle="modal" data-id='[%= it[item]["id"] %]'>长假</a>
-            <a class="btn1 btn-info yetai_checkbox" data-toggle="modal" data-id='[%= it[item]["id"] %]'>转勤</a>
+            [% if(it[item][""] == 2) {%]
+            <a class="btn1 btn-warning yetai_checkbox isCheck" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-status='[%= it[item]["status"] %]'>已离职</a>
+            [% } %]
+            [% if(it[item]["status"] == 1) {%]
+            <a class="btn1 btn-warning yetai_checkbox isCheck" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-status='[%= it[item]["status"] %]'>已长假</a>
+            [% } %]
+            <a class="btn1 btn-info yetai_checkbox" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-status='[%= it[item]["status"] %]'>离职</a>
+            <a class="btn1 btn-info yetai_checkbox" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-status='[%= it[item]["status"] %]'>长假</a>
                 <a class="btn1 btn-default btn-default-show-caozuo">>>></a>
             [% if(check_auth('index/updateRole')) {%]
                 <a href="#modal-user" class="btn1 btn-danger btn-default-hide-display" id='role' href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>角色设置</a>