Skip to content

杨建斌 / page

Go to a project
Toggle navigation
Toggle navigation pinning
02809987 by wang
Options

Merge remote-tracking branch 'origin/develop' into develop

2 parents dcc0d19f 832d43d3
Inline Side-by-side
Showing 5 changed files with 42 additions and 22 deletions
application/controllers/Perm.php
......@@ -52,9 +52,17 @@ class Perm extends CI_Controller {
$this->load->view('perm/roleAdd');
}
public function roleEdit()
public function roleEdit($id)
{
$this->load->view('perm/roleEdit');
$url = $this->config->item('apiBaseUrl') . 'system/role/get/'.$id;
$result = file_get_contents($url);
$json = json_decode($result);
$ret = $json->data;
$data = array(
'item'=>$ret,
'id'=>$id
);
$this->load->view('perm/roleEdit', $data);
}
public function organization()
......
application/controllers/Work.php
......@@ -170,21 +170,26 @@ class Work extends CI_Controller
$result = file_get_contents($url);
$json = json_decode($result);
$ret = $json->data;
if (!$ret->clientUnitOutputVO) {
$ret->clientUnitOutputVO = array();
}
if (!$ret->clientContactOutputVOS) {
$ret->clientContactOutputVOS = array();
$data = array();
if($ret){
if (!$ret->clientUnitOutputVO) {
$ret->clientUnitOutputVO = array();
}
if (!$ret->clientContactOutputVOS) {
$ret->clientContactOutputVOS = array();
}
if (!$ret->applyOrderVO) {
$ret->applyOrderVO = array();
}
$data = array(
'clientInfoOutputVO'=>$ret->clientInfoOutputVO,
'clientUnitOutputVO'=>$ret->clientUnitOutputVO,
'clientContactOutputVOS'=>$ret->clientContactOutputVOS,
'applyOrderVO'=>$ret->applyOrderVO,
'id'=>$id
);
}
$data = array(
'clientInfoOutputVO'=>$ret->clientInfoOutputVO,
'clientUnitOutputVO'=>$ret->clientUnitOutputVO,
'clientContactOutputVOS'=>$ret->clientContactOutputVOS,
'applyOrderVO'=>$ret->applyOrderVO,
'id'=>$id
);
switch ($state) {
case 1:
$this->load->view('work/审批/资料清单', $data);
......
application/views/perm/role.php
......@@ -42,7 +42,7 @@
<thead class="text-c">
<tr>
<th width="68px">操作</th>
<th>所属网点</th>
<!-- <th>所属网点</th>-->
<th>角色</th>
<th>人数</th>
</tr>
......@@ -101,7 +101,7 @@
</ul></span>';
}
},
{data: "branchName"},//所属网点
// {data: "branchName"},//所属网点
{data: "nameZh"},//角色
{data: "employeeCount"},//人数
]
......
application/views/perm/roleEdit.php
......@@ -2,19 +2,22 @@
<body>
<div class="panel panel-default">
<form action="">
<input type="hidden" value="<?=$id?>" name="id">
</form>
<div class="panel-body">
<div class="row cl">
<div class="form-group col-sm-3 col-md-2">
<!--<div class="form-group col-sm-3 col-md-2">
<label>所属网点</label>
<span class="form-control select-box">
<select class="select" size="1">
<option selected value>请选择</option>
</select>
</span>
</div>
</div>-->
<div class="form-group col-sm-3 col-md-2">
<label>角色</label>
<input type="text" class="form-control input-text" value="">
<input type="text" name="nameZh" class="form-control input-text" value="<?=$item->nameZh?>">
</div>
</div>
<div class="row cl">
......@@ -73,7 +76,11 @@
var treeObj = $.fn.zTree.getZTreeObj("tree");
// console.log(treeObj);
var nodes = treeObj.getCheckedNodes(true);
console.log(nodes);
var menuIds = [];
$.each(nodes, function (v) {
menuIds.push(v.id);
})
console.log(menuIds);
// layer_close();
}
......
application/views/work/审批/网查筛选.php
......@@ -37,7 +37,7 @@
<button class="btn btn-danger btn-block" onclick="refuse()">拒绝</button>
</div>
<div class="col-sm-2">
<button class="btn btn-primary btn-block" onclick="loadIframe('<?=site_url('/work/check/8');?>', '审核意见');">通过</button>
<button class="btn btn-primary btn-block" onclick="loadIframe('<?=site_url('work/check/8'.$id);?>', '审核意见');">通过</button>
</div>
</div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!