0509
This commit is contained in:
@@ -44,6 +44,8 @@ class Clues extends HD_Controller
|
||||
$where = array("status" => $key);
|
||||
if ($this->admin_biz_str) {
|
||||
$where["belong_id in ($this->admin_biz_str)"] = null;
|
||||
}else{
|
||||
$this->belong && $where["belong_id"] = $this->belong;
|
||||
}
|
||||
$count1 = $this->clues_model->count($where);
|
||||
if ($value['list']) {
|
||||
@@ -455,7 +457,7 @@ class Clues extends HD_Controller
|
||||
'brand_id' => $info['brand_id'],
|
||||
'series_id' => $info['series_id'],
|
||||
'admin_id' => $this->uid,
|
||||
'belong_id' => $this->admin_biz[0] ? $this->admin_biz[0] : 10,
|
||||
'belong_id' => $this->belong,
|
||||
'c_time' => time(),
|
||||
'en_time' => date('Y-m-d H:i:s'),
|
||||
);
|
||||
@@ -1165,7 +1167,7 @@ class Clues extends HD_Controller
|
||||
'city_id' => $map_city[$v['city_name']] ? $map_city[$v['city_name']] : 0,
|
||||
'county_id' => $map_county[$v['county_name']] ? $map_county[$v['county_name']] : 0,
|
||||
'biz_id' => $map_biz[$v['biz_name']] ? $map_biz[$v['biz_name']] : 0,
|
||||
'belong_id' => $this->admin_biz[0] ? $this->admin_biz[0] : 0,
|
||||
'belong_id' => $this->belong,
|
||||
'p_time' => $map_biz[$v['biz_name']] ? date('Y-m-d H:i:s') : 0,
|
||||
);
|
||||
$adds[] = $temp;
|
||||
|
||||
@@ -572,6 +572,8 @@ class Customer extends HD_Controller
|
||||
}
|
||||
if ($this->admin_biz_str) {
|
||||
$where["biz_id in ($this->admin_biz_str)"] = null;
|
||||
}else{
|
||||
$this->belong && $where["belong_id"] = $this->belong;
|
||||
}
|
||||
return $where;
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ class Admin extends HD_Controller {
|
||||
$mobile = $this->input->get('mobile');
|
||||
$status = $this->input->get('status');
|
||||
$role_id = $this->input->get('role_id');
|
||||
$belong_id = $this->input->get('belong_id');
|
||||
$page = $this->input->get('page') ? $this->input->get('page') : 1;
|
||||
$status = $status === null ? 1 : $status;
|
||||
if(!empty($username)) $where["username like '%$username%'"] = null;
|
||||
@@ -37,7 +38,9 @@ class Admin extends HD_Controller {
|
||||
foreach ($data as $key => $value) {
|
||||
$data[$key]['role'] = $role[$value['role_id']]['name'];
|
||||
}
|
||||
|
||||
$this->data['role'] = $role;
|
||||
$this->data['belong_id'] = $belong_id;
|
||||
$this->data['role_id'] = $role_id;
|
||||
$this->data['pager'] = ['count' => ceil($count/$size),'curr' => $page,'totle' => $count];
|
||||
$this->data['lists'] = $data;
|
||||
@@ -93,6 +96,7 @@ class Admin extends HD_Controller {
|
||||
}
|
||||
$this->data['username'] = $data['username'];
|
||||
$this->data['role_id'] = $data['role_id'];
|
||||
$this->data['belong_id'] = $json['belong_id'];
|
||||
$this->data['mobile'] = $data['mobile'];
|
||||
$this->data['id'] = $id;
|
||||
$this->load->vars('url','edit');
|
||||
@@ -137,6 +141,7 @@ class Admin extends HD_Controller {
|
||||
$input = $this->_get_input();
|
||||
$other_json = [];
|
||||
$input['biz_id'] && $other_json['biz_id'] = $input['biz_id'];
|
||||
$input['belong_id'] && $other_json['belong_id'] = $input['belong_id'];
|
||||
$insert = [
|
||||
'username' => $input['username'],
|
||||
'mobile' => $input['mobile'],
|
||||
@@ -160,6 +165,7 @@ class Admin extends HD_Controller {
|
||||
$input = $this->_get_input();
|
||||
$other_json = [];
|
||||
$input['biz_id'] && $other_json['biz_id'] = $input['biz_id'];
|
||||
$input['belong_id'] && $other_json['belong_id'] = $input['belong_id'];
|
||||
$upd = [
|
||||
'username' => $input['username'],
|
||||
'mobile' => $input['mobile'],
|
||||
@@ -196,6 +202,8 @@ class Admin extends HD_Controller {
|
||||
private function _get_info()
|
||||
{
|
||||
$data['role'] = $this->sysRole->select(['status' => '1'],'','','','id,name');
|
||||
$data['belong'] = $this->biz_model->select(['status' => 1, 'type' => 1],'','','','id,biz_name');
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
@@ -252,6 +260,7 @@ class Admin extends HD_Controller {
|
||||
'mobile' => trim($this->input->post('mobile')),
|
||||
'status' => $this->input->post('status'),
|
||||
'role' => $this->input->post('role'),
|
||||
'belong_id' => $this->input->post('belong_id'),
|
||||
'password1' => trim($this->input->post('password1')),
|
||||
'password2' => trim($this->input->post('password2')),
|
||||
'biz_id' => $this->input->post('biz_id'),
|
||||
|
||||
@@ -235,11 +235,11 @@ class Auth
|
||||
$CI->role = $admin_user ? $admin_user['role_id'] : 0;
|
||||
$other_json = $admin_user['other_json'] ? json_decode($admin_user['other_json'], true) : [];
|
||||
$CI->admin_biz = $other_json['biz_id'] ? $other_json['biz_id'] : [];
|
||||
$CI->belong = $other_json['belong_id'] ? $other_json['belong_id'] : 0;
|
||||
$CI->admin_biz_str = $CI->admin_biz ? implode(',', $CI->admin_biz) : '';
|
||||
$CI->limit_province_id = 0;
|
||||
if ($other_json['biz_id'] && $other_json['biz_id'][0]) {
|
||||
$biz_id = $other_json['biz_id'][0];
|
||||
$biz = $CI->biz_model->get(['id' => $biz_id],'province_id');
|
||||
if ($CI->belong) {
|
||||
$biz = $CI->biz_model->get(['id' => $other_json['belong_id']],'province_id');
|
||||
$CI->limit_province_id = $biz['province_id'];
|
||||
}
|
||||
} elseif ($ctrl != 'login') {
|
||||
|
||||
@@ -39,6 +39,18 @@
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="am-form-group">
|
||||
<label class="am-para-label">归属:</label>
|
||||
<div class="am-para-inline w150">
|
||||
<select v-model="belong_id" name="belong_id">
|
||||
<option value="">请选择</option>
|
||||
<template v-for="value in belong">
|
||||
<option v-if="value.id == '<?=isset($this->data['belong_id'])?$this->data['belong_id']:''?>'" selected :value="value.id">{{value.biz_name}}</option>
|
||||
<option v-else :value="value.id">{{value.biz_name}}</option>
|
||||
</template>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<?php if($url == 'add') { ?>
|
||||
<div class="am-form-group">
|
||||
<label class="am-para-label">密码:</label>
|
||||
@@ -92,7 +104,9 @@
|
||||
var vm = new Vue({
|
||||
el: '#vue-edit',
|
||||
data: {
|
||||
belong_id: '',
|
||||
role_id: '',
|
||||
belong: <?=json_encode($this->data['belong'])?>,
|
||||
role: <?=json_encode($this->data['role'])?>,
|
||||
province_id: '<?=$province_id?>',
|
||||
city_id:'<?=$city_id?>',
|
||||
@@ -106,6 +120,7 @@
|
||||
created: function(index) {
|
||||
if('edit' == '<?=$url?>') {
|
||||
this.role_id = '<?=$this->data['role_id']?>';
|
||||
this.belong_id = '<?=$this->data['belong_id']?>';
|
||||
}
|
||||
},
|
||||
mounted: function () {
|
||||
|
||||
Reference in New Issue
Block a user