数据字典列表整改

common/src/main/resources/template/js/sysDictData/sysDictDataList.js

@@ -11,13 +11,6 @@ layui.config({
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table;
-	var selOption = getFileContent('tpl/template/select-option.tpl');
-
-	// 加载数据字典分类
-	sysDictDataUtil.queryDictTypeListByStatus(0, function (json) {
-		$("#dictTypeId").html(getDataUseHandlebars(selOption, json));
-		form.render('select');
-	});
 
 	authBtn('1656776769966');
 
@@ -33,7 +26,7 @@ layui.config({
 		limit: getLimit(),
 		cols: [[
 			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-			{ field: 'dictName', title: '标题', width: 200 },
+			{ field: 'dictName', title: '名称', width: 200 },
 			{ field: 'dictTypeName', title: '所属分类', width: 200 },
 			{ field: 'dictSort', title: '排序', width: 60 },
 			{ field: 'isDefault', title: '默认值', align: 'center', width: 80, templet: function (d) {
@@ -55,10 +48,13 @@ layui.config({
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
 			{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
 			{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
-			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 180, toolbar: '#tableBar'}
+			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 180, toolbar: '#tableBar' }
 		]],
 		done: function(json) {
 			matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
 		}
 	});
 
@@ -111,14 +107,6 @@ layui.config({
 	});
 
 	form.render();
-	form.on('submit(formSearch)', function (data) {
-		if (winui.verifyForm(data.elem)) {
-			table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
-		}
-		return false;
-	});
-
-	// 刷新数据
 	$("body").on("click", "#reloadTable", function() {
 		loadTable();
 	});
@@ -128,10 +116,7 @@ layui.config({
 	}
 
 	function getTableParams() {
-		return {
-			dictName: $("#dictName").val(),
-			dictTypeId: $("#dictTypeId").val(),
-		};
+		return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
 	}
 
 	exports('sysDictDataList', {});

common/src/main/resources/template/js/sysDictType/sysDictTypeList.js

@@ -26,7 +26,7 @@ layui.config({
 		limit: getLimit(),
 		cols: [[
 			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-			{ field: 'dictName', title: '标题', width: 200 },
+			{ field: 'dictName', title: '名称', width: 200 },
 			{ field: 'dictCode', title: 'Code', width: 300 },
 			{ field: 'dictType', title: '字典类型', align: 'center', width: 100, templet: function (d) {
 				if (d.dictType == 1) {
@@ -47,10 +47,13 @@ layui.config({
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
 			{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
 			{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
-			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 180, toolbar: '#tableBar'}
+			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 180, toolbar: '#tableBar' }
 		]],
 		done: function(json) {
 			matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称，Code", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
 		}
 	});
 
@@ -103,14 +106,6 @@ layui.config({
 	});
 
 	form.render();
-	form.on('submit(formSearch)', function (data) {
-		if (winui.verifyForm(data.elem)) {
-			table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
-		}
-		return false;
-	});
-
-	// 刷新数据
 	$("body").on("click", "#reloadTable", function() {
 		loadTable();
 	});
@@ -120,10 +115,7 @@ layui.config({
 	}
 
 	function getTableParams() {
-		return {
-			dictName: $("#dictName").val(),
-			dictCode: $("#dictCode").val(),
-		};
+		return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
 	}
 
 	exports('sysDictTypeList', {});

common/src/main/resources/template/tpl/sysDictData/sysDictDataList.html

@@ -7,30 +7,10 @@
     <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
 </head>
 <body>
-	<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-	    <form class="layui-form layui-form-pane" action="" autocomplete="off">
-	        <div class="layui-form-item">
-	            <div class="layui-inline">
-	                <label class="layui-form-label">名称</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="dictName" name="dictName" placeholder="请输入名称" class="layui-input" />
-	                </div>
-					<label class="layui-form-label">所属分类</label>
-					<div class="layui-input-inline">
-						<select lay-filter="dictTypeId" lay-search="" id="dictTypeId">
-
-						</select>
-					</div>
-					<button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-					<button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-	            </div>
-	        </div>
-	    </form>
-	</div>
     <div class="winui-toolbar">
         <div class="winui-tool">
-            <button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
-			<button id="addBean" class="winui-toolbtn" auth="1656776769966"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+			<button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1656776769966"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
         </div>
     </div>
     <div style="margin:auto 10px;">
@@ -44,6 +24,7 @@
 			{{# } }}
 		</script>
 	</div>
+
     <script src="../../assets/lib/layui/layui.js"></script>
     <script src="../../assets/lib/layui/custom.js"></script>
     <script type="text/javascript">

common/src/main/resources/template/tpl/sysDictType/sysDictTypeList.html

@@ -7,28 +7,10 @@
     <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
 </head>
 <body>
-	<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-	    <form class="layui-form layui-form-pane" action="" autocomplete="off">
-	        <div class="layui-form-item">
-	            <div class="layui-inline">
-	                <label class="layui-form-label">名称</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="dictName" name="dictName" placeholder="请输入名称" class="layui-input" />
-	                </div>
-					<label class="layui-form-label">Code</label>
-					<div class="layui-input-inline">
-						<input type="text" id="dictCode" name="dictCode" placeholder="请输入Code" class="layui-input" />
-					</div>
-					<button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-					<button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-	            </div>
-	        </div>
-	    </form>
-	</div>
     <div class="winui-toolbar">
         <div class="winui-tool">
-            <button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
-			<button id="addBean" class="winui-toolbtn" auth="1656731571539"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+			<button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1656731571539"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
         </div>
     </div>
     <div style="margin:auto 10px;">
@@ -42,6 +24,7 @@
 			{{# } }}
 		</script>
 	</div>
+
     <script src="../../assets/lib/layui/layui.js"></script>
     <script src="../../assets/lib/layui/custom.js"></script>
     <script type="text/javascript">