查询员工姓名的方式修改

seal-service/src/main/resources/template/js/sealseservice/sealseservicelist.js

@@ -18,7 +18,7 @@ layui.config({
 	    elem: '#messageTable',
 	    method: 'post',
 	    url: flowableBasePath + 'sealseservice001',
-	    where: {orderNum: $("#orderNum").val(), state: $("#state").val(), contacts: $("#contacts").val(), receiver: $("#receiver").val()},
+	    where: getTableParams(),
 	    even: true,
 	    page: true,
 		limits: getLimits(),
@@ -69,25 +69,7 @@ layui.config({
         }
     });
 	
-	form.render();
-	
-	$("body").on("click", "#formSearch", function() {
-		refreshTable();
-	});
-	
-	$("body").on("click", "#reloadTable", function() {
-    	loadTable();
-    });
-    
-    function loadTable() {
-    	table.reloadData("messageTable", {where: {orderNum: $("#orderNum").val(), state: $("#state").val(), contacts: $("#contacts").val(), receiver: $("#receiver").val()}});
-    }
-    
-    function refreshTable(){
-    	table.reloadData("messageTable", {page: {curr: 1}, where: {orderNum: $("#orderNum").val(), state: $("#state").val(), contacts: $("#contacts").val(), receiver: $("#receiver").val()}});
-    }
-
-	//编辑
+	// 编辑
 	function edit(data) {
 		rowId = data.id;
 		_openNewWindows({
@@ -141,7 +123,7 @@ layui.config({
 			}});
 	}
 	
-	//签到
+	// 签到
 	function signIn(data) {
 		rowId = data.id;
 		_openNewWindows({
@@ -155,7 +137,7 @@ layui.config({
 			}});
 	}
 	
-	//完工
+	// 完工
 	function finishedPro(data) {
 		rowId = data.id;
 		_openNewWindows({
@@ -169,7 +151,7 @@ layui.config({
 			}});
 	}
 	
-	//评价
+	// 评价
 	function evaluate(data) {
 		rowId = data.id;
 		_openNewWindows({
@@ -183,7 +165,7 @@ layui.config({
 			}});
 	}
 	
-	//审核
+	// 审核
 	function examine(data) {
 		layer.confirm('确认审核该数据吗？', {icon: 3, title: '审核操作'}, function (index) {
 			layer.close(index);
@@ -194,7 +176,7 @@ layui.config({
 		});
 	}
 	
-	//情况反馈
+	// 情况反馈
 	function feedBack(data) {
 		rowId = data.id;
 		_openNewWindows({
@@ -206,7 +188,7 @@ layui.config({
 			}});
 	}
 	
-	//删除
+	// 删除
 	function deleteRow(data) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
 			layer.close(index);
@@ -216,6 +198,31 @@ layui.config({
     		}});
 		});
 	}
+
+	form.render();
+	$("body").on("click", "#formSearch", function() {
+		refreshTable();
+	});
+
+	$("body").on("click", "#reloadTable", function() {
+		loadTable();
+	});
+
+	function loadTable() {
+		table.reloadData("messageTable", {where: getTableParams()});
+	}
+
+	function refreshTable() {
+		table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+	}
+
+	function getTableParams() {
+		return {
+			orderNum: $("#orderNum").val(),
+			state: $("#state").val(),
+			contacts: $("#contacts").val()
+		};
+	}
 	
     exports('sealseservicelist', {});
 });
\ No newline at end of file

seal-service/src/main/resources/template/js/sealseservicecheckwork/sealseservicecheckworklist.js

@@ -8,7 +8,6 @@ layui.config({
     window: 'js/winui.window'
 }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
-	
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table;
@@ -18,16 +17,15 @@ layui.config({
 	    elem: '#messageTable',
 	    method: 'post',
 	    url: flowableBasePath + 'sealseservicecheckwork001',
-	    where: {userName: $("#userName").val()},
+	    where: getTableParams(),
 	    even: true,
 	    page: true,
 	    limits: [8, 16, 24, 32, 40, 48, 56],
 	    limit: 8,
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-	        { field: 'createTime', title: '签到时间', align: 'center', width: 140 },
-	        { field: 'userName', title: '签到人', width: 80, align: 'left'},
-	        { field: 'departmentName', title: '签到部门', align: 'left', width: 100},
+			{ field: 'userName', title: '签到人', width: 120, align: 'left'},
+			{ field: 'createTime', title: '签到时间', align: 'center', width: 140 },
 	        { field: 'orderNum', title: '所属工单', align: 'center', width: 220, templet: function (d) {
 	        	return '<a lay-event="details" class="notice-title-click">' + d.orderNum + '</a>';
 	        }},
@@ -47,9 +45,7 @@ layui.config({
         }
     });
 	
-	form.render();
-	
-	//详情
+	// 详情
 	function details(data) {
 		rowId = data.serviceId;
 		_openNewWindows({
@@ -60,8 +56,8 @@ layui.config({
 			callBack: function (refreshCode) {
 			}});
 	}
-	
-	
+
+	form.render();
 	$("body").on("click", "#formSearch", function() {
 		refreshTable();
 	});
@@ -71,12 +67,16 @@ layui.config({
     });
     
     function loadTable() {
-    	table.reloadData("messageTable", {where: {userName: $("#userName").val()}});
+    	table.reloadData("messageTable", {where: getTableParams()});
     }
     
     function refreshTable(){
-    	table.reloadData("messageTable", {page: {curr: 1}, where: {userName: $("#userName").val()}});
+    	table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
     }
 
+	function getTableParams() {
+		return {};
+	}
+
     exports('sealseservicecheckworklist', {});
 });
\ No newline at end of file

seal-service/src/main/resources/template/tpl/sealseservice/sealseservicelist.html

@@ -19,10 +19,6 @@
 	                <div class="layui-input-inline">
 	                    <input type="text" id="contacts" name="contacts" placeholder="请输入联系人" class="layui-input" />
 	                </div>
-	                <label class="layui-form-label">工单接收人</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="receiver" name="receiver" placeholder="请输入工单接收人" class="layui-input" />
-	                </div>
 	                <label class="layui-form-label">状态</label>
 	                <div class="layui-input-inline">
 	                    <select id="state">

seal-service/src/main/resources/template/tpl/sealseservicecheckwork/sealseservicecheckworklist.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="userName" name="userName" placeholder="请输入签到人" 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" type="button" id="formSearch"><language showName="com.skyeye.search2"></language></button>
 	            </div>