From 734dfe9eb0a2176103dce8245c69b1194574c68e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 七月 2024 20:16:15 +0800
Subject: [PATCH] 代理新功能完善
---
src/main/resources/static/admin/agent-settle-list.html | 146 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 102 insertions(+), 44 deletions(-)
diff --git a/src/main/resources/static/admin/agent-settle-list.html b/src/main/resources/static/admin/agent-settle-list.html
index 4c20fcf..474eee5 100644
--- a/src/main/resources/static/admin/agent-settle-list.html
+++ b/src/main/resources/static/admin/agent-settle-list.html
@@ -5,7 +5,8 @@
<meta charset="UTF-8">
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+ <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="layui/css/layui.css" />
<link rel="stylesheet" type="text/css" href="css/admin.css" />
@@ -22,13 +23,24 @@
<div class="layui-form-item">
<div class="layui-inline">
- <input type="text" name="key" id="key" placeholder="鎸夋笭閬揑D/鍚嶇О鎼滅储" autocomplete="off" class="layui-input">
+ <input type="text" name="key" id="key" placeholder="鎸夋笭閬揑D鎼滅储" autocomplete="off"
+ class="layui-input">
</div>
<div class="layui-inline">
<input type="text" name="day" placeholder="鏃ユ湡" autocomplete="off" class="layui-input">
</div>
- <button class="layui-btn layui-btn-normal" lay-submit lay-filter="search" id="search"><i class="layui-icon layui-icon-search"></i>鎼滅储</button>
- <a href="javascript:void();" class="layui-btn layui-btn-warm" onclick="add_agent()"><i class="layui-icon layui-icon-add-circle"></i> 寮�濮嬮缁撶畻</a>
+ <button class="layui-btn layui-btn-normal" lay-submit lay-filter="search" id="search"><i
+ class="layui-icon layui-icon-search"></i>鎼滅储</button>
+ <a href="javascript:void();" class="layui-btn layui-btn-warm" onclick="start_settle()"><i
+ class="layui-icon layui-icon-add-circle"></i> 寮�濮嬮缁撶畻</a>
+
+ <a href="javascript:void();" class="layui-btn layui-btn-warm" onclick="download_settle_table()"><i
+ class="layui-icon layui-icon-add-circle"></i> 涓嬭浇缁撶畻琛ㄦ牸</a>
+
+
+ <a href="javascript:void();" type="button" class="layui-btn" id="test1">
+ <i class="layui-icon"></i>涓婁紶缁撶畻纭鍗�
+ </a>
</div>
</form>
<div class="layui-form" id="table-list">
@@ -42,7 +54,7 @@
<script src="js/jquery.min.js" type="text/javascript" charset="utf-8"></script>
<script src="js/http_api.js"></script>
<!-- <script src="js/common.js" type="text/javascript" charset="utf-8"></script> -->
- <script>
+ <script>
function delete_agent(id) {
layer.confirm('鎮ㄧ‘瀹氳鎵ц姝ゆ搷浣滃悧锛�', {
icon: 3,
@@ -65,38 +77,66 @@
});
}.bind(this));
}
-
- function add_agent(){
-
- if($("input[name=day]").val().length<1){
- layer.msg("璇烽�夋嫨鏃ユ湡");
- return false;
+
+ function start_settle() {
+ if ($("input[name=day]").val().length < 1) {
+ layer.msg("璇烽�夋嫨鏃ユ湡");
+ return false;
+ }
+ $.post("/admin/api/agentsettle/startSettle", {
+ day: $("input[name=day]").val()
+ }, function(response) {
+ if (response.code == 0) {
+ layer.msg("棰勭粨绠楁垚鍔�");
+ } else {
+ layer.msg(response.msg);
}
-
- $.post("/admin/api/agentsettle/startSettle",$("input[name=day]").val(), function(response) {
- if (response.code == 0) {
- layer.msg("棰勭粨绠楁垚鍔�");
- } else {
- layer.msg(response.msg);
- }
- }, 'json').fail(function(jqXHR, textStatus, errorThrown) {
- layer.msg("缃戠粶璇锋眰澶辫触");
- });
+ }, 'json').fail(function(jqXHR, textStatus, errorThrown) {
+ layer.msg("缃戠粶璇锋眰澶辫触");
+ });
}
-
- layui.use(['form', 'jquery', 'layer', 'table', 'laydate'], function() {
+
+ function download_settle_table() {
+ if ($("input[name=day]").val().length < 1) {
+ layer.msg("璇烽�夋嫨鏃ユ湡");
+ return false;
+ }
+ var href = "/admin/api/agentsettle/downloadSettleTable?day=" + $("input[name=day]").val();
+ window.open(href, '_blank');
+ }
+
+ layui.use(['form', 'jquery', 'layer', 'table', 'laydate', 'upload'], function() {
var table = layui.table;
var form = layui.form;
var $ = layui.jquery;
+ var upload = layui.upload;
var laydate = layui.laydate;
-
- laydate.render({
- elem: "input[name=day]",
- type: "date",
- value: new Date(),
- isInitValue:false
- });
-
+
+ laydate.render({
+ elem: "input[name=day]",
+ type: "date",
+ value: new Date(),
+ isInitValue: false
+ });
+
+ //鎵ц瀹炰緥
+ var uploadInst = upload.render({
+ elem: '#test1' //缁戝畾鍏冪礌
+ ,
+ accept: 'file',
+ url: '/admin/api/agentsettle/uploadSettleExcel' //涓婁紶鎺ュ彛
+ ,
+ done: function(res) {
+ //涓婁紶瀹屾瘯鍥炶皟
+ layer.msg("缁撶畻瀹屾垚")
+ },
+ error: function() {
+ //璇锋眰寮傚父鍥炶皟
+ layer.msg("缁撶畻寮傚父")
+ }
+ });
+
+
let table_option = {
elem: '#table',
url: '/admin/api/agentsettle/list', //鏁版嵁鎺ュ彛
@@ -139,15 +179,15 @@
title: 'ID',
width: 100,
fixed: 'left'
- },{
+ }, {
field: 'agentId',
title: '娓犻亾',
width: 100,
sort: false,
templet: function(d) {
- return d["agent.name"]+"("+d["agent.id"]+")";
+ return d["agent.name"] + "<br>" + d["agent.id"];
}
- }, {
+ }, {
field: 'settleDay',
title: '鏃ユ湡',
width: 120
@@ -156,6 +196,9 @@
title: '棰勭粨绠楅噾棰�',
width: 100,
sort: false,
+ templet: function(d) {
+ return "楼" + d.settleMoney;
+ }
}, {
field: 'createTime',
title: '棰勭粨绠楁椂闂�',
@@ -163,25 +206,40 @@
}, {
field: 'actualSettleMoney',
title: '瀹為檯缁撶畻閲戦',
- width: 100,
- sort: false
+ width: 150,
+ sort: false,
+ templet: function(d) {
+ if (d.actualSettleMoney != undefined && d.actualSettleMoney.length > 0) {
+ return "楼" + d.actualSettleMoney;
+ } else {
+ return "";
+ }
+ }
}, {
field: 'settleTime',
title: '瀹為檯缁撶畻鏃堕棿',
- width: 100,
+ width: 180,
sort: false
}, {
- field: 'statusDesc',
+ field: '',
title: '鐘舵��',
- width: 100,
- sort: false
- }, {
+ width: 150,
+ templet: function(d) {
+ if (d.status == 0) {
+ return "缁撶畻寰呯‘璁�";
+ } else {
+ return "缁撶畻宸茬‘璁�";
+ }
+ }
+ }, {
field: '',
title: '鎿嶄綔',
+ width: 100,
sort: false,
templet: function(d) {
var html = "";
- html += "<div><a href='javascript:void' onclick='delete_agent(" + d.id + ")' class='layui-table-link'>鍒犻櫎</a></div>";
+ html += "<div><a href='javascript:void' onclick='delete_agent(" + d.id +
+ ")' class='layui-table-link'>鍒犻櫎</a></div>";
return html;
}
}
@@ -210,9 +268,9 @@
});
return false;
});
-
+
});
</script>
</body>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.8.0