Skip to content

杨建斌 / page

Go to a project
Toggle navigation
Toggle navigation pinning
7c6ae82f by Zelig
Options

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

2 parents bd321429 8d5c293a
Inline Side-by-side
Showing 7 changed files with 84 additions and 46 deletions
application/controllers/Work.php
...@@ -214,6 +214,11 @@ class Work extends CI_Controller ...@@ -214,6 +214,11 @@ class Work extends CI_Controller
214 $this->load->view('work/审批/网查筛选', $data); 214 $this->load->view('work/审批/网查筛选', $data);
215 break; 215 break;
216 case 8: 216 case 8:
217 $url = $this->config->item('apiBaseUrl') . 'audit/phoneAudit/record/' . $id;
218 $result = file_get_contents($url);
219 $json = json_decode($result);
220 $ret = $json->data;
221 $data['record'] = $ret;
217 $this->load->view('work/审批/电核', $data); 222 $this->load->view('work/审批/电核', $data);
218 break; 223 break;
219 case 9: 224 case 9:
...@@ -231,9 +236,10 @@ class Work extends CI_Controller ...@@ -231,9 +236,10 @@ class Work extends CI_Controller
231 } 236 }
232 } 237 }
233 238
234 public function telAdd() 239 public function telAdd($id)
235 { 240 {
236 $this->load->view('work/审批/电核添加'); 241 $data = array('id'=>$id);
242 $this->load->view('work/审批/电核添加', $data);
237 } 243 }
238 244
239 public function telRefuse() 245 public function telRefuse()
......
application/views/loan/还款编辑.php
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
7 <div class="panel-body cl"> 7 <div class="panel-body cl">
8 <div class="row cl"> 8 <div class="row cl">
9 <input type="hidden" name="id" value="<?=$id?>"> 9 <input type="hidden" name="id" value="<?=$id?>">
10 <div class="form-group col-sm-4 col-md-2"> 10 <div class="form-group col-sm-4 col-md-2">
11 <label>订单号</label> 11 <label>订单id</label>
12 <input type="text" class="form-control input-text" value="<?=$orderNumber?>" name="orderNumber"> 12 <!-- <input type="text" class="form-control input-text" value="--><?//=$orderNumber?><!--" name="orderNumber">-->
13 <input type="text" class="form-control input-text" value="<?=$orderId?>" name="orderId">
13 </div> 14 </div>
14 <div class="form-group col-sm-4 col-md-2"> 15 <div class="form-group col-sm-4 col-md-2">
15 <label>申请人</label> 16 <label>申请人</label>
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
30 <div class="form-group col-sm-4 col-md-2"> 31 <div class="form-group col-sm-4 col-md-2">
31 <label>来源</label> 32 <label>来源</label>
32 <span class="form-control select-box"> 33 <span class="form-control select-box">
33 <select class="select" size="1" name="repayStatus"> 34 <select class="select" size="1" name="source">
34 <?php foreach($enumSource as $k => $v) : ?> 35 <?php foreach($enumSource as $k => $v) : ?>
35 <option value="<?=$k?>" <?=$k == $source?'selected':''?>><?=$v?></option> 36 <option value="<?=$k?>" <?=$k == $source?'selected':''?>><?=$v?></option>
36 <?php endforeach ?> 37 <?php endforeach ?>
......
application/views/perm/role.php
...@@ -5,24 +5,10 @@ ...@@ -5,24 +5,10 @@
5 <div class="page-container"> 5 <div class="page-container">
6 <form class="" onreset="resetHandler()"> 6 <form class="" onreset="resetHandler()">
7 <div class="row cl mb-20"> 7 <div class="row cl mb-20">
8
8 <div class="col-xs-2"> 9 <div class="col-xs-2">
9 <span class="select-box"> 10 <span class="select-box">
10 <select class="select table_search" size="1" column="1"> 11 <select class="select table_search" size="1" column="2" name="role">
11 <option value="" selected>网点</option>
12 <?php foreach ($this->session->departments as $k=>$v):?>
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;?>
19 <?php endforeach;?>
20 </select>
21 </span>
22 </div>
23 <div class="col-xs-2">
24 <span class="select-box">
25 <select class="select table_search" size="1" column="2">
26 <option value="" selected>角色</option> 12 <option value="" selected>角色</option>
27 <?php foreach ($this->session->role as $k=>$v):?> 13 <?php foreach ($this->session->role as $k=>$v):?>
28 <option value="<?=$v->id?>"><?=$v->nameZh?></option> 14 <option value="<?=$v->id?>"><?=$v->nameZh?></option>
......
application/views/perm/staffAdd.php
...@@ -81,6 +81,12 @@ ...@@ -81,6 +81,12 @@
81 var targetUrl = $("#add").attr("action"); 81 var targetUrl = $("#add").attr("action");
82 var data = $("#add").serializeJson(); 82 var data = $("#add").serializeJson();
83 var newData = {}; 83 var newData = {};
84 var rolesid = [];
85 if(data['roles'].length == 1){
86 rolesid.push(data['roles']);
87 }else{
88 rolesid = data['roles'];
89 }
84 newData = { 90 newData = {
85 // newData['HrVO'] = { 91 // newData['HrVO'] = {
86 name:data['name'], 92 name:data['name'],
...@@ -88,7 +94,7 @@ ...@@ -88,7 +94,7 @@
88 telephone:data['phone'], 94 telephone:data['phone'],
89 // phone:data['phone'], 95 // phone:data['phone'],
90 password:data['password'], 96 password:data['password'],
91 roleIds:data['roles'], 97 roleIds:rolesid,
92 // roles:data['roles'], 98 // roles:data['roles'],
93 departmentId:data['children'] 99 departmentId:data['children']
94 }; 100 };
......
application/views/work/审批/电核.php
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
18 18
19 <div class="tabCon"> 19 <div class="tabCon">
20 <form action="" id="form1"> 20 <form action="" id="form1">
21 <input type="hidden" name="orderId" value="<?=$id?>">
21 <?php $this->load->view('/work/审批/电核结果'); ?> 22 <?php $this->load->view('/work/审批/电核结果'); ?>
22 </form> 23 </form>
23 </div> 24 </div>
...@@ -37,26 +38,29 @@ ...@@ -37,26 +38,29 @@
37 <th>是否拨通</th> 38 <th>是否拨通</th>
38 <th>电核人</th> 39 <th>电核人</th>
39 <th>备注</th> 40 <th>备注</th>
40 <th width="70px">操作</th> 41 <!-- <th width="70px">操作</th>-->
41 </tr> 42 </tr>
42 </thead> 43 </thead>
43 <tbody class="text-c"> 44 <tbody class="text-c">
44 <tr> 45 <?php
45 <td>1</td> 46 ?>
46 <td>2018-01-01 00:00:00</td> 47 <?php foreach ($record as $k=>$v):?>
47 <td>是</td> 48 <tr>
48 <td>张三</td> 49 <td><?=$v->id?></td>
49 <td>备注</td> 50 <td><?=$v->phoneAuditTime?></td>
50 <td><a href="javascript:add();"><i class="Hui-iconfont">&#xe6df;</i> 编辑<a></td> 51 <td><?=$v->hasPutThrough ? '是' : '否'?></td>
51 </tr> 52 <td><?=$v->phoneAuditEmployee?></td>
52 <tr> 53 <td><?=$v->remark?></td>
54 </tr>
55 <?php endforeach;?>
56 <!--<tr>
53 <td>1</td> 57 <td>1</td>
54 <td>2018-01-01 00:00:00</td> 58 <td>2018-01-01 00:00:00</td>
55 <td>是</td> 59 <td>是</td>
56 <td>张三</td> 60 <td>张三</td>
57 <td>备注</td> 61 <td>备注</td>
58 <td><a href="javascript:add();"><i class="Hui-iconfont">&#xe6df;</i> 编辑<a></td> 62 <td><a href="javascript:add();"><i class="Hui-iconfont">&#xe6df;</i> 编辑<a></td>
59 </tr> 63 </tr>-->
60 </tbody> 64 </tbody>
61 </table> 65 </table>
62 </div> 66 </div>
...@@ -93,7 +97,7 @@ ...@@ -93,7 +97,7 @@
93 title: '电核记录', 97 title: '电核记录',
94 shadeClose: true, 98 shadeClose: true,
95 area: ['800px', '400px'], 99 area: ['800px', '400px'],
96 content: '<?=site_url('work/telAdd')?>' 100 content: '<?=site_url('work/telAdd/'.$id)?>'
97 }); 101 });
98 } 102 }
99 103
...@@ -134,9 +138,7 @@ ...@@ -134,9 +138,7 @@
134 error: function () { 138 error: function () {
135 layer.alert("操作失败") 139 layer.alert("操作失败")
136 } 140 }
137
138 }) 141 })
139
140 } 142 }
141 </script> 143 </script>
142 </body> 144 </body>
......
application/views/work/审批/电核添加.php
1 <?php $this->load->view('common/header'); ?> 1 <?php $this->load->view('common/header'); ?>
2 2
3 <body> 3 <body>
4 <form action="" id="form1">
5 <input type="hidden" name="orderId" value="<?=$id?>">
4 <div class="panel panel-default mb-20"> 6 <div class="panel panel-default mb-20">
5 <div class="panel-body cl"> 7 <div class="panel-body cl">
6 <div class="row cl"> 8 <div class="row cl">
7 <div class="form-group col-sm-3 col-md-1"> 9 <div class="form-group col-sm-3 col-md-1">
8 <label>电核时间</label> 10 <label>电核时间</label>
9 <input type="text" class="form-control input-text Wdate" value="" onfocus="WdatePicker()"> 11 <input name="phoneAuditTime" type="text" class="form-control input-text Wdate" value="" onfocus="WdatePicker()">
10 </div> 12 </div>
11 </div> 13 </div>
12 <div class="row cl"> 14 <div class="row cl">
13 <div class="form-group col-sm-3 col-md-1"> 15 <div class="form-group col-sm-3 col-md-1">
14 <label>是否拨通</label> 16 <label>是否拨通</label>
15 <span class="form-control select-box"> 17 <span class="form-control select-box">
16 <select class="select" size="1"> 18 <select class="select" size="1" name="hasPutThrough">
17 <option value="1">是</option> 19 <option value="1">是</option>
18 <option value="2">否</option> 20 <option value="0">否</option>
19 </select> 21 </select>
20 </span> 22 </span>
21 </div> 23 </div>
...@@ -23,18 +25,53 @@ ...@@ -23,18 +25,53 @@
23 <div class="row cl"> 25 <div class="row cl">
24 <div class="form-group col-sm-12 col-md-12"> 26 <div class="form-group col-sm-12 col-md-12">
25 <label>备注</label> 27 <label>备注</label>
26 <textarea class="textarea"></textarea> 28 <textarea class="textarea" name="remark"></textarea>
27 </div> 29 </div>
28 </div> 30 </div>
29 </div> 31 </div>
30 </div> 32 </div>
31 33
34 </form>
35
32 <div class="row cl col-sm-12"> 36 <div class="row cl col-sm-12">
33 <div class="col-sm-2"> 37 <div class="col-sm-2">
34 <button class="btn btn-primary btn-block" onclick="layer_close();">保存</button> 38 <button class="btn btn-primary btn-block" onclick="pass();">保存</button>
35 </div> 39 </div>
36 </div> 40 </div>
37 41
38 <?php $this->load->view('common/footer'); ?> 42 <?php $this->load->view('common/footer'); ?>
39 </body> 43 </body>
44 <script>
45
46 function pass() {
47 var data = $("#form1").serializeJson();
48 $.ajax({
49 type: 'post',
50 url: apiBaseUrl + 'audit/phoneAudit/record',
51 cache: false,
52 data: JSON.stringify(data),
53 dataType: 'json',
54 contentType: "application/json; charset=UTF-8",
55 success: function (data) {
56 if (data.msg) {
57 layer.alert(data.msg);
58 } else if (data.code != 0) {
59 layer.alert('操作失败');
60 } else {
61 layer.alert('操作成功');
62 }
63 if(!data.code){
64 setTimeout(function () {
65 layer_close();
66 }, 500)
67 }
68 },
69 error: function () {
70 layer.alert("操作失败")
71 }
72
73 })
74 }
75
76 </script>
40 </html> 77 </html>
...\ No newline at end of file ...\ No newline at end of file
......
application/views/work/审批/电核结果.php
...@@ -146,11 +146,11 @@ ...@@ -146,11 +146,11 @@
146 <div class="form-group col-sm-3 col-md-2"> 146 <div class="form-group col-sm-3 col-md-2">
147 <div class="info"> 147 <div class="info">
148 <div class="live-info"> 148 <div class="live-info">
149 <input type="radio" name="operateBasicInformationCheck"> 149 <input type="radio" name="operateBasicInformationCheck" value="1">
150 <span>是</span> 150 <span>是</span>
151 </div> 151 </div>
152 <div class="live-info"> 152 <div class="live-info">
153 <input type="radio" name="operateBasicInformationCheck"> 153 <input type="radio" name="operateBasicInformationCheck" value="0">
154 <span>否</span> 154 <span>否</span>
155 </div> 155 </div>
156 </div> 156 </div>
...@@ -169,11 +169,11 @@ ...@@ -169,11 +169,11 @@
169 <div class="form-group col-sm-3 col-md-2"> 169 <div class="form-group col-sm-3 col-md-2">
170 <div class="info"> 170 <div class="info">
171 <div class="live-info"> 171 <div class="live-info">
172 <input type="radio" name="operateFinanceDataCheck"> 172 <input type="radio" name="operateFinanceDataCheck" value="1">
173 <span>是</span> 173 <span>是</span>
174 </div> 174 </div>
175 <div class="live-info"> 175 <div class="live-info">
176 <input type="radio" name="operateFinanceDataCheck"> 176 <input type="radio" name="operateFinanceDataCheck" value="0">
177 <span>否</span> 177 <span>否</span>
178 </div> 178 </div>
179 </div> 179 </div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!