123

application/index/view/broker/agent.html

@@ -254,12 +254,9 @@
 				</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>
@@ -387,8 +384,6 @@
 	</div>
 	<!-- /.modal -->
 </div>
-<<<<<<< Updated upstream
-=======
 
 <!--同城转勤-->
 
@@ -437,7 +432,6 @@
 </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">
@@ -463,6 +457,10 @@
 
 						</select>
 					</div>
+					<div class="form-group">
+						<label class="col-sm-4 control-label">业绩调整开始时间：</label>
+						<input id="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">
@@ -521,3 +519,42 @@
 	</div>
 	<!-- /.modal -->
 </div>
+<!--状态记录-->
+<div class="modal fade" id="modal-stateRecord" 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">
+                    <div class="form-group">
+                    	<table class="table table-striped table-bordered table-hover table-condensed">
+                    		<thead>
+                    		<tr>
+                    			<th class="text-center">状态</th>
+                    			<th class="text-center">操作人</th>
+                    			<th class="text-center">操作时间</th>
+                    		</tr>
+                    		</thead>
+                    		<tbody id='state_record_pc'>
+                    			
+                    		</tbody>
+                    		
+                    	</table>
+                    	
+					</div>
+				</form>
+			</div>
+			<div class="modal-footer">
+			</div>
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal -->
+</div>
\ No newline at end of file