Skip to content

杨建斌 / page

Go to a project
Toggle navigation
Toggle navigation pinning
f921aacc by Zelig
Options

Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

2 parents b2e153ca d5d89aa8
Inline Side-by-side
Showing 8 changed files with 119 additions and 41 deletions
application/hooks/CheckLogin.php
...@@ -40,8 +40,8 @@ class CheckLogin ...@@ -40,8 +40,8 @@ class CheckLogin
40 $session->repaymentPlanSource = $this->getRepaymentPlanSource(); 40 $session->repaymentPlanSource = $this->getRepaymentPlanSource();
41 } 41 }
42 42
43 if (!$session->allRole) { 43 if (!$session->role) {
44 $session->allRole = $this->getAllRole(); 44 $session->role = $this->getAllRole();
45 } 45 }
46 46
47 if (!$session->relationEnum) { 47 if (!$session->relationEnum) {
......
application/views/loan/search2.php
...@@ -23,6 +23,11 @@ ...@@ -23,6 +23,11 @@
23 <option value="" selected>网点</option> 23 <option value="" selected>网点</option>
24 <?php foreach ($this->session->departments as $k=>$v):?> 24 <?php foreach ($this->session->departments as $k=>$v):?>
25 <option value="<?=$v->id?>"><?=$v->name?></option> 25 <option value="<?=$v->id?>"><?=$v->name?></option>
26 <?php if($v->children && !empty($v->children)):?>
27 <?php foreach ($v->children as $kk=>$vv):?>
28 <option value="<?=$vv->id?>"><?=$vv->name?></option>
29 <?php endforeach;?>
30 <?php endif;?>
26 <?php endforeach;?> 31 <?php endforeach;?>
27 </select> 32 </select>
28 </span> 33 </span>
......
application/views/perm/role.php
...@@ -11,6 +11,11 @@ ...@@ -11,6 +11,11 @@
11 <option value="" selected>网点</option> 11 <option value="" selected>网点</option>
12 <?php foreach ($this->session->departments as $k=>$v):?> 12 <?php foreach ($this->session->departments as $k=>$v):?>
13 <option value="<?=$v->id?>"><?=$v->name?></option> 13 <option value="<?=$v->id?>"><?=$v->name?></option>
14 <?php if($v->children && !empty($v->children)):?>
15 <?php foreach ($v->children as $kk=>$vv):?>
16 <option value="<?=$vv->id?>"><?=$vv->name?></option>
17 <?php endforeach;?>
18 <?php endif;?>
14 <?php endforeach;?> 19 <?php endforeach;?>
15 </select> 20 </select>
16 </span> 21 </span>
...@@ -20,7 +25,7 @@ ...@@ -20,7 +25,7 @@
20 <select class="select table_search" size="1" column="2"> 25 <select class="select table_search" size="1" column="2">
21 <option value="" selected>角色</option> 26 <option value="" selected>角色</option>
22 <?php foreach ($this->session->role as $k=>$v):?> 27 <?php foreach ($this->session->role as $k=>$v):?>
23 <option value="<?=$v->id?>"><?=$v->name?></option> 28 <option value="<?=$v->id?>"><?=$v->nameZh?></option>
24 <?php endforeach;?> 29 <?php endforeach;?>
25 </select> 30 </select>
26 </span> 31 </span>
......
application/views/perm/roleAdd.php
...@@ -8,7 +8,14 @@ ...@@ -8,7 +8,14 @@
8 <label>所属网点</label> 8 <label>所属网点</label>
9 <span class="form-control select-box"> 9 <span class="form-control select-box">
10 <select class="select" size="1"> 10 <select class="select" size="1">
11 <option selected value>请选择</option> 11 <?php foreach ($this->session->departments as $k=>$v):?>
12 <option value="<?=$v->id?>"><?=$v->name?></option>
13 <?php if($v->children && !empty($v->children)):?>
14 <?php foreach ($v->children as $kk=>$vv):?>
15 <option value="<?=$vv->id?>"><?=$vv->name?></option>
16 <?php endforeach;?>
17 <?php endif;?>
18 <?php endforeach;?>
12 </select> 19 </select>
13 </span> 20 </span>
14 </div> 21 </div>
......
application/views/perm/staff.php
...@@ -11,6 +11,11 @@ ...@@ -11,6 +11,11 @@
11 <option value="" selected>网点</option> 11 <option value="" selected>网点</option>
12 <?php foreach ($this->session->departments as $k=>$v):?> 12 <?php foreach ($this->session->departments as $k=>$v):?>
13 <option value="<?=$v->id?>"><?=$v->name?></option> 13 <option value="<?=$v->id?>"><?=$v->name?></option>
14 <?php if($v->children && !empty($v->children)):?>
15 <?php foreach ($v->children as $kk=>$vv):?>
16 <option value="<?=$vv->id?>"><?=$vv->name?></option>
17 <?php endforeach;?>
18 <?php endif;?>
14 <?php endforeach;?> 19 <?php endforeach;?>
15 </select> 20 </select>
16 </span> 21 </span>
...@@ -20,7 +25,7 @@ ...@@ -20,7 +25,7 @@
20 <select class="select table_search" size="1" column="2"> 25 <select class="select table_search" size="1" column="2">
21 <option value="" selected>角色</option> 26 <option value="" selected>角色</option>
22 <?php foreach ($this->session->role as $k=>$v):?> 27 <?php foreach ($this->session->role as $k=>$v):?>
23 <option value="<?=$v->id?>"><?=$v->name?></option> 28 <option value="<?=$v->id?>"><?=$v->nameZh?></option>
24 <?php endforeach;?> 29 <?php endforeach;?>
25 </select> 30 </select>
26 </span> 31 </span>
...@@ -28,7 +33,7 @@ ...@@ -28,7 +33,7 @@
28 </div> 33 </div>
29 <div> 34 <div>
30 <input class="btn btn-warning radius" type="reset" value="重置搜索"> 35 <input class="btn btn-warning radius" type="reset" value="重置搜索">
31 <button class="btn btn-primary radius" type="button" onclick="add()">添加角色</button> 36 <button class="btn btn-primary radius" type="button" onclick="add()">添加员工</button>
32 </div> 37 </div>
33 </form> 38 </form>
34 39
...@@ -241,6 +246,10 @@ ...@@ -241,6 +246,10 @@
241 }); 246 });
242 } 247 }
243 248
249 function reload() {
250 table.fnDraw();
251 }
252
244 function del(id) { 253 function del(id) {
245 layer.confirm('一旦删除员工账号将无法恢复, 请谨慎操作!', { 254 layer.confirm('一旦删除员工账号将无法恢复, 请谨慎操作!', {
246 btn: ['确认注销','取消'], 255 btn: ['确认注销','取消'],
......
application/views/perm/staffAdd.php
1 <?php $this->load->view('common/header'); ?> 1 <?php $this->load->view('common/header'); ?>
2 2
3 <body> 3 <body>
4 <div class="panel panel-default"> 4 <div class="panel panel-default">
5 <div class="panel-body"> 5 <div class="panel-body">
6 <form action="system/user/add" id="add">
6 <div class="row cl"> 7 <div class="row cl">
7 <div class="form-group col-sm-4 col-md-2"> 8 <div class="form-group col-sm-4 col-md-2">
8 <label>用户名</label> 9 <label>用户名</label>
9 <input type="text" class="form-control input-text" value=""> 10 <input type="text" class="form-control input-text" name="username" value="">
10 </div> 11 </div>
11 <div class="form-group col-sm-4 col-md-2"> 12 <div class="form-group col-sm-4 col-md-2">
12 <label>真实姓名</label> 13 <label>真实姓名</label>
13 <input type="text" class="form-control input-text" value=""> 14 <input type="text" class="form-control input-text" name="name" value="">
14 </div> 15 </div>
15 <div class="form-group col-sm-4 col-md-2"> 16 <div class="form-group col-sm-4 col-md-2">
16 <label>手机号</label> 17 <label>手机号</label>
17 <input type="text" class="form-control input-text" value=""> 18 <input type="text" class="form-control input-text" name="phone" value="">
18 </div> 19 </div>
19 <div class="form-group col-sm-4 col-md-2"> 20 <div class="form-group col-sm-4 col-md-2">
20 <label>身份证号码</label> 21 <label>身份证号码</label>
21 <input type="text" class="form-control input-text" value=""> 22 <input type="text" class="form-control input-text" name="" value="">
22 </div> 23 </div>
23 </div> 24 </div>
24 <div class="row cl"> 25 <div class="row cl">
...@@ -33,50 +34,91 @@ ...@@ -33,50 +34,91 @@
33 <div class="row cl"> 34 <div class="row cl">
34 <div class="form-group col-sm-4 col-md-2"> 35 <div class="form-group col-sm-4 col-md-2">
35 <label>所属网点</label> 36 <label>所属网点</label>
36 <select class="select" size="5" multiple> 37 <select class="select" name="children" size="5" multiple>
37 <option selected value>请选择</option> 38 <option selected value>请选择</option>
38 <option value>请选择</option> 39 <?php foreach ($this->session->departments as $k => $v): ?>
39 <option value>请选择</option> 40 <option value="<?= $v->id ?>"><?= $v->name ?></option>
40 <option value>请选择</option> 41 <?php if ($v->children && !empty($v->children)): ?>
41 <option value>请选择</option> 42 <?php foreach ($v->children as $kk => $vv): ?>
43 <option value="<?= $vv->id ?>"><?= $vv->name ?></option>
44 <?php endforeach; ?>
45 <?php endif; ?>
46 <?php endforeach; ?>
42 </select> 47 </select>
43 </div> 48 </div>
44 <div class="form-group col-sm-4 col-md-2"> 49 <div class="form-group col-sm-4 col-md-2">
45 <label>角色</label> 50 <label>角色</label>
46 <select class="select" size="5" multiple> 51 <select class="select" size="5" name="roles" multiple>
47 <option selected value>请选择</option> 52 <option selected value>请选择</option>
48 <option value>请选择</option> 53 <?php foreach ($this->session->role as $k => $v): ?>
49 <option value>请选择</option> 54 <option value="<?= $v->id ?>"><?= $v->nameZh ?></option>
50 <option value>请选择</option> 55 <?php endforeach; ?>
51 <option value>请选择</option>
52 </select> 56 </select>
53 </div> 57 </div>
54 </div> 58 </div>
55 </div> 59 </form>
56 </div> 60 </div>
61 </div>
57 62
58 <div class="row cl pt-20 pb-20 col-sm-12"> 63 <div class="row cl pt-20 pb-20 col-sm-12">
59 <div class="col-sm-offset-4 col-sm-2"> 64 <div class="col-sm-offset-4 col-sm-2">
60 <button class="btn btn-primary btn-block" onclick="save()">保存</button> 65 <button class="btn btn-primary btn-block" onclick="saveStaff()">保存</button>
61 </div>
62 <div class="col-sm-2">
63 <button class="btn btn-warning btn-block" onclick="layer_close()">取消</button>
64 </div>
65 </div> 66 </div>
67 <div class="col-sm-2">
68 <button class="btn btn-warning btn-block" onclick="layer_close()">取消</button>
69 </div>
70 </div>
66 71
67 <?php $this->load->view('common/footer'); ?> 72 <?php $this->load->view('common/footer'); ?>
68 73
69 <script> 74 <script>
70 function random() { 75 function random() {
71 var password = 'aoeuaoeu'; 76 var password = 'aoeuaoeu';
72 $('#password').val(password); 77 $('#password').val(password);
73 } 78 }
74 79
75 function save() { 80 function saveStaff() {
76 window.parent.msg('添加成功') 81 var targetUrl = $("#add").attr("action");
82 var data = $("#add").serializeJson();
83 var newData = {};
84 newData['HrVO'] = {
85 name:data['name'],
86 username:data['username'],
87 phone:data['phone'],
88 password:data['password'],
89 roles:data['roles']
90 };
91 newData['DepartmentVO'] = {
92 children:data['children']
93 };
77 94
78 layer_close(); 95 $.ajax({
79 } 96 type: 'post',
80 </script> 97 url: apiBaseUrl + targetUrl,
98 cache: false,
99 data: JSON.stringify(newData),
100 dataType: 'json',
101 contentType: "application/json; charset=UTF-8",
102 success: function (data) {
103 if (data.msg) {
104 layer.alert(data.msg);
105 } else if (data.code != 0) {
106 layer.alert('操作失败');
107 } else {
108 layer.msg('操作成功');
109 }
110 if (data.code) {
111 setTimeout(function () {
112 window.parent.reload();
113 layer_close();
114 }, 500);
115 }
116 },
117 error: function () {
118 layer.alert("操作失败")
119 }
120 })
121 }
122 </script>
81 </body> 123 </body>
82 <html> 124 <html>
......
application/views/work/search2.php
...@@ -19,6 +19,11 @@ ...@@ -19,6 +19,11 @@
19 <option value="" selected>网点</option> 19 <option value="" selected>网点</option>
20 <?php foreach ($this->session->departments as $k=>$v):?> 20 <?php foreach ($this->session->departments as $k=>$v):?>
21 <option value="<?=$v->id?>"><?=$v->name?></option> 21 <option value="<?=$v->id?>"><?=$v->name?></option>
22 <?php if($v->children && !empty($v->children)):?>
23 <?php foreach ($v->children as $kk=>$vv):?>
24 <option value="<?=$vv->id?>"><?=$vv->name?></option>
25 <?php endforeach;?>
26 <?php endif;?>
22 <?php endforeach;?> 27 <?php endforeach;?>
23 </select> 28 </select>
24 </span> 29 </span>
......
application/views/work/任务管理.php
...@@ -20,6 +20,11 @@ ...@@ -20,6 +20,11 @@
20 <option value="" selected>网点</option> 20 <option value="" selected>网点</option>
21 <?php foreach ($this->session->departments as $k=>$v):?> 21 <?php foreach ($this->session->departments as $k=>$v):?>
22 <option value="<?=$v->id?>"><?=$v->name?></option> 22 <option value="<?=$v->id?>"><?=$v->name?></option>
23 <?php if($v->children && !empty($v->children)):?>
24 <?php foreach ($v->children as $kk=>$vv):?>
25 <option value="<?=$vv->id?>"><?=$vv->name?></option>
26 <?php endforeach;?>
27 <?php endif;?>
23 <?php endforeach;?> 28 <?php endforeach;?>
24 </select> 29 </select>
25 </span> 30 </span>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!