commit

application/index/view/broker/agent.html

@@ -254,8 +254,14 @@
 				</form>
 			</div>
 			<div class="modal-footer">
+<<<<<<< Updated upstream
+=======
+				<a href="#modal-turncity" data-toggle="modal" class="btn btn-primary agent_business">
+										 同城调配
+				</a>
+>>>>>>> Stashed changes
 				<a href="#modal-business" data-toggle="modal" class="btn btn-primary agent_business">
-										 跨城市转勤
+										 跨城转勤
 				</a>
 				<button type="button" class="btn btn-default" data-dismiss="modal">关闭
                 </button>
@@ -381,6 +387,57 @@
 	</div>
 	<!-- /.modal -->
 </div>
+<<<<<<< Updated upstream
+=======
+
+<!--同城转勤-->
+
+<div class="modal fade" id="modal-turncity" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    ×
+                </button>
+				<h4 class="modal-title">
+                    同城调配
+                </h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal form-horizontal-turn">
+					<div class="form-group">
+						<label class="col-sm-4 control-label">所属部门：</label>
+						<select name="district_id_city" class="form-control btn6">
+							<option value="">选择所属部门</option>
+						</select>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-4 control-label">所属门店：</label>
+						<select name="store_id_business" class="form-control btn6">
+
+						</select>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-4 control-label">业绩调整开始时间：</label>
+						<input id="same_city_Start_time" class="form-control btn6" type="text" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})"> 
+					</div>
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">关闭
+                </button>
+				<button type="button" class="btn btn-primary submit_city_turn">
+                    提交
+                </button>
+			</div>
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal -->
+</div>
+
+<!--跨城市转勤-->
+>>>>>>> Stashed changes
 <div class="modal fade" id="modal-business" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
@@ -389,7 +446,7 @@
                     ×
                 </button>
 				<h4 class="modal-title">
-                    跨城市转勤
+                    跨城转勤
                 </h4>
 			</div>
 			<div class="modal-body">