From 694472ad09def4e19072e37ce0463c2b9c4a2120 Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Thu, 8 Jul 2021 11:14:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/route/bossleader/list.html         | 12 +++----
 .../static/route/communityboss/list.html      | 10 +++---
 .../route/communityboss/list_level2.html      | 31 ++++++++--------
 .../route/communityboss/list_level3.html      | 30 ++++++++--------
 .../route/communityboss/list_level4.html      | 35 ++++++++++---------
 5 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/src/main/resources/static/route/bossleader/list.html b/src/main/resources/static/route/bossleader/list.html
index ff25d12..a0af89e 100755
--- a/src/main/resources/static/route/bossleader/list.html
+++ b/src/main/resources/static/route/bossleader/list.html
@@ -18,14 +18,14 @@
                 <div class="layui-card-body">
                     <div class="test-table-reload-btn" style="margin-bottom: 10px;">
                         <div class="layui-inline">
-                            <input type="text" id="keywords" class="layui-input search-item" placeholder="关键字">
+                            <input type="text" id="keywords" class="layui-input search-item" autocomplete="off" placeholder="姓名|用户账号">
                         </div>
-                        <div class="layui-inline">
+                        <!--<div class="layui-inline">
                             <input type="text" id="startTime" class="layui-input search-item" placeholder="开始时间" readonly>
                         </div>
                         <div class="layui-inline">
                             <input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
-                        </div>
+                        </div>-->
                         <button type="button" id="search" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-search"></i> 搜索
                         </button>
@@ -175,7 +175,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'bossLeaderUsername', width: 150, title: '用户名', align:'center',
+                    {field: 'bossLeaderUsername', width: 200, title: '用户账号', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -184,7 +184,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'bossLeaderPhone', width: 150, title: '电话', align:'center',
+                    {field: 'bossLeaderPhone', width: 200, title: '联系方式', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -193,7 +193,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'communityBossNames', width: 150, title: '一级网格长', align:'center',
+                    {field: 'communityBossNames', width: 250, title: '一级网格长', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
diff --git a/src/main/resources/static/route/communityboss/list.html b/src/main/resources/static/route/communityboss/list.html
index a25c7b7..31ce31b 100755
--- a/src/main/resources/static/route/communityboss/list.html
+++ b/src/main/resources/static/route/communityboss/list.html
@@ -18,12 +18,12 @@
                 <div class="layui-card-body">
                     <div class="test-table-reload-btn" style="margin-bottom: 10px;">
                         <div class="layui-inline">
-                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="关键字">
+                            <input type="text" id="keywords" class="layui-input search-item search-item-width-110" autocomplete="off" placeholder="姓名|用户账号">
                         </div>
                         <div class="layui-inline layui-form search-item search-item-width-100" id="areaSelectTemplateBox"></div>
                         <script id="areaSelectTemplate" type="text/html">
                             <select id="areaId" name="areaId">
-                                <option value="">两镇一办</option>
+                                <option value="">选择街镇</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
                                 <option value="{{item.dictId}}">{{item.dictName}}</option>
                                 {{# } }}
@@ -203,7 +203,7 @@
                 cols: [[
                     {type:'checkbox', fixed: 'left'},
                     {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
-                    {field: 'areaName', width: 200, title: '地区名称', align:'center',
+                    {field: 'communityBossName', width: 180, title: '姓名', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -212,7 +212,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'communityBossUsername', width: 150, title: '用户名', align:'center',
+                    {field: 'communityBossUsername', width: 180, title: '用户账号', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -221,7 +221,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'communityBossName', width: 100, title: '姓名', align:'center',
+                    {field: 'areaName', width: 200, title: '街镇名称', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
diff --git a/src/main/resources/static/route/communityboss/list_level2.html b/src/main/resources/static/route/communityboss/list_level2.html
index cecb474..b28960a 100755
--- a/src/main/resources/static/route/communityboss/list_level2.html
+++ b/src/main/resources/static/route/communityboss/list_level2.html
@@ -18,12 +18,13 @@
                 <div class="layui-card-body">
                     <div class="test-table-reload-btn" style="margin-bottom: 10px;">
                         <div class="layui-inline">
-                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="关键字">
+                            <input type="text" id="keywords" class="layui-input search-item search-item-width-110"
+                                   autocomplete="off" placeholder="姓名|用户账号">
                         </div>
                         <div class="layui-inline layui-form search-item search-item-width-100" id="areaSelectTemplateBox"></div>
                         <script id="areaSelectTemplate" type="text/html">
                             <select id="areaId" name="areaId">
-                                <option value="">两镇一办</option>
+                                <option value="">选择街镇</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
                                 <option value="{{item.dictId}}">{{item.dictName}}</option>
                                 {{# } }}
@@ -199,7 +200,7 @@
                 cols: [[
                     {type:'checkbox', fixed: 'left'},
                     {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
-                    {field: 'areaName', width: 200, title: '地区名称', align:'center',
+                    {field: 'communityBossName', width: 180, title: '姓名', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -208,7 +209,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'communityBossParentName', width: 150, title: '上级网格长', align:'center',
+                    {field: 'communityBossUsername', width: 150, title: '用户账号', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -217,16 +218,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'communityBossUsername', width: 150, title: '用户名', align:'center',
-                        templet: function(row) {
-                            var rowData = row[this.field];
-                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                return '-';
-                            }
-                            return rowData;
-                        }
-                    },
-                    {field: 'communityBossName', width: 150, title: '姓名', align:'center',
+                    {field: 'areaName', width: 180, title: '街镇名称', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -245,7 +237,16 @@
                             return rowData;
                         }
                     },
-                    {field: 'gridSummary', width: 200, title: '网格描述', align:'center',
+                    {field: 'gridSummary', width: 240, title: '网格描述', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'communityBossParentName', width: 160, title: '上级网格长', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
diff --git a/src/main/resources/static/route/communityboss/list_level3.html b/src/main/resources/static/route/communityboss/list_level3.html
index 8a714f9..9bdd390 100755
--- a/src/main/resources/static/route/communityboss/list_level3.html
+++ b/src/main/resources/static/route/communityboss/list_level3.html
@@ -18,12 +18,13 @@
                 <div class="layui-card-body">
                     <div class="test-table-reload-btn" style="margin-bottom: 10px;">
                         <div class="layui-inline">
-                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="关键字">
+                            <input type="text" id="keywords" class="layui-input search-item search-item-width-110"
+                                   autocomplete="off" placeholder="姓名|用户账号">
                         </div>
                         <div class="layui-inline layui-form search-item search-item-width-100" id="areaSelectTemplateBox"></div>
                         <script id="areaSelectTemplate" type="text/html">
                             <select id="areaId" name="areaId">
-                                <option value="">两镇一办</option>
+                                <option value="">选择街镇</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
                                 <option value="{{item.dictId}}">{{item.dictName}}</option>
                                 {{# } }}
@@ -202,7 +203,7 @@
                 cols: [[
                     {type:'checkbox', fixed: 'left'},
                     {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
-                    {field: 'areaName', width: 200, title: '地区名称', align:'center',
+                    {field: 'communityBossName', width: 180, title: '姓名', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -211,7 +212,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'communityBossParentName', width: 150, title: '上级网格长', align:'center',
+                    {field: 'communityBossUsername', width: 150, title: '用户账号', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -220,16 +221,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'communityBossUsername', width: 150, title: '用户名', align:'center',
-                        templet: function(row) {
-                            var rowData = row[this.field];
-                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                return '-';
-                            }
-                            return rowData;
-                        }
-                    },
-                    {field: 'communityBossName', width: 150, title: '姓名', align:'center',
+                    {field: 'areaName', width: 180, title: '街镇名称', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -267,7 +259,15 @@
                             return rowData;
                         }
                     },
-
+                    {field: 'communityBossParentName', width: 150, title: '上级网格长', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
                 ]],
                 page: true,
                 parseData: function(data) {
diff --git a/src/main/resources/static/route/communityboss/list_level4.html b/src/main/resources/static/route/communityboss/list_level4.html
index 684942b..f04001f 100644
--- a/src/main/resources/static/route/communityboss/list_level4.html
+++ b/src/main/resources/static/route/communityboss/list_level4.html
@@ -18,12 +18,13 @@
                 <div class="layui-card-body">
                     <div class="test-table-reload-btn" style="margin-bottom: 10px;">
                         <div class="layui-inline">
-                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="关键字">
+                            <input type="text" id="keywords" class="layui-input search-item search-item-width-110"
+                                   autocomplete="off" placeholder="姓名|用户账号">
                         </div>
                         <div class="layui-inline layui-form search-item search-item-width-100" id="areaSelectTemplateBox"></div>
                         <script id="areaSelectTemplate" type="text/html">
                             <select id="areaId" name="areaId">
-                                <option value="">两镇一办</option>
+                                <option value="">选择街镇</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
                                 <option value="{{item.dictId}}">{{item.dictName}}</option>
                                 {{# } }}
@@ -225,7 +226,7 @@
                 cols: [[
                     {type:'checkbox', fixed: 'left'},
                     {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
-                    {field: 'areaName', width: 200, title: '地区名称', align:'center',
+                    {field: 'communityBossName', width: 160, title: '姓名', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -234,7 +235,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'communityBossParentName', width: 150, title: '上级网格长', align:'center',
+                    {field: 'communityBossUsername', width: 150, title: '用户账号', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -243,7 +244,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'communityBossUsername', width: 150, title: '用户名', align:'center',
+                    {field: 'areaName', width: 160, title: '街镇名称', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -252,16 +253,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'communityBossName', width: 150, title: '姓名', align:'center',
-                        templet: function(row) {
-                            var rowData = row[this.field];
-                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                return '-';
-                            }
-                            return rowData;
-                        }
-                    },
-                    {field: 'communities', width: 200, title: '社区', align:'center',
+                    {field: 'communities', width: 160, title: '社区', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -271,7 +263,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'districts', width: 200, title: '小区', align:'center',
+                    {field: 'districts', width: 160, title: '小区', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -281,7 +273,7 @@
                             return rowData;
                         }
                     },
-                    {field: 'buildings', width: 200, title: '楼宇', align:'center',
+                    {field: 'buildings', width: 160, title: '楼宇', align:'center',
                         templet: function(row) {
                             var rowData = row[this.field];
                             if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -300,6 +292,15 @@
                             return rowData;
                         }
                     },
+                    {field: 'communityBossParentName', width: 130, title: '上级网格长', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
                 ]],
                 page: true,
                 parseData: function(data) {