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
$this->load->view('work/审批/网查筛选', $data);
break;
case 8:
$url = $this->config->item('apiBaseUrl') . 'audit/phoneAudit/record/' . $id;
$result = file_get_contents($url);
$json = json_decode($result);
$ret = $json->data;
$data['record'] = $ret;
$this->load->view('work/审批/电核', $data);
break;
case 9:
......@@ -231,9 +236,10 @@ class Work extends CI_Controller
}
}
public function telAdd()
public function telAdd($id)
{
$this->load->view('work/审批/电核添加');
$data = array('id'=>$id);
$this->load->view('work/审批/电核添加', $data);
}
public function telRefuse()
......
application/views/loan/还款编辑.php
......@@ -7,9 +7,10 @@
<div class="panel-body cl">
<div class="row cl">
<input type="hidden" name="id" value="<?=$id?>">
<div class="form-group col-sm-4 col-md-2">
<label>订单号</label>
<input type="text" class="form-control input-text" value="<?=$orderNumber?>" name="orderNumber">
<div class="form-group col-sm-4 col-md-2">
<label>订单id</label>
<!-- <input type="text" class="form-control input-text" value="--><?//=$orderNumber?><!--" name="orderNumber">-->
<input type="text" class="form-control input-text" value="<?=$orderId?>" name="orderId">
</div>
<div class="form-group col-sm-4 col-md-2">
<label>申请人</label>
......@@ -30,7 +31,7 @@
<div class="form-group col-sm-4 col-md-2">
<label>来源</label>
<span class="form-control select-box">
<select class="select" size="1" name="repayStatus">
<select class="select" size="1" name="source">
<?php foreach($enumSource as $k => $v) : ?>
<option value="<?=$k?>" <?=$k == $source?'selected':''?>><?=$v?></option>
<?php endforeach ?>
......
application/views/perm/role.php
......@@ -5,24 +5,10 @@
<div class="page-container">
<form class="" onreset="resetHandler()">
<div class="row cl mb-20">
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" size="1" column="1">
<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>
</div>
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" size="1" column="2">
<select class="select table_search" size="1" column="2" name="role">
<option value="" selected>角色</option>
<?php foreach ($this->session->role as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->nameZh?></option>
......
application/views/perm/staffAdd.php
......@@ -81,6 +81,12 @@
var targetUrl = $("#add").attr("action");
var data = $("#add").serializeJson();
var newData = {};
var rolesid = [];
if(data['roles'].length == 1){
rolesid.push(data['roles']);
}else{
rolesid = data['roles'];
}
newData = {
// newData['HrVO'] = {
name:data['name'],
......@@ -88,7 +94,7 @@
telephone:data['phone'],
// phone:data['phone'],
password:data['password'],
roleIds:data['roles'],
roleIds:rolesid,
// roles:data['roles'],
departmentId:data['children']
};
......
application/views/work/审批/电核.php
......@@ -18,6 +18,7 @@
<div class="tabCon">
<form action="" id="form1">
<input type="hidden" name="orderId" value="<?=$id?>">
<?php $this->load->view('/work/审批/电核结果'); ?>
</form>
</div>
......@@ -37,26 +38,29 @@
<th>是否拨通</th>
<th>电核人</th>
<th>备注</th>
<th width="70px">操作</th>
<!-- <th width="70px">操作</th>-->
</tr>
</thead>
<tbody class="text-c">
<tr>
<td>1</td>
<td>2018-01-01 00:00:00</td>
<td>是</td>
<td>张三</td>
<td>备注</td>
<td><a href="javascript:add();"><i class="Hui-iconfont">&#xe6df;</i> 编辑<a></td>
</tr>
<tr>
<?php
?>
<?php foreach ($record as $k=>$v):?>
<tr>
<td><?=$v->id?></td>
<td><?=$v->phoneAuditTime?></td>
<td><?=$v->hasPutThrough ? '是' : '否'?></td>
<td><?=$v->phoneAuditEmployee?></td>
<td><?=$v->remark?></td>
</tr>
<?php endforeach;?>
<!--<tr>
<td>1</td>
<td>2018-01-01 00:00:00</td>
<td>是</td>
<td>张三</td>
<td>备注</td>
<td><a href="javascript:add();"><i class="Hui-iconfont">&#xe6df;</i> 编辑<a></td>
</tr>
</tr>-->
</tbody>
</table>
</div>
......@@ -93,7 +97,7 @@
title: '电核记录',
shadeClose: true,
area: ['800px', '400px'],
content: '<?=site_url('work/telAdd')?>'
content: '<?=site_url('work/telAdd/'.$id)?>'
});
}
......@@ -134,9 +138,7 @@
error: function () {
layer.alert("操作失败")
}
})
}
</script>
</body>
......
application/views/work/审批/电核添加.php
<?php $this->load->view('common/header'); ?>
<body>
<form action="" id="form1">
<input type="hidden" name="orderId" value="<?=$id?>">
<div class="panel panel-default mb-20">
<div class="panel-body cl">
<div class="row cl">
<div class="form-group col-sm-3 col-md-1">
<label>电核时间</label>
<input type="text" class="form-control input-text Wdate" value="" onfocus="WdatePicker()">
<input name="phoneAuditTime" type="text" class="form-control input-text Wdate" value="" onfocus="WdatePicker()">
</div>
</div>
<div class="row cl">
<div class="form-group col-sm-3 col-md-1">
<label>是否拨通</label>
<span class="form-control select-box">
<select class="select" size="1">
<select class="select" size="1" name="hasPutThrough">
<option value="1">是</option>
<option value="2">否</option>
<option value="0">否</option>
</select>
</span>
</div>
......@@ -23,18 +25,53 @@
<div class="row cl">
<div class="form-group col-sm-12 col-md-12">
<label>备注</label>
<textarea class="textarea"></textarea>
<textarea class="textarea" name="remark"></textarea>
</div>
</div>
</div>
</div>
</form>
<div class="row cl col-sm-12">
<div class="col-sm-2">
<button class="btn btn-primary btn-block" onclick="layer_close();">保存</button>
<button class="btn btn-primary btn-block" onclick="pass();">保存</button>
</div>
</div>
<?php $this->load->view('common/footer'); ?>
</body>
<script>
function pass() {
var data = $("#form1").serializeJson();
$.ajax({
type: 'post',
url: apiBaseUrl + 'audit/phoneAudit/record',
cache: false,
data: JSON.stringify(data),
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.alert('操作成功');
}
if(!data.code){
setTimeout(function () {
layer_close();
}, 500)
}
},
error: function () {
layer.alert("操作失败")
}
})
}
</script>
</html>
\ No newline at end of file
......
application/views/work/审批/电核结果.php
......@@ -146,11 +146,11 @@
<div class="form-group col-sm-3 col-md-2">
<div class="info">
<div class="live-info">
<input type="radio" name="operateBasicInformationCheck">
<input type="radio" name="operateBasicInformationCheck" value="1">
<span>是</span>
</div>
<div class="live-info">
<input type="radio" name="operateBasicInformationCheck">
<input type="radio" name="operateBasicInformationCheck" value="0">
<span>否</span>
</div>
</div>
......@@ -169,11 +169,11 @@
<div class="form-group col-sm-3 col-md-2">
<div class="info">
<div class="live-info">
<input type="radio" name="operateFinanceDataCheck">
<input type="radio" name="operateFinanceDataCheck" value="1">
<span>是</span>
</div>
<div class="live-info">
<input type="radio" name="operateFinanceDataCheck">
<input type="radio" name="operateFinanceDataCheck" value="0">
<span>否</span>
</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!