mkm/nk-lihaink-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'lxq' of git.excellentkk.cn:mkm/nk-lihaink-cn into lxq

Browse Source
This commit is contained in:
liuxiaoquan 2023-03-10 09:22:45 +08:00
commit 3a9708470a
1 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
app/admin/view/merchant/system/merchant/margin/list.html
View File

@ -9,20 +9,20 @@
<!-- 时间选择 --> <!-- 时间选择 -->
<div class="layui-form"> <div class="layui-form">
<form class="layui-form" action=""> <form id="filterform" class="layui-form" action="">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">选择时间</label> <label class="layui-form-label">选择时间</label>
<div class="layui-input-block"> <div class="layui-input-block">
<div class="layui-btn-group" id="witch_date"> <div class="layui-btn-group" id="witch_date">
<button type="button" class="layui-btn layui-btn-normal">全部</button> <button name="both" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal">全部</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-primary">今天</button> <button name="today" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">今天</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-primary">昨天</button> <button name="yeserday" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">昨天</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近7天</button> <button lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近7天</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近30天</button> <button lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近30天</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-primary">本月</button> <button lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">本月</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-primary">本年</button> <button lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">本年</button>
</div> </div>
</div> </div>
</div> </div>
@ -31,12 +31,12 @@
<!-- <label class="layui-form-label">日期范围</label> --> <!-- <label class="layui-form-label">日期范围</label> -->
<div class="layui-inline" id="test6"> <div class="layui-inline" id="test6">
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" autocomplete="off" id="test-startDate-1" class="layui-input" <input type="text" autocomplete="off" name="start_date" id="test-startDate-1" class="layui-input"
placeholder="开始日期"> placeholder="开始日期">
</div> </div>
<div class="layui-form-mid">-</div> <div class="layui-form-mid">-</div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" autocomplete="off" id="test-endDate-1" class="layui-input" <input type="text" autocomplete="off" name="end_date" id="test-endDate-1" class="layui-input"
placeholder="结束日期"> placeholder="结束日期">
</div> </div>
</div> </div>
@ -398,13 +398,25 @@
return false; return false;
}); });
// 获取表单所有参数
function getformdata() {
var form = $('#filterform').serializeArray();
var data = new Array();
for(let i=0;i<form.length; i++){
data[form[i].name] = form[i].value;
}
return data;
}
//监听搜索提交 //监听搜索提交
form.on('submit(searchform)', function(data) { form.on('submit(searchform)', function(data) {
console.log(data.field); console.log(data.elem.name, data.field)
layui.pageTable.reload({ layui.pageTable.reload({
where: { where: {
keywords: data.field.keywords date:data.elem.name,
...data.field
}, },
page: { page: {
curr: 1 curr: 1
@ -413,11 +425,12 @@
// layui.form.render(); // layui.form.render();
return false; return false;
}); });
form.on('select(searchform)', function(data) {
console.log(data.elem.name); form.on('select(searchform)', function(e) {
let data = getformdata();
layui.pageTable.reload({ layui.pageTable.reload({
where: { where: {
// keywords: data.field.category ...data
}, },
page: { page: {
curr: 1 curr: 1
@ -438,23 +451,16 @@
//数组格式为 2.6.6 开始新增，之前版本直接配置 true 或任意分割字符即可 //数组格式为 2.6.6 开始新增，之前版本直接配置 true 或任意分割字符即可
, range: ['#test-startDate-1', '#test-endDate-1'] , range: ['#test-startDate-1', '#test-endDate-1']
,done: function(value, date, endDate){ ,done: function(value, date, endDate){
if (value) { let data = getformdata()
// 时间选择 data.date = ''
console.log(value); //得到日期生成的值，如：2017-08-18 layui.pageTable.reload({
console.log(date); //得到日期时间对象：{year: 2017, month: 8, date: 18, hours: 0, minutes: 0, seconds: 0} where: {
console.log(endDate); //得结束的日期时间对象，开启范围选择（range: true）才会返回。对象成员同上。 ...data
},
layui.pageTable.reload({ page: {
where: { curr: 1
keywords: data.field.keywords }
}, });
page: {
curr: 1
}
});
} else {
// 重置
}
} }
}); });
@ -468,6 +474,7 @@
if ('11'==this.getAttribute('lay-id')) { if ('11'==this.getAttribute('lay-id')) {
marign.style.display = "block"; marign.style.display = "block";
refund.style.display = "none"; refund.style.display = "none";
// refund.childNodes().value='';
}else{ }else{
refund.style.display = "block"; refund.style.display = "block";
marign.style.display = "none"; marign.style.display = "none";
@ -489,9 +496,6 @@
} }
function get_params() {
}
</script> </script>
{/block} {/block}
<!-- /脚本 --> <!-- /脚本 -->