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
$session->repaymentPlanSource = $this->getRepaymentPlanSource();
}
if (!$session->allRole) {
$session->allRole = $this->getAllRole();
if (!$session->role) {
$session->role = $this->getAllRole();
}
if (!$session->relationEnum) {
......
application/views/loan/search2.php
......@@ -23,6 +23,11 @@
<option value="" selected>网点</option>
<?php foreach ($this->session->departments as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<?php if($v->children && !empty($v->children)):?>
<?php foreach ($v->children as $kk=>$vv):?>
<option value="<?=$vv->id?>"><?=$vv->name?></option>
<?php endforeach;?>
<?php endif;?>
<?php endforeach;?>
</select>
</span>
......
application/views/perm/role.php
......@@ -11,6 +11,11 @@
<option value="" selected>网点</option>
<?php foreach ($this->session->departments as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<?php if($v->children && !empty($v->children)):?>
<?php foreach ($v->children as $kk=>$vv):?>
<option value="<?=$vv->id?>"><?=$vv->name?></option>
<?php endforeach;?>
<?php endif;?>
<?php endforeach;?>
</select>
</span>
......@@ -20,7 +25,7 @@
<select class="select table_search" size="1" column="2">
<option value="" selected>角色</option>
<?php foreach ($this->session->role as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<option value="<?=$v->id?>"><?=$v->nameZh?></option>
<?php endforeach;?>
</select>
</span>
......
application/views/perm/roleAdd.php
......@@ -8,7 +8,14 @@
<label>所属网点</label>
<span class="form-control select-box">
<select class="select" size="1">
<option selected value>请选择</option>
<?php foreach ($this->session->departments as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<?php if($v->children && !empty($v->children)):?>
<?php foreach ($v->children as $kk=>$vv):?>
<option value="<?=$vv->id?>"><?=$vv->name?></option>
<?php endforeach;?>
<?php endif;?>
<?php endforeach;?>
</select>
</span>
</div>
......
application/views/perm/staff.php
......@@ -11,6 +11,11 @@
<option value="" selected>网点</option>
<?php foreach ($this->session->departments as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<?php if($v->children && !empty($v->children)):?>
<?php foreach ($v->children as $kk=>$vv):?>
<option value="<?=$vv->id?>"><?=$vv->name?></option>
<?php endforeach;?>
<?php endif;?>
<?php endforeach;?>
</select>
</span>
......@@ -20,7 +25,7 @@
<select class="select table_search" size="1" column="2">
<option value="" selected>角色</option>
<?php foreach ($this->session->role as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<option value="<?=$v->id?>"><?=$v->nameZh?></option>
<?php endforeach;?>
</select>
</span>
......@@ -28,7 +33,7 @@
</div>
<div>
<input class="btn btn-warning radius" type="reset" value="重置搜索">
<button class="btn btn-primary radius" type="button" onclick="add()">添加角色</button>
<button class="btn btn-primary radius" type="button" onclick="add()">添加员工</button>
</div>
</form>
......@@ -241,6 +246,10 @@
});
}
function reload() {
table.fnDraw();
}
function del(id) {
layer.confirm('一旦删除员工账号将无法恢复, 请谨慎操作!', {
btn: ['确认注销','取消'],
......
application/views/perm/staffAdd.php
<?php $this->load->view('common/header'); ?>
<body>
<div class="panel panel-default">
<div class="panel-body">
<div class="panel panel-default">
<div class="panel-body">
<form action="system/user/add" id="add">
<div class="row cl">
<div class="form-group col-sm-4 col-md-2">
<label>用户名</label>
<input type="text" class="form-control input-text" value="">
<input type="text" class="form-control input-text" name="username" value="">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>真实姓名</label>
<input type="text" class="form-control input-text" value="">
<input type="text" class="form-control input-text" name="name" value="">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>手机号</label>
<input type="text" class="form-control input-text" value="">
<input type="text" class="form-control input-text" name="phone" value="">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>身份证号码</label>
<input type="text" class="form-control input-text" value="">
<input type="text" class="form-control input-text" name="" value="">
</div>
</div>
<div class="row cl">
......@@ -33,50 +34,91 @@
<div class="row cl">
<div class="form-group col-sm-4 col-md-2">
<label>所属网点</label>
<select class="select" size="5" multiple>
<select class="select" name="children" size="5" multiple>
<option selected value>请选择</option>
<option value>请选择</option>
<option value>请选择</option>
<option value>请选择</option>
<option value>请选择</option>
<?php foreach ($this->session->departments as $k => $v): ?>
<option value="<?= $v->id ?>"><?= $v->name ?></option>
<?php if ($v->children && !empty($v->children)): ?>
<?php foreach ($v->children as $kk => $vv): ?>
<option value="<?= $vv->id ?>"><?= $vv->name ?></option>
<?php endforeach; ?>
<?php endif; ?>
<?php endforeach; ?>
</select>
</div>
<div class="form-group col-sm-4 col-md-2">
<label>角色</label>
<select class="select" size="5" multiple>
<select class="select" size="5" name="roles" multiple>
<option selected value>请选择</option>
<option value>请选择</option>
<option value>请选择</option>
<option value>请选择</option>
<option value>请选择</option>
<?php foreach ($this->session->role as $k => $v): ?>
<option value="<?= $v->id ?>"><?= $v->nameZh ?></option>
<?php endforeach; ?>
</select>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="row cl pt-20 pb-20 col-sm-12">
<div class="col-sm-offset-4 col-sm-2">
<button class="btn btn-primary btn-block" onclick="save()">保存</button>
</div>
<div class="col-sm-2">
<button class="btn btn-warning btn-block" onclick="layer_close()">取消</button>
</div>
<div class="row cl pt-20 pb-20 col-sm-12">
<div class="col-sm-offset-4 col-sm-2">
<button class="btn btn-primary btn-block" onclick="saveStaff()">保存</button>
</div>
<div class="col-sm-2">
<button class="btn btn-warning btn-block" onclick="layer_close()">取消</button>
</div>
</div>
<?php $this->load->view('common/footer'); ?>
<?php $this->load->view('common/footer'); ?>
<script>
function random() {
var password = 'aoeuaoeu';
$('#password').val(password);
}
<script>
function random() {
var password = 'aoeuaoeu';
$('#password').val(password);
}
function save() {
window.parent.msg('添加成功')
function saveStaff() {
var targetUrl = $("#add").attr("action");
var data = $("#add").serializeJson();
var newData = {};
newData['HrVO'] = {
name:data['name'],
username:data['username'],
phone:data['phone'],
password:data['password'],
roles:data['roles']
};
newData['DepartmentVO'] = {
children:data['children']
};
layer_close();
}
</script>
$.ajax({
type: 'post',
url: apiBaseUrl + targetUrl,
cache: false,
data: JSON.stringify(newData),
dataType: 'json',
contentType: "application/json; charset=UTF-8",
success: function (data) {
if (data.msg) {
layer.alert(data.msg);
} else if (data.code != 0) {
layer.alert('操作失败');
} else {
layer.msg('操作成功');
}
if (data.code) {
setTimeout(function () {
window.parent.reload();
layer_close();
}, 500);
}
},
error: function () {
layer.alert("操作失败")
}
})
}
</script>
</body>
<html>
......
application/views/work/search2.php
......@@ -19,6 +19,11 @@
<option value="" selected>网点</option>
<?php foreach ($this->session->departments as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<?php if($v->children && !empty($v->children)):?>
<?php foreach ($v->children as $kk=>$vv):?>
<option value="<?=$vv->id?>"><?=$vv->name?></option>
<?php endforeach;?>
<?php endif;?>
<?php endforeach;?>
</select>
</span>
......
application/views/work/任务管理.php
......@@ -20,6 +20,11 @@
<option value="" selected>网点</option>
<?php foreach ($this->session->departments as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<?php if($v->children && !empty($v->children)):?>
<?php foreach ($v->children as $kk=>$vv):?>
<option value="<?=$vv->id?>"><?=$vv->name?></option>
<?php endforeach;?>
<?php endif;?>
<?php endforeach;?>
</select>
</span>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!