公司选择页面修改

22fb4b18 · Skyeye云 · 1b594999 · 22fb4b18 · 22fb4b18 · 22fb4b18
5 changed file
--- a/common/src/main/resources/template/js/teamTemplate/teamTemplateAdd.js
+++ b/common/src/main/resources/template/js/teamTemplate/teamTemplateAdd.js
@@ -29,7 +29,7 @@ layui.config({
 				{ field: 'menuNameEn', title: '部门', width: 150 },
 				{ field: 'orderNum', title: '邮箱', width: 150 },
 				{ field: 'desktopName', title: '联系方式', width: 120 },
-				{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
+				{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar' }
 			]],
 			done: function(json) {
 				matchingLanguage();

--- a/organization/src/main/resources/template/js/companyDepartment/companyDepartmentChooseList.js
+++ b/organization/src/main/resources/template/js/companyDepartment/companyDepartmentChooseList.js
@@ -20,20 +20,15 @@ layui.config({

 	initTable();
 	function initTable(){
-		// 初始化值
 		var ids = [];
 		$.each(departmentList, function(i, item) {
 			ids.push(item.id);
 		});
-		tableCheckBoxUtil.setIds({
-			gridId: 'messageTable',
-			fieldName: 'id',
-			ids: ids
-		});
 		tableCheckBoxUtil.init({
 			gridId: 'messageTable',
 			filterId: 'messageTable',
-			fieldName: 'id'
+			fieldName: 'id',
+			ids: ids
 		});

 		table.render({
@@ -52,17 +47,18 @@ layui.config({
 				{ field: 'departmentName', title: '部门名称', width: 300 },
 				{ field: 'id', title: '部门简介', width: 80, align: 'center', templet: function (d) {
 					return '<i class="fa fa-fw fa-html5 cursor" lay-event="departmentDesc"></i>';
-				}},
-				{ field: 'jobNum', title: '职位数', width: 120 },
-				{ field: 'userNum', title: '员工数', width: 120 }
+				}}
 		    ]],
 		    done: function(res, curr, count){
 		    	matchingLanguage();
-	    		//设置选中
 	    		tableCheckBoxUtil.checkedDefault({
 					gridId: 'messageTable',
 					fieldName: 'id'
 				});
+
+				initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称", function () {
+					table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+				});
 		    }
 		});
 		
@@ -85,45 +81,28 @@ layui.config({

 	// 保存
 	$("body").on("click", "#saveCheckBox", function() {
-		var selectedData = tableCheckBoxUtil.getValue({
+		var selectedData = tableCheckBoxUtil.getValueList({
 			gridId: 'messageTable'
 		});
-		if(selectedData.length == 0){
+		if (selectedData.length == 0) {
 			winui.window.msg("请选择部门", {icon: 2, time: 2000});
 			return false;
 		}
-		AjaxPostUtil.request({url: reqBasePath + "companydepartment009", params: {ids: selectedData.toString()}, type: 'json', callback: function (json) {
-			parent.departmentList = [].concat(json.rows);
-			parent.layer.close(index);
-			parent.refreshCode = '0';
-   		}});
+		parent.departmentList = [].concat(selectedData);
+		parent.layer.close(index);
+		parent.refreshCode = '0';
 	});

-    form.render();
-    form.on('submit(formSearch)', function (data) {
-        if (winui.verifyForm(data.elem)) {
-            refreshTable();
-        }
-        return false;
-    });
-	
 	$("body").on("click", "#reloadTable", function() {
-    	loadTable();
-    });
-    
-    function loadTable() {
-    	table.reloadData("messageTable", {where: getTableParams()});
-    }
-    
-    function refreshTable(){
-    	table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
-    }
+		loadTable();
+	});
+
+	function loadTable() {
+		table.reloadData("messageTable", {where: getTableParams()});
+	}

 	function getTableParams() {
-		return {
-			companyName: $("companyName").val(),
-			departmentName: $("departmentName").val()
-		};
+		return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
 	}
 	
    exports('companyDepartmentChooseList', {});

--- a/organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentChooseList.html
+++ b/organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentChooseList.html
@@ -7,34 +7,10 @@
    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
 </head>
 <body>
-	<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-		<div class="winui-tip alert-info" id="showInfo">
-
-		</div>
-		<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 id="companyName" name="companyName" class="layui-input" placeholder="请输入公司名称"/>
-					</div>
-					<label class="layui-form-label">部门名称</label>
-					<div class="layui-input-inline">
-						<input id="departmentName" name="departmentName" class="layui-input" placeholder="请输入部门名称"/>
-					</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 class="layui-btn layui-btn-sm layui-btn-normal" type="button" id="saveCheckBox" style="float: right;">
-				<i class="fa fa-save" aria-hidden="true" style="margin-right: 5px"></i>
-				<language showName="com.skyeye.save"></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 class="layui-btn layui-btn-sm layui-btn-normal search-table-btn-right" type="button" id="saveCheckBox" style="float: right;"><i class="fa fa-save" aria-hidden="true" style="margin-right: 5px"></i><language showName="com.skyeye.save"></language></button>
 		</div>
 	</div>
 	<div style="margin:auto 10px;">

--- a/userauth/src/main/resources/template/js/sysEveUserStaffCapital/sysEveUserStaffCapitalWaitPayMonthList.js
+++ b/userauth/src/main/resources/template/js/sysEveUserStaffCapital/sysEveUserStaffCapitalWaitPayMonthList.js
@@ -66,7 +66,6 @@ layui.config({
    
    function getTableParams() {
    	return {
-			companyName: $("#companyName").val(),
 			departmentName: $("#departmentName").val(),
 			monthTime: $("#monthTime").val()
    	};

--- a/userauth/src/main/resources/template/tpl/sysEveUserStaffCapital/sysEveUserStaffCapitalWaitPayMonthList.html
+++ b/userauth/src/main/resources/template/tpl/sysEveUserStaffCapital/sysEveUserStaffCapitalWaitPayMonthList.html
@@ -11,10 +11,6 @@
 	    <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="companyName" name="companyName" placeholder="请输入公司名称" class="layui-input" />
-	                </div>
 	                <label class="layui-form-label">部门名称</label>
 	                <div class="layui-input-inline">
 	                    <input type="text" id="departmentName" name="departmentName" placeholder="请输入部门名称" class="layui-input" />