71659609 by Zelig

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

2 parents d365509b 968e085c
......@@ -123,9 +123,12 @@
if(draw) {
ret.draw = draw;
}
// ret.draw = parseInt(json.page.currentPage);
ret.recordsTotal = parseInt(json.page.totalNumber);
ret.recordsFiltered = parseInt(json.page.totalNumber);
ret.recordsTotal = 0;
ret.recordsFiltered = 0;
if (json.page) {
ret.recordsTotal = parseInt(json.page.totalNumber);
ret.recordsFiltered = parseInt(json.page.totalNumber);
}
return JSON.stringify(ret);
},
data: function (data) {
......
<?php $this->load->view('common/header'); ?>
<body>
<?php $this->load->view('common/work_header'); ?>
<div class="page-container">
<form class="search">
<div class="date mb-20">
<input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'logmax\')||\'%y-%M-%d\'}' })" id="logmin" class="input-text Wdate"> -
<input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'logmin\')}',maxDate:'%y-%M-%d' })" id="logmax" class="input-text Wdate">
</div>
<div class="row cl mb-20">
<div class="col-xs-2">
<?php $this->load->view('common/work_header'); ?>
<div class="page-container">
<form class="search">
<div class="date mb-20">
<input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'logmax\')||\'%y-%M-%d\'}' })" id="logmin"
class="input-text Wdate"> -
<input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'logmin\')}',maxDate:'%y-%M-%d' })"
id="logmax" class="input-text Wdate">
</div>
<div class="row cl mb-20">
<div class="col-xs-2">
<span class="select-box">
<select class="select" size="1">
<option value="" selected>网点</option>
......@@ -18,8 +20,8 @@
<option value="3">菜单三</option>
</select>
</span>
</div>
<div class="col-xs-2">
</div>
<div class="col-xs-2">
<span class="select-box">
<select class="select" size="1">
<option value="" selected>产品名称</option>
......@@ -28,8 +30,8 @@
<option value="3">菜单三</option>
</select>
</span>
</div>
<div class="col-xs-2">
</div>
<div class="col-xs-2">
<span class="select-box">
<select class="select" size="1">
<option value="" selected>客户经理</option>
......@@ -38,8 +40,8 @@
<option value="3">菜单三</option>
</select>
</span>
</div>
<div class="col-xs-2">
</div>
<div class="col-xs-2">
<span class="select-box">
<select class="select" size="1">
<option value="" selected>流程节点</option>
......@@ -48,8 +50,8 @@
<option value="3">菜单三</option>
</select>
</span>
</div>
<div class="col-xs-2">
</div>
<div class="col-xs-2">
<span class="select-box">
<select class="select" size="1">
<option value="" selected>处理人</option>
......@@ -58,148 +60,152 @@
<option value="3">菜单三</option>
</select>
</span>
</div>
</div>
<div>
<input class="btn btn-primary radius" type="submit" value="提交搜索">
<input class="btn btn-warning radius" type="reset" value="重置搜索">
</div>
</form>
<div class="body mt-20">
<table class="table table-border table-bordered table-bg" id="table">
<thead class="text-c">
<tr>
<th width="15px"><input type="checkbox"></th>
<th width="68px">操作</th>
<th>订单编号</th>
<th>申请人</th>
<th>身份证</th>
<th>手机号</th>
<th>进件时间</th>
<th>网点</th>
<th>产品名称</th>
<th>申请金额</th>
<th>审批金额</th>
<th>客户经理</th>
<th>流程节点</th>
<th>流转时间</th>
<th>处理人</th>
</tr>
</thead>
<tbody class="text-c">
</tbody>
</table>
</div>
<div>
<input class="btn btn-primary radius" type="submit" value="提交搜索">
<input class="btn btn-warning radius" type="reset" value="重置搜索">
</div>
</form>
<div class="body mt-20">
<table class="table table-border table-bordered table-bg" id="table">
<thead class="text-c">
<tr>
<th width="15px"><input type="checkbox"></th>
<th width="68px">操作</th>
<th>订单编号</th>
<th>申请人</th>
<th>身份证</th>
<th>手机号</th>
<th>进件时间</th>
<th>网点</th>
<th>产品名称</th>
<th>申请金额</th>
<th>审批金额</th>
<th>客户经理</th>
<th>流程节点</th>
<th>流转时间</th>
<th>处理人</th>
</tr>
</thead>
<tbody class="text-c">
</tbody>
</table>
</div>
<?php $this->load->view('common/footer'); ?>
</div>
<?php $this->load->view('common/footer'); ?>
<script>
function pass(id) {
layer.confirm('通过之后, 将立即进入审批阶段', {
btn: ['确认通过','取消'],
title: '确认通过预审',
icon: 3
}, function(){
layer.msg('通过');
});
}
</script>
<script>
var table = $('#table').dataTable({
aaSorting: [[1, "desc"]],
serverSide: true,
processing: true,
bSort: false,
searching: false,//是否显示搜索
iDisplayLength: 6,
bLengthChange: false,
ajax: {
url: apiBaseUrl + '/order/getStatus3',
dataFilter: function (json) {
var ret = {}, json = jQuery.parseJSON(json);
ret.data = json.data;
var draw = getUrlParam('draw');
if(draw) {
ret.draw = draw;
}
// ret.draw = parseInt(json.page.currentPage);
<script>
function pass(id) {
layer.confirm('通过之后, 将立即进入审批阶段', {
btn: ['确认通过', '取消'],
title: '确认通过预审',
icon: 3
}, function () {
layer.msg('通过');
});
}
</script>
<script>
var table = $('#table').dataTable({
aaSorting: [[1, "desc"]],
serverSide: true,
processing: true,
bSort: false,
searching: false,//是否显示搜索
iDisplayLength: 6,
bLengthChange: false,
ajax: {
url: apiBaseUrl + '/order/getStatus3',
dataFilter: function (json) {
var ret = {}, json = jQuery.parseJSON(json);
ret.data = json.data;
var draw = getUrlParam('draw');
if (draw) {
ret.draw = draw;
}
// ret.draw = parseInt(json.page.currentPage);
ret.recordsTotal = 0;
ret.recordsFiltered = 0;
if (json.page) {
ret.recordsTotal = parseInt(json.page.totalNumber);
ret.recordsFiltered = parseInt(json.page.totalNumber);
return JSON.stringify(ret);
},
data: function (data) {
data.pageSize = data.length;
data.currentPage = parseFloat(data.start / data.length) + 1;
return data;
}
return JSON.stringify(ret);
},
data: function (data) {
data.pageSize = data.length;
data.currentPage = parseFloat(data.start / data.length) + 1;
return data;
}
},
columns: [
{
// data: "id",
render: function (data, type, full) {
return '<input value="' + data + '" type="checkbox">';
}
},
columns: [
{
// data: "id",
render:function (data, type, full) {
return '<input value="'+data+'" type="checkbox">';
}
},
{
data: "id", render: function (data, type, full) {
return '<span class="dropDown dropDown_hover">\
{
data: "id", render: function (data, type, full) {
return '<span class="dropDown dropDown_hover">\
<button class="btn radius size-M">请选择 <i class="Hui-iconfont">&#xe6d5;</i></button>\
<ul class="dropDown-menu menu radius box-shadow"><li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/' + data + '?tab=0\')">查看详细</a></li>\
<li><a href="javascript:;" onclick="layer_show(\'订单详情\', \'/work/detail/' + data + '?tab=2\')">处理记录</a></li>\
<li><a href="#">客户取消</a></li>\
</ul></span>';
}
},
{data: "orderId"},//订单编号
{data: "createUser"},//申请人
{data: "idCard"},//身份证
{data: "phoneNumber"},//手机号
{data: "createTime"},//进件时间
{data: "createTime"},//网点
{data: "createTime"},//产品名称
{data: "createTime"},//申请金额
{data: "createTime"},//审批金额
{data: "createTime"},//客户经理
{data: "createTime"},//流程节点
{data: "createTime"},//流转时间
{data: "createTime"}//处理人
]
});
}
},
{data: "orderId"},//订单编号
{data: "createUser"},//申请人
{data: "idCard"},//身份证
{data: "phoneNumber"},//手机号
{data: "createTime"},//进件时间
{data: "createTime"},//网点
{data: "createTime"},//产品名称
{data: "createTime"},//申请金额
{data: "createTime"},//审批金额
{data: "createTime"},//客户经理
{data: "createTime"},//流程节点
{data: "createTime"},//流转时间
{data: "createTime"}//处理人
]
});
$.fn.dataTableExt.afnFiltering.push(
function (oSettings, aData, iDataIndex) {
var min = document.getElementById('min').value;
var max = document.getElementById('max').value;
var iDateCol = 12;
$.fn.dataTableExt.afnFiltering.push(
function (oSettings, aData, iDataIndex) {
var min = document.getElementById('min').value;
var max = document.getElementById('max').value;
var iDateCol = 12;
var dateMin = new Date(aData[iDateCol]);
var dateMax = new Date(aData[iDateCol]);
var dateMin = new Date(aData[iDateCol]);
var dateMax = new Date(aData[iDateCol]);
if (min === '' && max === '')
return true;
else if (new Date(min).getTime() <= dateMin.getTime() && max === '')
return true;
else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime())
return true;
return false;
}
);
if (min === '' && max === '')
return true;
else if (new Date(min).getTime() <= dateMin.getTime() && max === '')
return true;
else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime())
return true;
return false;
}
);
$('.table_search').on('change', function () {
search = $(this).val();
column = $(this).attr('column');
$('.table_search').on('change', function () {
search = $(this).val();
column = $(this).attr('column');
$('#table').DataTable().column(column).search(search).draw();
});
$('#table').DataTable().column(column).search(search).draw();
});
$('#min, #max').on('keyup', function () {
$('#table').DataTable().draw();
});
$('#min, #max').on('keyup', function () {
$('#table').DataTable().draw();
});
function resetHandler() {
$('#table').DataTable().columns().search("").draw();
}
</script>
function resetHandler() {
$('#table').DataTable().columns().search("").draw();
}
</script>
</body>
<html>
......
......@@ -112,8 +112,12 @@
ret.draw = draw;
}
// ret.draw = parseInt(json.page.currentPage);
ret.recordsTotal = parseInt(json.page.totalNumber);
ret.recordsFiltered = parseInt(json.page.totalNumber);
ret.recordsTotal = 0;
ret.recordsFiltered = 0;
if (json.page) {
ret.recordsTotal = parseInt(json.page.totalNumber);
ret.recordsFiltered = parseInt(json.page.totalNumber);
}
return JSON.stringify(ret);
},
data: function (data) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!