From 2f9c270e09e4191885822e7a7b3970cc614c3d15 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 16 九月 2022 13:36:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/common/web/BaseController.java | 3 +++
src/main/webapp/static/js/cstmr/cstmr.js | 2 +-
src/main/webapp/views/cstmr/cstmr.html | 12 +-----------
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/crm/common/web/BaseController.java b/src/main/java/com/zy/crm/common/web/BaseController.java
index c8fdd34..ca4ec88 100644
--- a/src/main/java/com/zy/crm/common/web/BaseController.java
+++ b/src/main/java/com/zy/crm/common/web/BaseController.java
@@ -187,6 +187,9 @@
}
String column = null;
if (field.isAnnotationPresent(TableField.class)) {
+ if (!field.getAnnotation(TableField.class).exist()) {
+ continue;
+ }
column = field.getAnnotation(TableField.class).value();
}
if (Cools.isEmpty(column)) {
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index 70fd30e..1ad10e7 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -46,7 +46,6 @@
onlyIconControl: true,
data: res.data,
click: function (obj) {
- console.log(obj)
selObj = obj;
$('#organizationTree').find('.ew-tree-click').removeClass('ew-tree-click');
$(obj.elem).children('.layui-tree-entry').addClass('ew-tree-click');
@@ -263,6 +262,7 @@
// 鎼滅储
form.on('submit(search)', function (data) {
pageCurr = 1;
+ pageCount = 0;
tableReload();
});
diff --git a/src/main/webapp/views/cstmr/cstmr.html b/src/main/webapp/views/cstmr/cstmr.html
index 9f63974..2f21c62 100644
--- a/src/main/webapp/views/cstmr/cstmr.html
+++ b/src/main/webapp/views/cstmr/cstmr.html
@@ -21,10 +21,6 @@
vertical-align: middle;
margin-right: 5px;
}
- .dropdown-menu-nav {
- width: 280px;
- padding: 0 10px 10px 10px;
- }
.layui-border-box,.layui-border-box * {
box-sizing:inherit
@@ -44,19 +40,13 @@
<div class="layui-fluid">
<div class="layui-card" style="margin-bottom: 5px">
<div class="layui-card-body">
- <div class="layui-form toolbar" style="display: flex;justify-content: flex-end;position: relative">
+ <div id="search-box" class="layui-form toolbar" style="display: flex;justify-content: flex-end;position: relative">
<div class="nav-box">
<div class="nav-box-item">
<i class="layui-icon" style="color: #1890ff;font-weight: bold"></i>
</div>
<div class="nav-box-item">
<button id="slrassa" style="border: none" class="layui-btn layui-btn-primary icon-btn">闄嗘檽娑�<i class="layui-icon layui-icon-drop"></i></button>
-<!-- <div class="dropdown-menu">-->
-<!-- <button style="border: none" class="layui-btn layui-btn-primary icon-btn">闄嗘檽娑�<i class="layui-icon layui-icon-drop"></i></button>-->
-<!-- <div class="dropdown-menu-nav">-->
-<!-- <div class="layui-form toolbar" id="organizationTree" style="height: calc(100vh - 525px);border: none"></div>-->
-<!-- </div>-->
-<!-- </div>-->
</div>
</div>
<div class="layui-form-item">
--
Gitblit v1.9.1