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 {
$this->output->set_content_type('application/json')->set_output(json_encode($arr));
}
public function menu()
{
// echo $this->config->item('apiBaseUrl') . 'system/menu/getAllMenu';
$res = json_decode(file_get_contents($this->config->item('apiBaseUrl') . 'system/menu/getAllMenu'));
// var_dump($res->data);
// exit;
$data = $res->data;
// var_dump($data);
$arr = array();
foreach ($data as $k => $v) {
$item = array();
$item['id'] = $v->id;
$item['name'] = $v->name;
$item['pId'] = 0;
$item['open'] = true;
// var_dump($item);exit;
$arr[] = $item;
if (!$v->children || empty($v->children)) {
continue;
}
foreach ($v->children as $kk => $vv) {
$item2 = array();
$item2['id'] = $vv->id;
$item2['name'] = $vv->name;
$item2['pId'] = $v->id;
$item2['open'] = true;
$arr[] = $item2;
if (!$vv->children || empty($vv->children)) {
continue;
}
foreach ($vv->children as $kkk => $vvv) {
$item3 = array();
$item3['id'] = $vvv->id;
$item3['name'] = $vvv->name;
$item3['pId'] = $vv->id;
$item3['open'] = true;
$arr[] = $item3;
if (!$vvv->children || empty($vvv->children)) {
continue;
}
foreach ($vvv->children as $kkkk => $vvvv) {
$item4 = array();
$item4['id'] = $vvvv->id;
$item4['name'] = $vvvv->name;
$item4['pId'] = $vvv->id;
$item4['open'] = true;
$arr[] = $item4;
if (!$vvvv->children || empty($vvvv->children)) {
continue;
}
foreach ($vvvv->children as $kkkkk => $vvvvv) {
$item5 = array();
$item5['id'] = $vvvvv->id;
$item5['name'] = $vvvvv->name;
$item5['pId'] = $vvvv->id;
$item5['open'] = true;
$arr[] = $item5;
if (!$vvvvv->children || empty($vvvvv->children)) {
continue;
}
foreach ($vvvvv->children as $kkkkkk => $vvvvvv) {
$item6 = array();
$item6['id'] = $vvvvvv->id;
$item6['name'] = $vvvvvv->name;
$item6['pId'] = $vvvvv->id;
$arr[] = $item6;
if (!$vvvvvv->children || empty($vvvvvv->children)) {
continue;
}
foreach ($vvvvvv->children as $k7 => $v7) {
$item7 = array();
$item7['id'] = $v7->id;
$item7['name'] = $v7->name;
$item7['pId'] = $vvvvvv->id;
$arr[] = $item7;
if (!$v7->children || empty($v7->children)) {
continue;
}
foreach ($v7->children as $k8 => $v8) {
$item8 = array();
$item8['id'] = $v8->id;
$item8['name'] = $v8->name;
$item8['pId'] = $v7->id;
$arr[] = $item8;
}
}
}
}
}
}
}
}
// var_dump($arr);exit;
// $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"}]';
// $data = json_decode($data, true);
$this->output->set_content_type('application/json')->set_output(json_encode($arr));
}
}
......
application/views/config/edit.php
......@@ -4,6 +4,7 @@
<div class="panel panel-default mb-20">
<div class="panel-body cl">
<form action='config/product' method="post" class="form form-horizontal" id="add">
<input type="hidden" name="id" value="<?=$data->id?>">
<div class="row cl">
<div class="form-group col-sm-4 col-md-2">
<label>产品名称</label>
......@@ -31,19 +32,19 @@
</div>
</div>
<!-- 需求改动先去了-->
<!--<div class="row cl">
<div class="row cl">
<div class="form-group col-sm-4 col-md-2">
<label>还款方式</label>
<span class="form-control select-box">
<select class="select" size="1" name="repaymentMode">
<option>请选择</option>
<?php /*foreach ($this->session->repayments as $k=>$v):*/?>
<option <?/*=$v == $data->repaymentMode ? 'selected' : '' */?> value="<?/*=$k*/?>"><?/*=$v*/?></option>
<?php /*endforeach;*/?>
<?php foreach ($this->session->repayments as $k=>$v): ?>
<option <?=$v == $data->repaymentMode ? 'selected' : '' ?> value="<?=$k?>"><?=$v?></option>
<?php endforeach; ?>
</select>
</span>
</div>
</div>-->
</div>
<div class="row cl">
<div class="form-group col-sm-4 col-md-2">
<label>借款期限</label>
......@@ -83,6 +84,7 @@
function save() {
var targetUrl = $("#add").attr("action");
var data = $("#add").serializeJson();
console.log(JSON.stringify(data));
$.ajax({
type: 'put',
url: apiBaseUrl + targetUrl,
......
application/views/loan/search2.php
<div class="date mb-20">
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" column="17" name="code">
<option value=""></option>
<option value="0" >进件时间</option>
<option value="1" >放款时间</option>
<option value="2" >计划还款日期</option>
</select>
</span>
</div>
<input type="text"
onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })"
id="min" class="input-text Wdate"> -
onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'enterMaxDate\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })"
id="enterMinDate" class="input-text Wdate"> -
<input type="text"
onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })"
id="max" class="input-text Wdate">
onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'enterMinDate\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })"
id="enterMaxDate" class="input-text Wdate">
</div>
<div class="row cl mb-20">
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" column="17">
<select class="select table_search" column="17" name="repayStatus">
<option value="" selected>还款状态</option>
<?php foreach ($this->session->repayStatus as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<?php foreach ($this->session->repaymentPlans as $k=>$v):?>
<option value="<?=$k?>"><?=$v?></option>
<?php endforeach;?>
</select>
</span>
</div>
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" size="1" column="7">
<select class="select table_search" size="1" column="7" name="branchName">
<option value="" selected>网点</option>
<?php foreach ($this->session->departments as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
......@@ -32,25 +44,25 @@
</select>
</span>
</div>
<div class="col-xs-2">
<!--<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" column="16">
<option value="" selected>是否逾期</option>
<option>是</option>
<option>否</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</span>
</div>
<div class="col-xs-2">
<span class="select-box">
<select class="select table_search" column="2">
<select class="select table_search" column="2" name="source">
<option value="" selected>来源</option>
<?php foreach ($this->session->source as $k=>$v):?>
<option value="<?=$v->id?>"><?=$v->name?></option>
<?php endforeach;?>
<?php /*foreach ($this->session->source as $k=>$v):*/?>
<option value="<?/*=$v->id*/?>"><?/*=$v->name*/?></option>
<?php /*endforeach;*/?>
</select>
</span>
</div>
</div>-->
<div class="col-xs-2">
<input type="text" class="form-control input-text table_search" value="" placeholder="姓名" column="3" name="proposerName">
</div>
......
application/views/perm/personal.php
......@@ -100,6 +100,33 @@
function reset() {
layer_show('重置密码', '<?=site_url('perm/reset');?>');
}
$.ajax({
type: 'put',
url: apiBaseUrl + targetUrl,
cache: false,
dataType: 'json',
data: JSON.stringify(data),
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.msg('操作成功');
}
setTimeout(function () {
if(!data.code) {
layer_close();
}
},500);
},
error: function () {
layer.alert("操作失败")
}
})
</script>
</body>
</html>
......
application/views/perm/roleEdit.php
......@@ -41,7 +41,8 @@
var setting = {
async: {
enable: true,
url: '<?=site_url('/perm/organization')?>',
// url: '<?//=site_url('/perm/organization')?>//',
url: '<?=site_url('/perm/menu')?>',
autoParam:["id"]
},
check: {
......@@ -70,6 +71,7 @@
function save() {
//获得款中的节点
var treeObj = $.fn.zTree.getZTreeObj("tree");
console.log(treeObj);
var nodes = treeObj.getCheckedNodes(true);
console.log(nodes);
......
application/views/work/资料/资料补录.php
......@@ -238,6 +238,17 @@
</span>
</div>
<div class="form-group col-sm-3 col-md-2">
<label>职称类型</label>
<span class="form-control select-box">
<select class="select" size="1">
<?php foreach ($this->session->jobTypeEnum as $k => $v): ?>
<option <?= $clientUnitOutputVO && $clientUnitOutputVO->jobType == $k ? 'selected' : '' ?>
value="<?= $k ?>"><?= $v ?></option>
<?php endforeach; ?>
</select>
</span>
</div>
<div class="form-group col-sm-3 col-md-2">
<label>职位名称</label>
<input type="text" class="form-control input-text" name="clientUnitInputVO.jobPosition"
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!