From bc56870059cca013649077af0e53891cba8dbfd1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 04 八月 2024 09:43:41 +0800
Subject: [PATCH] 代理新功能完善
---
src/main/resources/static/admin/order-list.html | 128 +++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 35 deletions(-)
diff --git a/src/main/resources/static/admin/order-list.html b/src/main/resources/static/admin/order-list.html
index de218b3..991c2f2 100644
--- a/src/main/resources/static/admin/order-list.html
+++ b/src/main/resources/static/admin/order-list.html
@@ -8,31 +8,59 @@
<meta name="viewport"
content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<title>璁㈠崟鍒楄〃</title>
- <link rel="stylesheet" type="text/css" href="/admin/layui/css/layui.css" />
- <link rel="stylesheet" type="text/css" href="/admin/css/admin.css" />
+ <link rel="stylesheet" type="text/css" href="./layui/css/layui.css" />
+ <link rel="stylesheet" type="text/css" href="./css/admin.css" />
</head>
<body>
<div class="page-content-wrap">
<form class="layui-form" action="" lay-filter='search'>
<div class="layui-form-item">
+
+ <div class="layui-inline">
+ <select name="keyType" >
+ <option value="0">鎸夎�侀搧ID</option>
+ <option value="1">鎸変唬鐞咺D</option>
+ <option value="2">鎸夎鍗曞彿</option>
+ <option value="3">鎸夋敮浠樿澶嘔D</option>
+ </select>
+ </div>
<div class="layui-inline">
- <input type="text" name="key" id="key" placeholder="鑰侀搧ID/璁㈠崟鍙锋悳绱�" autocomplete="off"
+
+ <input type="text" name="key" id="key" placeholder="鎼滅储" autocomplete="off"
class="layui-input">
</div>
+
<div class="layui-inline">
- <input type="text" name="startDate" placeholder="寮�濮嬫椂闂�" autocomplete="off"
- class="layui-input">
+ <select name="state" >
+ <option value="">鍏ㄩ儴鐘舵��</option>
+ <option value="1">鏈敮浠�</option>
+ <option value="2">鏀粯鎴愬姛</option>
+ <option value="3">鏀粯澶辫触</option>
+ </select>
+ </div>
+
+ <div class="layui-inline">
+ <select name="orderChannel" >
+ <option value="">鍏ㄩ儴璁㈠崟娓犻亾</option>
+ <option value="cyx">瓒呬剑浜�</option>
+ <option value="bps">鐖嗗搧绀�</option>
+ <option value="unknown">鍗￠噾棰�</option>
+ </select>
+ </div>
+
+ <div class="layui-inline">
+ <input type="text" name="startDate" placeholder="寮�濮嬫棩鏈�" autocomplete="off" class="layui-input">
</div>
<div class="layui-inline">
- <input type="text" name="endDate" placeholder="缁撴潫鏃堕棿" autocomplete="off"
- class="layui-input">
+ <input type="text" name="endDate" placeholder="缁撴潫鏃ユ湡" autocomplete="off" class="layui-input">
</div>
<button class="layui-btn layui-btn-normal" lay-submit lay-filter="search" id="search">鎼滅储</button>
- <button class="layui-btn layui-btn-normal layui-btn-xs" lay-submit lay-filter="download" id="download">涓嬭浇</button>
+ <button class="layui-btn layui-btn-normal layui-btn-xs" lay-submit lay-filter="download"
+ id="download">涓嬭浇</button>
</div>
</form>
<div class="layui-form" id="table-list">
@@ -50,25 +78,25 @@
// TODO 璺宠浆鍒拌�侀搧ID
}
- layui.use(['form', 'jquery', 'layer', 'table','laydate'], function() {
+ layui.use(['form', 'jquery', 'layer', 'table', 'laydate'], function() {
var table = layui.table;
var form = layui.form;
var $ = layui.jquery;
- var laydate = layui.laydate;
+ var laydate = layui.laydate;
- laydate.render({
- elem: "input[name=startDate]",
- type: "date",
- value: new Date(),
- isInitValue:false
- });
- laydate.render({
- elem: "input[name=endDate]",
- type: "date",
- value: new Date(),
- isInitValue:false
- });
-
+ laydate.render({
+ elem: "input[name=startDate]",
+ type: "date",
+ value: new Date(),
+ isInitValue: false
+ });
+ laydate.render({
+ elem: "input[name=endDate]",
+ type: "date",
+ value: new Date(),
+ isInitValue: false
+ });
+
let table_option = {
elem: '#table',
url: '/admin/api/order/list', //鏁版嵁鎺ュ彛
@@ -117,6 +145,19 @@
width: 100,
templet: '<div><a href="javascript:void" onclick="editUserClick({{d.uid}})" class="layui-table-link">{{d.uid!=null?d.uid:""}}</a></div>'
},
+
+ {
+ field: 'agent',
+ title: '娓犻亾浠ｇ悊',
+ width: 100,
+ sort: false,
+ },
+ {
+ field: 'orderChannel',
+ title: '璁㈠崟娓犻亾',
+ width: 100,
+ sort: false,
+ },
{
field: 'orderNo',
@@ -131,7 +172,14 @@
width: 100,
sort: false,
templet: function(d) {
- return d.orderType == 1 ? '鎶栭煶' : '鍏跺畠'
+ switch (d.orderType) {
+ case 1:
+ return "鎶栭煶";
+ case 2:
+ return "蹇墜";
+ default:
+ return "鍏跺畠";
+ }
}
},
@@ -141,7 +189,17 @@
title: '鎵ц鐘舵��',
width: 100,
templet: function(d) {
- return d.state == 0 ? "鏈墽琛�" : (d.state == 1 ? "宸叉墽琛�" : "鎵ц閿欒")
+ switch(d.state){
+ case 0:
+ return "鏈垎閰�";
+ case 1:
+ return "鏈墽琛�";
+ case 2:
+ return "鏀粯鎴愬姛"
+ case 3:
+ return "鏀粯澶辫触"
+ }
+ return ""
}
}, {
field: 'stateDesc',
@@ -201,19 +259,19 @@
]
};
-
+
var key = http_util.getQueryString("key");
if (key != null && key != undefined) {
form.val("search", {
"key": key
});
- table_option.data=[];
+ table_option.data = [];
setTimeout(function() {
$("#search").click();
}, 100);
}
-
+
//绗竴涓疄渚�
let tableIns = table.render(table_option);
@@ -228,14 +286,14 @@
return false;
});
- form.on('submit(download)', function(data) {
- var href ="/admin/api/order/downLoadOrder?"
- for(var k in data.field){
- href+=(k+"="+encodeURIComponent(data.field[k])+"&")
+ form.on('submit(download)', function(data) {
+ var href = "/admin/api/order/downLoadOrder?"
+ for (var k in data.field) {
+ href += (k + "=" + encodeURIComponent(data.field[k]) + "&")
}
- window.open(href, '_blank');
- return false;
- });
+ window.open(href, '_blank');
+ return false;
+ });
});
</script>
</body>
--
Gitblit v1.8.0