Skip to content

S
sunac-quanmin
Commit e678db22 by html5-李恒逸
Options

Bug fix

parent 27ce5ed8
Showing with 108 additions and 112 deletions
html/application/controllers/admin/manageradmin.php
<?php
<?php
if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
*管理员管理
......@@ -46,9 +46,9 @@ class Manageradmin extends CI_Controller
$con[1] = $mobile;
}
$where = rtrim($where, ' and');
// echo $where;//exit;
// echo $where;die;
$this->data['con_arr'] = $con;
$count = $this->manager->get_count($where);
//获取所有的角色
$this->data['type'] = $this->get_roles();
......@@ -63,15 +63,15 @@ class Manageradmin extends CI_Controller
$admins = array();
$admins = $this->manager->get_page(array('where' => $where), $page_no, self::PAGE_SIZE);
$this->data['admins'] = $admins;
//获取分页
$this->data['num_link'] = set_page1(
$this,site_url('admin/manageradmin/index?name=' . urlencode($name) . '&mobile=' . $mobile),
$count,self::PAGE_SIZE,4,'',true,
$count,self::PAGE_SIZE,4,'',true,
array('num_links'=>3,'show_total' => false, 'page_query_string' => true));
}
$this->data['num_start'] = ($page_no - 1) * self::PAGE_SIZE + 1;
$this->load->view('admin/manager/index',$this->data);
$this->load->view('admin/manager/index',$this->data);
}
//获取权限列表
......@@ -87,7 +87,7 @@ class Manageradmin extends CI_Controller
}
return $return;
}
//获取地区数据列表
public function get_region(){
$this->load->model('region_model', 'region');
......@@ -101,7 +101,7 @@ class Manageradmin extends CI_Controller
}
return $return;
}
//获取楼盘数据列表
public function get_building(){
$this->load->model('building_model', 'building');
......@@ -117,7 +117,7 @@ class Manageradmin extends CI_Controller
}
/**
*
*
* 新增外部人员
* @author wenhuijang
* @version 2013-11-15
......@@ -129,17 +129,17 @@ class Manageradmin extends CI_Controller
{
$this->data['data'] = array();
$this->data['op'] = '添加';
//角色类型
$this->data['type'] = $this->get_roles();
//获取地区数据
//获取地区数据
$this->data['region'] = $this->get_region();
//获取楼盘数据列表
$this->data['building'] = $this->get_building();
$this->load->view('admin/manager/edit',$this->data);
return;
}
//入库
$data = array();
$data['manager_name'] = $this->input->post('manager_name');
......@@ -158,7 +158,7 @@ class Manageradmin extends CI_Controller
return;
}
$data['manager_pwd'] = md5($data['manager_pwd']);
//校验是否存在该用户
$info = array();
$info = $this->manager->get(array('manager_name' => $data['manager_name']));
......@@ -168,7 +168,7 @@ class Manageradmin extends CI_Controller
//记录日志
$log = array(
'log' => sprintf($this->lang->line('op_insert_succ'), $this->u_name, '管理员email:'.$info['email'])
);
);
$this->loger->add_op_log('register',$log);
alert_redirect(site_url('admin/manageradmin/index'));
......@@ -176,7 +176,7 @@ class Manageradmin extends CI_Controller
//记录日志
$log = array(
'log' => sprintf($this->lang->line('op_insert_succ'), $this->u_name, '管理员email:'.$info['email'])
);
);
$this->loger->add_op_log('register',$log);
alert_redirect(site_url('admin/manageradmin/index'));
......@@ -184,7 +184,7 @@ class Manageradmin extends CI_Controller
//记录日志
$log = array(
'log' => sprintf($this->lang->line('op_insert_fail'), $this->u_name, '管理员email:'.$info['email'])
);
);
$this->loger->add_op_log('register',$log);
alert_redirect(site_url('admin/manageradmin/index','添加管理员失败，请重试'));
......@@ -192,7 +192,7 @@ class Manageradmin extends CI_Controller
}
/**
*
*
* 新增内部人员
* @author wenhuijang
* @version 2013-11-15
......@@ -211,10 +211,10 @@ class Manageradmin extends CI_Controller
}
$this->data['count'] = $count;
$this->load->view('admin/manager/add_staff', $this->data);
return;
return;
}
/**
*
*
* 修改管理员信息
* @param int a_id 管理员id
* @author wenhuijang
......@@ -253,7 +253,7 @@ class Manageradmin extends CI_Controller
if(!empty($pwd))
{
$info['manager_pwd'] = $pwd;
}
$is_check = true;
if(isset($info['manager_pwd']))
......@@ -266,7 +266,7 @@ class Manageradmin extends CI_Controller
{
$info['manager_pwd'] = md5($info['manager_pwd']);
}
}
if($is_check == false)
......@@ -279,7 +279,7 @@ class Manageradmin extends CI_Controller
alert_redirect(site_url('admin/manageradmin/index'),'输入参数错误');
return;
}
if(empty($info['region_id'])){
alert_redirect(site_url('admin/manageradmin/index'),'请选择管理地区');
return;
......@@ -289,7 +289,7 @@ class Manageradmin extends CI_Controller
//记录日志
$log = array(
'log' => sprintf($this->lang->line('op_update_succ'), $this->u_name, '管理员email:'.$info['email'])
);
);
$this->loger->add_op_log('update',$log);
alert_redirect(site_url('admin/manageradmin/index'),'修改成功');
......@@ -297,18 +297,18 @@ class Manageradmin extends CI_Controller
//记录日志
$log = array(
'log' => sprintf($this->lang->line('op_update_fail'), $this->u_name, '管理员email:'.$info['email'])
);
);
$this->loger->add_op_log('update',$log);
alert_redirect(site_url('admin/manageradmin/edit/' . $id),'修改失败');
}
}
/**
*
*
* 修改内部管理员信息
* @param int a_id 管理员id
* @author wenhuijang
......@@ -349,7 +349,7 @@ class Manageradmin extends CI_Controller
//记录日志
$log = array(
'log' => sprintf($this->lang->line('op_update_succ'), $this->u_name, '管理员email:'.$info['email'])
);
);
$this->loger->add_op_log('update',$log);
alert_redirect(site_url('admin/manageradmin/index'),'修改成功');
......@@ -357,7 +357,7 @@ class Manageradmin extends CI_Controller
//记录日志
$log = array(
'log' => sprintf($this->lang->line('op_update_fail'), $this->u_name, '管理员email:'.$info['email'])
);
);
$this->loger->add_op_log('update',$log);
alert_redirect(site_url('admin/manageradmin/edit_staff/' . $id),'修改失败');
......@@ -379,7 +379,7 @@ class Manageradmin extends CI_Controller
$this->load->driver('cache');
$managers = unserialize($this->cache->file->get('managers'));
$ids = $this->input->post('ids', true);
$add_data = array();
$other = array(
'create_time' => $_SERVER['REQUEST_TIME'],
......@@ -411,13 +411,13 @@ class Manageradmin extends CI_Controller
}
/**
*
*
* @author wenhuijang
*/
private function rsync()
{
$this->load->driver('cache');
//获取时间
$begin_time = $this->cache->file->get('manager_rsync_begin_time');
$managers = '';//unserialize($this->cache->file->get('managers'));
......@@ -426,10 +426,10 @@ class Manageradmin extends CI_Controller
$param = array('head' => array('row' => "", 'lastId' => ""), 'body' => array('currentTime' => (string)date('Y-m-d H:i:s', strtotime('-3 months'))));
if(empty($begin_time))
{
$begin_time = strtotime('-3 years');
$begin_time = strtotime('-3 years');
}
$param['body']['currentTime'] = (string) date('Y-m-d H:i:s', $begin_time);
$this->load->helper('rpc');
$data = rpc('accounts', $param, 'GET');
if(empty($data) || $data['head']['rspCode'] != 0 || empty($data['body']))
......@@ -471,7 +471,7 @@ class Manageradmin extends CI_Controller
}
/**
*
*
* 更新用户API
* @param int u_id 要查看的用户的id
* @author wenhuijang
......@@ -496,14 +496,14 @@ class Manageradmin extends CI_Controller
echo json_encode(array('errcode' => 42002, 'errmsg' => $this->lang->line('err_42002')));
return;
}
$flag = $this->manager->update($where,$data);
if($flag){
echo json_encode(array('errcode' => 0,'errmsg' => ''));
//记录日志
$log = array(
'log' => sprintf($this->lang->line('op_update_succ'), $this->u_name, "管理员id：".$id."已逻辑删除")
);
);
$this->loger->add_op_log('update',$log);
return;
......@@ -511,7 +511,7 @@ class Manageradmin extends CI_Controller
//记录日志
$log = array(
'log' => sprintf($this->lang->line('op_update_fail'), $this->u_name, "管理员id：".$id."已逻辑删除")
);
);
$this->loger->add_op_log('update',$log);
echo json_encode(array('errcode' => 50001,'errmsg' => $this->lang->line('err_50001')));
......@@ -519,4 +519,4 @@ class Manageradmin extends CI_Controller
}
}
}
\ No newline at end of file
}
html/application/views/admin/channel/customerExport.php
......@@ -2,33 +2,33 @@
<div class="clearfix"> </div>
<!-- BEGIN CONTAINER -->
<div class="page-container">
<div class="page-container">
<!-- BEGIN SIDEBAR -->
<?php $this->load->view('admin/leftbar');?>
<!-- END SIDEBAR -->
<!-- END SIDEBAR -->
<!-- BEGIN CONTENT -->
<div class="page-content-wrapper">
<div class="page-content">
<div class="page-content">
<!-- BEGIN PAGE HEADER-->
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<!-- BEGIN PAGE TITLE & BREADCRUMB-->
<ul class="page-breadcrumb breadcrumb">
<li> <i class="fa fa-home"></i> <a href="<?php site_url('admin/index')?>"> 主页 </a> <i class="fa fa-angle-right"></i> </li>
<li> 渠道管理 <i class="fa fa-angle-right"></i> </li>
<li> 客户查看 </li>
</ul>
<!-- END PAGE TITLE & BREADCRUMB-->
<!-- END PAGE TITLE & BREADCRUMB-->
</div>
</div>
<!-- END PAGE HEADER-->
<!-- END PAGE HEADER-->
<!-- BEGIN PAGE CONTENT-->
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<!-- BEGIN EXAMPLE TABLE PORTLET-->
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption"> <i class="fa fa-globe"></i>客户明细列表 </div>
......@@ -70,7 +70,7 @@
?>
</select>
项目：
<input type="text" class="form-control input-inline input-small" name="building_title" id="building_title" <?php if(isset($building_title) && !empty($building_title)):?>value="<?php echo $building_title;?>"<?php endif;?>>
<input type="text" class="form-control input-inline input-small" name="building_title" id="building_title" <?php if(isset($building_title) && !empty($building_title)):?>value="<?php echo $building_title;?>"<?php endif;?>>
时间：
<select class="form-control input-inline" name="time" id="time">
<option value="">全部</option>
......@@ -78,14 +78,15 @@
<option <?php if(isset($saixuan) && $saixuan == '月度'):?> selected ="selected" <?php endif;?> value="月度">月度</option>
<option <?php if(isset($saixuan) && $saixuan == '季度'):?> selected ="selected" <?php endif;?> value="季度">季度</option>
<option <?php if(isset($saixuan) && $saixuan == '年度'):?> selected ="selected" <?php endif;?> value="年度">年度</option>
</select>
</select>
<button type="submit" class="btn blue" id="search">搜索</button>
<input type="reset" class="btn red" name="button2" value="清空">
<input type="reset" class="btn green" name="export" id="export" value="导出">
</form>
<button type="submit" class="btn green" id="export">导出</button>
</div>
</div>
<div class="girdScroller" style="overflow:auto;">
......@@ -115,7 +116,7 @@
<td><?php echo $customer['id'];?></td>
<td><?php echo $customer['customer_user'];?></td>
<td><?php echo $customer['customer_mobile']?></td>
<td><?php
<td><?php
if($customer['customer_type']==0){
echo '新客户';
}else if($customer['customer_type']==1){
......@@ -127,7 +128,7 @@
}
?></td>
<td><?php echo date('Y-m-d h:i',$customer['create_time']);?></td>
<td><?php
<td><?php
if($customer['recommend_status']==0){
echo '已推荐';
}else if($customer['recommend_status']==1){
......@@ -189,32 +190,32 @@
<?php endif;?>
</div>
</div>
<!-- END EXAMPLE TABLE PORTLET-->
<!-- END EXAMPLE TABLE PORTLET-->
</div>
</div>
<!-- END PAGE CONTENT-->
<!-- END PAGE CONTENT-->
</div>
</div>
<!-- END CONTENT -->
<!-- END CONTENT -->
</div>
<!-- END CONTAINER -->
<!-- END CONTAINER -->
<!-- BEGIN FOOTER -->
<?php $this->load->view('admin/footer');?>
<!-- BEGIN PAGE LEVEL PLUGINS -->
<link rel="stylesheet" href="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="<?php echo APPLICATION_PATH ?>/assets/plugins/bootstrap-datepicker/css/datepicker.css"/>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/select2/select2.min.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/jquery.dataTables.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.js"></script>
<!-- END PAGE LEVEL PLUGINS -->
<!-- BEGIN PAGE LEVEL SCRIPTS -->
<script src="<?php echo APPLICATION_PATH ?>/assets/js/backend/core/app.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/select2/select2.min.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/jquery.dataTables.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.js"></script>
<!-- END PAGE LEVEL PLUGINS -->
<!-- BEGIN PAGE LEVEL SCRIPTS -->
<script src="<?php echo APPLICATION_PATH ?>/assets/js/backend/core/app.js"></script>
<script>
jQuery(document).ready(function() {
jQuery(document).ready(function() {
App.init();
});
</script>
</script>
<script type="text/javascript">
$(function (){
$("#export").click(function(){
......@@ -224,7 +225,7 @@
var building_title = $("#building_title").val();
var time = $('#time').val();
location.href = "<?php echo site_url('admin/channeladmin/export_actions')?>?tag_name=customerExport&distributor_name="
+ distributor_name + "&status="
+ distributor_name + "&status="
+ status + "&channel_id="
+ channel_id + "&building_title="
+ building_title + "&time="
......@@ -232,7 +233,7 @@
});
});
</script>
</body><!-- END BODY -->
</html>
\ No newline at end of file
</html>
html/application/views/admin/index.php
......@@ -26,7 +26,7 @@
<!-- BEGIN PAGE CONTENT-->
<!-- BEGIN DASHBOARD STATS -->
<div class="row">
<div class="col-lg-4 col-md-3 col-sm-6 col-xs-12">
<!-- <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12">
<div class="dashboard-stat green">
<div class="visual">
<i class="fa fa-group"></i>
......@@ -43,7 +43,7 @@
更多<i class="m-icon-swapright m-icon-white"></i>
</a>
</div>
</div>
</div> -->
<div class="col-lg-4 col-md-3 col-sm-6 col-xs-12">
<div class="dashboard-stat yellow">
<div class="visual">
......@@ -137,10 +137,10 @@
echo "<li>暂无管理员操作记录</li>";
endif;
?>
</ul>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
......@@ -161,7 +161,7 @@
<!-- BEGIN PAGE LEVEL SCRIPTS -->
<script src="<?php echo APPLICATION_PATH ?>/assets/js/backend/core/app.js"></script>
<script>
jQuery(document).ready(function() {
jQuery(document).ready(function() {
// initiate layout and plugins
App.init();
//FormSamples.init();
......@@ -171,4 +171,3 @@
</body>
<!-- END BODY -->
</html>
\ No newline at end of file
html/application/views/admin/manager/index.php
......@@ -3,29 +3,29 @@
<div class="clearfix"> </div>
<!-- BEGIN CONTAINER -->
<div class="page-container">
<div class="page-container">
<!-- BEGIN SIDEBAR -->
<?php $this->load->view('admin/leftbar');?>
<!-- END SIDEBAR -->
<!-- END SIDEBAR -->
<!-- BEGIN CONTENT -->
<div class="page-content-wrapper">
<div class="page-content">
<div class="page-content">
<!-- BEGIN PAGE HEADER-->
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<!-- BEGIN PAGE TITLE & BREADCRUMB-->
<ul class="page-breadcrumb breadcrumb">
<li> <i class="fa fa-home"></i> <a href="<?php echo site_url('admin/index');?>"> 主页 </a> <i class="fa fa-angle-right"></i> </li>
<li> <a href="javascript:;"> 系统设置 </a> <i class="fa fa-angle-right"></i> </li>
<li> <a href="javascript:;"> 系统用户管理 </a> </li>
</ul>
<!-- END PAGE TITLE & BREADCRUMB-->
<!-- END PAGE TITLE & BREADCRUMB-->
</div>
</div>
<!-- END PAGE HEADER-->
<!-- END PAGE HEADER-->
<!-- BEGIN PAGE CONTENT-->
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<!-- BEGIN EXAMPLE TABLE PORTLET-->
<div class="portlet box blue">
<div class="portlet-title">
......@@ -40,7 +40,7 @@
<button class="btn yellow" onclick="window.location.href='<?php echo site_url('/admin/manageradmin/add_staff');?>'"> 内部管理员 <i class="fa fa-plus"></i> </button>
</div>
</div>
<div style="margin-bottom: 20px;background: #F9FCEF;padding: 10px 0;border: 1px solid #ccc;" class="text-center">
<div style="margin-bottom: 20px;background: #F9FCEF;padding: 10px 0;border: 1px solid #ccc;" class="text-center">
<form method="get" action="<?php echo site_url('admin/manageradmin/index');?>" name='form'>
姓名：
<input type="text" class="form-control input-inline input-small" value="<?php echo !empty($con_arr[0]) && $con_arr[0] !="NULL" ? $con_arr[0] : "";?>" id="name" name="name">
......@@ -69,14 +69,14 @@
?>
<tr>
<td><?php echo $num_start++; ?></td>
<td><?php echo $admin['id'];?></td>
<td class="s_id"><?php echo $admin['id'];?></td>
<td><?php echo $admin['manager_name'];?></td>
<td><?php echo $admin['manager_phone'];?></td>
<td><?php echo isset($type[$admin['role_id']]['role_title']) ? $type[$admin['role_id']]['role_title'] : '';?></td>
<td><?php echo $admin['is_staff'] == 1 ? '内部人员' : '外部人员';?></td>
<td><?php echo $admin['is_deleted'] == 1 ? '已删除' : '正常';?></td>
<td>
<?php if($admin['is_staff'] == 0):?>
<?php if($admin['is_staff'] == 0):?>
<a href="<?php echo site_url('admin/manageradmin/edit/' . $admin['id']);?>" class="btn default btn-xs purple"><i class="fa fa-edit"></i>编辑</a>
<?php else:;?>
<a href="<?php echo site_url('admin/manageradmin/edit_staff/' . $admin['id']);?>" class="btn default btn-xs yellow"><i class="fa fa-edit"></i>授权</a>
......@@ -89,7 +89,7 @@
else:
?>
<tr>
<td colspan="7" align="center">还没有添加管理员.</td>
<td colspan="8" align="center">还没有添加管理员.</td>
</tr>
<?php
endif;
......@@ -115,32 +115,32 @@
</div>
<?php endif;?>
</div>
<!-- END EXAMPLE TABLE PORTLET-->
<!-- END EXAMPLE TABLE PORTLET-->
</div>
</div>
<!-- END PAGE CONTENT -->
<!-- END PAGE CONTENT -->
</div>
</div>
<!-- END CONTENT -->
<!-- END CONTENT -->
</div>
<!-- END CONTAINER -->
<!-- END CONTAINER -->
<!-- BEGIN FOOTER -->
<?php $this->load->view('admin/footer');?>
<!-- BEGIN PAGE LEVEL PLUGINS -->
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/select2/select2.min.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/jquery.dataTables.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.js"></script>
<!-- END PAGE LEVEL PLUGINS -->
<!-- BEGIN PAGE LEVEL SCRIPTS -->
<script src="<?php echo APPLICATION_PATH ?>/assets/js/backend/core/app.js"></script>
<!-- BEGIN PAGE LEVEL PLUGINS -->
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/select2/select2.min.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/jquery.dataTables.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.js"></script>
<!-- END PAGE LEVEL PLUGINS -->
<!-- BEGIN PAGE LEVEL SCRIPTS -->
<script src="<?php echo APPLICATION_PATH ?>/assets/js/backend/core/app.js"></script>
<script>
jQuery(document).ready(function() {
jQuery(document).ready(function() {
jQuery(".delete").click(function (){
var is_true = confirm("您确定要删除这个管理员吗?");
if(is_true)
{
_this = $(this);
var a_id = _this.parents("tr").find("td:first").text();
var a_id = _this.parents("tr").find(".s_id").text();
$.ajax({
type: "POST",
url: '<?php echo site_url("admin/manageradmin/update");?>',
......@@ -148,7 +148,7 @@
dataType: "json",
success: function(res){
if(res.errcode == 0){
window.location.reload();
window.location.href='<?php echo site_url("admin/manageradmin/index");?>';
}else{
alert(res.errmsg);
}
......@@ -158,11 +158,11 @@
}
);
});
</script>
</script>
<script>
jQuery(document).ready(function() {
App.init();
jQuery(document).ready(function() {
App.init();
});
</script>
</body><!-- END BODY -->
</html>
\ No newline at end of file
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment