Skip to content

杨建斌 / page

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

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

2 parents 87147b7c 7b144aac
Inline Side-by-side
Showing 6 changed files with 183 additions and 22 deletions
application/controllers/Perm.php
...@@ -152,4 +152,111 @@ class Perm extends CI_Controller { ...@@ -152,4 +152,111 @@ class Perm extends CI_Controller {
152 152
153 $this->output->set_content_type('application/json')->set_output(json_encode($arr)); 153 $this->output->set_content_type('application/json')->set_output(json_encode($arr));
154 } 154 }
155
156 public function menu()
157 {
158 // echo $this->config->item('apiBaseUrl') . 'system/menu/getAllMenu';
159 $res = json_decode(file_get_contents($this->config->item('apiBaseUrl') . 'system/menu/getAllMenu'));
160 // var_dump($res->data);
161 // exit;
162 $data = $res->data;
163 // var_dump($data);
164 $arr = array();
165
166 foreach ($data as $k => $v) {
167
168 $item = array();
169 $item['id'] = $v->id;
170 $item['name'] = $v->name;
171 $item['pId'] = 0;
172 $item['open'] = true;
173 // var_dump($item);exit;
174 $arr[] = $item;
175 if (!$v->children || empty($v->children)) {
176 continue;
177 }
178
179
180 foreach ($v->children as $kk => $vv) {
181 $item2 = array();
182 $item2['id'] = $vv->id;
183 $item2['name'] = $vv->name;
184 $item2['pId'] = $v->id;
185 $item2['open'] = true;
186 $arr[] = $item2;
187 if (!$vv->children || empty($vv->children)) {
188 continue;
189 }
190 foreach ($vv->children as $kkk => $vvv) {
191 $item3 = array();
192 $item3['id'] = $vvv->id;
193 $item3['name'] = $vvv->name;
194 $item3['pId'] = $vv->id;
195 $item3['open'] = true;
196 $arr[] = $item3;
197
198 if (!$vvv->children || empty($vvv->children)) {
199 continue;
200 }
201 foreach ($vvv->children as $kkkk => $vvvv) {
202 $item4 = array();
203 $item4['id'] = $vvvv->id;
204 $item4['name'] = $vvvv->name;
205 $item4['pId'] = $vvv->id;
206 $item4['open'] = true;
207 $arr[] = $item4;
208 if (!$vvvv->children || empty($vvvv->children)) {
209 continue;
210 }
211 foreach ($vvvv->children as $kkkkk => $vvvvv) {
212 $item5 = array();
213 $item5['id'] = $vvvvv->id;
214 $item5['name'] = $vvvvv->name;
215 $item5['pId'] = $vvvv->id;
216 $item5['open'] = true;
217 $arr[] = $item5;
218 if (!$vvvvv->children || empty($vvvvv->children)) {
219 continue;
220 }
221 foreach ($vvvvv->children as $kkkkkk => $vvvvvv) {
222 $item6 = array();
223 $item6['id'] = $vvvvvv->id;
224 $item6['name'] = $vvvvvv->name;
225 $item6['pId'] = $vvvvv->id;
226 $arr[] = $item6;
227 if (!$vvvvvv->children || empty($vvvvvv->children)) {
228 continue;
229 }
230 foreach ($vvvvvv->children as $k7 => $v7) {
231 $item7 = array();
232 $item7['id'] = $v7->id;
233 $item7['name'] = $v7->name;
234 $item7['pId'] = $vvvvvv->id;
235 $arr[] = $item7;
236 if (!$v7->children || empty($v7->children)) {
237 continue;
238 }
239 foreach ($v7->children as $k8 => $v8) {
240 $item8 = array();
241 $item8['id'] = $v8->id;
242 $item8['name'] = $v8->name;
243 $item8['pId'] = $v7->id;
244 $arr[] = $item8;
245 }
246 }
247 }
248
249 }
250 }
251 }
252 }
253
254 }
255 // var_dump($arr);exit;
256 // $data = '[{"id":1,"pId":0,"name":"父节点1 (5人)","open":true},{"id":11,"pId":1,"name":"叶子节点 1-1"},{"id":12,"pId":1,"name":"叶子节点 1-2"},{"id":13,"pId":1,"name":"叶子节点 1-3"},{"id":2,"pId":0,"name":"父节点 2","open":true},{"id":21,"pId":2,"name":"叶子节点 2-1"},{"id":22,"pId":2,"name":"叶子节点 2-2"},{"id":23,"pId":2,"name":"叶子节点 2-3"},{"id":3,"pId":0,"name":"父节点 3","open":true},{"id":31,"pId":3,"name":"叶子节点 3-1"},{"id":32,"pId":3,"name":"叶子节点 3-2"},{"id":33,"pId":3,"name":"叶子节点 3-3"}]';
257 // $data = json_decode($data, true);
258
259 $this->output->set_content_type('application/json')->set_output(json_encode($arr));
260 }
261
155 } 262 }
......
application/views/config/edit.php
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 <div class="panel panel-default mb-20"> 4 <div class="panel panel-default mb-20">
5 <div class="panel-body cl"> 5 <div class="panel-body cl">
6 <form action='config/product' method="post" class="form form-horizontal" id="add"> 6 <form action='config/product' method="post" class="form form-horizontal" id="add">
7 <input type="hidden" name="id" value="<?=$data->id?>">
7 <div class="row cl"> 8 <div class="row cl">
8 <div class="form-group col-sm-4 col-md-2"> 9 <div class="form-group col-sm-4 col-md-2">
9 <label>产品名称</label> 10 <label>产品名称</label>
...@@ -31,19 +32,19 @@ ...@@ -31,19 +32,19 @@
31 </div> 32 </div>
32 </div> 33 </div>
33 <!-- 需求改动先去了--> 34 <!-- 需求改动先去了-->
34 <!--<div class="row cl"> 35 <div class="row cl">
35 <div class="form-group col-sm-4 col-md-2"> 36 <div class="form-group col-sm-4 col-md-2">
36 <label>还款方式</label> 37 <label>还款方式</label>
37 <span class="form-control select-box"> 38 <span class="form-control select-box">
38 <select class="select" size="1" name="repaymentMode"> 39 <select class="select" size="1" name="repaymentMode">
39 <option>请选择</option> 40 <option>请选择</option>
40 <?php /*foreach ($this->session->repayments as $k=>$v):*/?> 41 <?php foreach ($this->session->repayments as $k=>$v): ?>
41 <option <?/*=$v == $data->repaymentMode ? 'selected' : '' */?> value="<?/*=$k*/?>"><?/*=$v*/?></option> 42 <option <?=$v == $data->repaymentMode ? 'selected' : '' ?> value="<?=$k?>"><?=$v?></option>
42 <?php /*endforeach;*/?> 43 <?php endforeach; ?>
43 </select> 44 </select>
44 </span> 45 </span>
45 </div> 46 </div>
46 </div>--> 47 </div>
47 <div class="row cl"> 48 <div class="row cl">
48 <div class="form-group col-sm-4 col-md-2"> 49 <div class="form-group col-sm-4 col-md-2">
49 <label>借款期限</label> 50 <label>借款期限</label>
...@@ -83,6 +84,7 @@ ...@@ -83,6 +84,7 @@
83 function save() { 84 function save() {
84 var targetUrl = $("#add").attr("action"); 85 var targetUrl = $("#add").attr("action");
85 var data = $("#add").serializeJson(); 86 var data = $("#add").serializeJson();
87 console.log(JSON.stringify(data));
86 $.ajax({ 88 $.ajax({
87 type: 'put', 89 type: 'put',
88 url: apiBaseUrl + targetUrl, 90 url: apiBaseUrl + targetUrl,
......
application/views/loan/search2.php
1 <div class="date mb-20"> 1 <div class="date mb-20">
2 <div class="col-xs-2">
3 <span class="select-box">
4 <select class="select table_search" column="17" name="code">
5 <option value=""></option>
6 <option value="0" >进件时间</option>
7 <option value="1" >放款时间</option>
8 <option value="2" >计划还款日期</option>
9
10 </select>
11 </span>
12 </div>
13
2 <input type="text" 14 <input type="text"
3 onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })" 15 onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'enterMaxDate\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })"
4 id="min" class="input-text Wdate"> - 16 id="enterMinDate" class="input-text Wdate"> -
5 <input type="text" 17 <input type="text"
6 onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })" 18 onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'enterMinDate\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })"
7 id="max" class="input-text Wdate"> 19 id="enterMaxDate" class="input-text Wdate">
8 </div> 20 </div>
9 <div class="row cl mb-20"> 21 <div class="row cl mb-20">
10 <div class="col-xs-2"> 22 <div class="col-xs-2">
11 <span class="select-box"> 23 <span class="select-box">
12 <select class="select table_search" column="17"> 24 <select class="select table_search" column="17" name="repayStatus">
13 <option value="" selected>还款状态</option> 25 <option value="" selected>还款状态</option>
14 <?php foreach ($this->session->repayStatus as $k=>$v):?> 26 <?php foreach ($this->session->repaymentPlans as $k=>$v):?>
15 <option value="<?=$v->id?>"><?=$v->name?></option> 27 <option value="<?=$k?>"><?=$v?></option>
16 <?php endforeach;?> 28 <?php endforeach;?>
17 </select> 29 </select>
18 </span> 30 </span>
19 </div> 31 </div>
20 <div class="col-xs-2"> 32 <div class="col-xs-2">
21 <span class="select-box"> 33 <span class="select-box">
22 <select class="select table_search" size="1" column="7"> 34 <select class="select table_search" size="1" column="7" name="branchName">
23 <option value="" selected>网点</option> 35 <option value="" selected>网点</option>
24 <?php foreach ($this->session->departments as $k=>$v):?> 36 <?php foreach ($this->session->departments as $k=>$v):?>
25 <option value="<?=$v->id?>"><?=$v->name?></option> 37 <option value="<?=$v->id?>"><?=$v->name?></option>
...@@ -32,25 +44,25 @@ ...@@ -32,25 +44,25 @@
32 </select> 44 </select>
33 </span> 45 </span>
34 </div> 46 </div>
35 <div class="col-xs-2"> 47 <!--<div class="col-xs-2">
36 <span class="select-box"> 48 <span class="select-box">
37 <select class="select table_search" column="16"> 49 <select class="select table_search" column="16">
38 <option value="" selected>是否逾期</option> 50 <option value="" selected>是否逾期</option>
39 <option>是</option> 51 <option value="1">是</option>
40 <option>否</option> 52 <option value="0">否</option>
41 </select> 53 </select>
42 </span> 54 </span>
43 </div> 55 </div>
44 <div class="col-xs-2"> 56 <div class="col-xs-2">
45 <span class="select-box"> 57 <span class="select-box">
46 <select class="select table_search" column="2"> 58 <select class="select table_search" column="2" name="source">
47 <option value="" selected>来源</option> 59 <option value="" selected>来源</option>
48 <?php foreach ($this->session->source as $k=>$v):?> 60 <?php /*foreach ($this->session->source as $k=>$v):*/?>
49 <option value="<?=$v->id?>"><?=$v->name?></option> 61 <option value="<?/*=$v->id*/?>"><?/*=$v->name*/?></option>
50 <?php endforeach;?> 62 <?php /*endforeach;*/?>
51 </select> 63 </select>
52 </span> 64 </span>
53 </div> 65 </div>-->
54 <div class="col-xs-2"> 66 <div class="col-xs-2">
55 <input type="text" class="form-control input-text table_search" value="" placeholder="姓名" column="3" name="proposerName"> 67 <input type="text" class="form-control input-text table_search" value="" placeholder="姓名" column="3" name="proposerName">
56 </div> 68 </div>
......
application/views/perm/personal.php
...@@ -100,6 +100,33 @@ ...@@ -100,6 +100,33 @@
100 function reset() { 100 function reset() {
101 layer_show('重置密码', '<?=site_url('perm/reset');?>'); 101 layer_show('重置密码', '<?=site_url('perm/reset');?>');
102 } 102 }
103
104
105 $.ajax({
106 type: 'put',
107 url: apiBaseUrl + targetUrl,
108 cache: false,
109 dataType: 'json',
110 data: JSON.stringify(data),
111 contentType: "application/json; charset=UTF-8",
112 success: function (data) {
113 if (data.msg) {
114 layer.alert(data.msg);
115 } else if (data.code != 0) {
116 layer.alert('操作失败');
117 } else {
118 layer.msg('操作成功');
119 }
120 setTimeout(function () {
121 if(!data.code) {
122 layer_close();
123 }
124 },500);
125 },
126 error: function () {
127 layer.alert("操作失败")
128 }
129 })
103 </script> 130 </script>
104 </body> 131 </body>
105 </html> 132 </html>
......
application/views/perm/roleEdit.php
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
41 var setting = { 41 var setting = {
42 async: { 42 async: {
43 enable: true, 43 enable: true,
44 url: '<?=site_url('/perm/organization')?>', 44 // url: '<?//=site_url('/perm/organization')?>//',
45 url: '<?=site_url('/perm/menu')?>',
45 autoParam:["id"] 46 autoParam:["id"]
46 }, 47 },
47 check: { 48 check: {
...@@ -70,6 +71,7 @@ ...@@ -70,6 +71,7 @@
70 function save() { 71 function save() {
71 //获得款中的节点 72 //获得款中的节点
72 var treeObj = $.fn.zTree.getZTreeObj("tree"); 73 var treeObj = $.fn.zTree.getZTreeObj("tree");
74 console.log(treeObj);
73 var nodes = treeObj.getCheckedNodes(true); 75 var nodes = treeObj.getCheckedNodes(true);
74 console.log(nodes); 76 console.log(nodes);
75 77
......
application/views/work/资料/资料补录.php
...@@ -238,6 +238,17 @@ ...@@ -238,6 +238,17 @@
238 </span> 238 </span>
239 </div> 239 </div>
240 <div class="form-group col-sm-3 col-md-2"> 240 <div class="form-group col-sm-3 col-md-2">
241 <label>职称类型</label>
242 <span class="form-control select-box">
243 <select class="select" size="1">
244 <?php foreach ($this->session->jobTypeEnum as $k => $v): ?>
245 <option <?= $clientUnitOutputVO && $clientUnitOutputVO->jobType == $k ? 'selected' : '' ?>
246 value="<?= $k ?>"><?= $v ?></option>
247 <?php endforeach; ?>
248 </select>
249 </span>
250 </div>
251 <div class="form-group col-sm-3 col-md-2">
241 <label>职位名称</label> 252 <label>职位名称</label>
242 <input type="text" class="form-control input-text" name="clientUnitInputVO.jobPosition" 253 <input type="text" class="form-control input-text" name="clientUnitInputVO.jobPosition"
243 value="<?= $clientUnitOutputVO ? $clientUnitOutputVO->jobPosition : '' ?>"> 254 value="<?= $clientUnitOutputVO ? $clientUnitOutputVO->jobPosition : '' ?>">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!