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 30 additions and 10 deletions
application/controllers/Perm.php
...@@ -52,9 +52,17 @@ class Perm extends CI_Controller { ...@@ -52,9 +52,17 @@ class Perm extends CI_Controller {
52 $this->load->view('perm/roleAdd'); 52 $this->load->view('perm/roleAdd');
53 } 53 }
54 54
55 public function roleEdit() 55 public function roleEdit($id)
56 { 56 {
57 $this->load->view('perm/roleEdit'); 57 $url = $this->config->item('apiBaseUrl') . 'system/role/get/'.$id;
58 $result = file_get_contents($url);
59 $json = json_decode($result);
60 $ret = $json->data;
61 $data = array(
62 'item'=>$ret,
63 'id'=>$id
64 );
65 $this->load->view('perm/roleEdit', $data);
58 } 66 }
59 67
60 public function organization() 68 public function organization()
......
application/controllers/Work.php
...@@ -170,13 +170,17 @@ class Work extends CI_Controller ...@@ -170,13 +170,17 @@ class Work extends CI_Controller
170 $result = file_get_contents($url); 170 $result = file_get_contents($url);
171 $json = json_decode($result); 171 $json = json_decode($result);
172 $ret = $json->data; 172 $ret = $json->data;
173 $data = array();
174 if($ret){
173 if (!$ret->clientUnitOutputVO) { 175 if (!$ret->clientUnitOutputVO) {
174 $ret->clientUnitOutputVO = array(); 176 $ret->clientUnitOutputVO = array();
175 } 177 }
176 if (!$ret->clientContactOutputVOS) { 178 if (!$ret->clientContactOutputVOS) {
177 $ret->clientContactOutputVOS = array(); 179 $ret->clientContactOutputVOS = array();
178 } 180 }
179 181 if (!$ret->applyOrderVO) {
182 $ret->applyOrderVO = array();
183 }
180 $data = array( 184 $data = array(
181 'clientInfoOutputVO'=>$ret->clientInfoOutputVO, 185 'clientInfoOutputVO'=>$ret->clientInfoOutputVO,
182 'clientUnitOutputVO'=>$ret->clientUnitOutputVO, 186 'clientUnitOutputVO'=>$ret->clientUnitOutputVO,
...@@ -184,6 +188,7 @@ class Work extends CI_Controller ...@@ -184,6 +188,7 @@ class Work extends CI_Controller
184 'applyOrderVO'=>$ret->applyOrderVO, 188 'applyOrderVO'=>$ret->applyOrderVO,
185 'id'=>$id 189 'id'=>$id
186 ); 190 );
191 }
187 192
188 switch ($state) { 193 switch ($state) {
189 case 1: 194 case 1:
......
application/views/perm/role.php
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 <thead class="text-c"> 42 <thead class="text-c">
43 <tr> 43 <tr>
44 <th width="68px">操作</th> 44 <th width="68px">操作</th>
45 <th>所属网点</th> 45 <!-- <th>所属网点</th>-->
46 <th>角色</th> 46 <th>角色</th>
47 <th>人数</th> 47 <th>人数</th>
48 </tr> 48 </tr>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
101 </ul></span>'; 101 </ul></span>';
102 } 102 }
103 }, 103 },
104 {data: "branchName"},//所属网点 104 // {data: "branchName"},//所属网点
105 {data: "nameZh"},//角色 105 {data: "nameZh"},//角色
106 {data: "employeeCount"},//人数 106 {data: "employeeCount"},//人数
107 ] 107 ]
......
application/views/perm/roleEdit.php
...@@ -2,19 +2,22 @@ ...@@ -2,19 +2,22 @@
2 2
3 <body> 3 <body>
4 <div class="panel panel-default"> 4 <div class="panel panel-default">
5 <form action="">
6 <input type="hidden" value="<?=$id?>" name="id">
7 </form>
5 <div class="panel-body"> 8 <div class="panel-body">
6 <div class="row cl"> 9 <div class="row cl">
7 <div class="form-group col-sm-3 col-md-2"> 10 <!--<div class="form-group col-sm-3 col-md-2">
8 <label>所属网点</label> 11 <label>所属网点</label>
9 <span class="form-control select-box"> 12 <span class="form-control select-box">
10 <select class="select" size="1"> 13 <select class="select" size="1">
11 <option selected value>请选择</option> 14 <option selected value>请选择</option>
12 </select> 15 </select>
13 </span> 16 </span>
14 </div> 17 </div>-->
15 <div class="form-group col-sm-3 col-md-2"> 18 <div class="form-group col-sm-3 col-md-2">
16 <label>角色</label> 19 <label>角色</label>
17 <input type="text" class="form-control input-text" value=""> 20 <input type="text" name="nameZh" class="form-control input-text" value="<?=$item->nameZh?>">
18 </div> 21 </div>
19 </div> 22 </div>
20 <div class="row cl"> 23 <div class="row cl">
...@@ -73,7 +76,11 @@ ...@@ -73,7 +76,11 @@
73 var treeObj = $.fn.zTree.getZTreeObj("tree"); 76 var treeObj = $.fn.zTree.getZTreeObj("tree");
74 // console.log(treeObj); 77 // console.log(treeObj);
75 var nodes = treeObj.getCheckedNodes(true); 78 var nodes = treeObj.getCheckedNodes(true);
76 console.log(nodes); 79 var menuIds = [];
80 $.each(nodes, function (v) {
81 menuIds.push(v.id);
82 })
83 console.log(menuIds);
77 84
78 // layer_close(); 85 // layer_close();
79 } 86 }
......
application/views/work/审批/网查筛选.php
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 <button class="btn btn-danger btn-block" onclick="refuse()">拒绝</button> 37 <button class="btn btn-danger btn-block" onclick="refuse()">拒绝</button>
38 </div> 38 </div>
39 <div class="col-sm-2"> 39 <div class="col-sm-2">
40 <button class="btn btn-primary btn-block" onclick="loadIframe('<?=site_url('/work/check/8');?>', '审核意见');">通过</button> 40 <button class="btn btn-primary btn-block" onclick="loadIframe('<?=site_url('work/check/8'.$id);?>', '审核意见');">通过</button>
41 </div> 41 </div>
42 </div> 42 </div>
43 43
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!