From b8cae3deb350eeb69fdaef98d7d26f6e59c64f31 Mon Sep 17 00:00:00 2001
From: weizhiqiang <>
Date: Wed, 28 Sep 2022 17:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=92=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/licenceManage/licenceManageDetails.js  |  2 +-
 .../js/licenceManage/licenceManageList.js     | 62 +++++++++---------
 .../js/myHasMation/myLicenceManagement.js     |  3 +-
 .../js/myHasMation/mySealManagement.js        | 46 ++++++-------
 .../template/js/sealManage/sealManageList.js  | 64 ++++++++-----------
 .../licenceManageDetailsTemplate.tpl          |  6 --
 .../sealManage/sealManageDetailsTemplate.tpl  |  6 --
 7 files changed, 79 insertions(+), 110 deletions(-)

diff --git a/admin-assistant/src/main/resources/template/js/licenceManage/licenceManageDetails.js b/admin-assistant/src/main/resources/template/js/licenceManage/licenceManageDetails.js
index 91c7ad6cf..a5cb8e236 100644
--- a/admin-assistant/src/main/resources/template/js/licenceManage/licenceManageDetails.js
+++ b/admin-assistant/src/main/resources/template/js/licenceManage/licenceManageDetails.js
@@ -13,7 +13,7 @@ layui.config({
 	    showGrid({
 		 	id: "showForm",
 		 	url: flowableBasePath + "licence006",
-		 	params: {rowId:parent.rowId},
+		 	params: {rowId: parent.rowId},
 		 	pagination: false,
 		 	template: getFileContent('tpl/licenceManage/licenceManageDetailsTemplate.tpl'),
 		 	ajaxSendLoadBefore: function(hdb) {
diff --git a/admin-assistant/src/main/resources/template/js/licenceManage/licenceManageList.js b/admin-assistant/src/main/resources/template/js/licenceManage/licenceManageList.js
index a08958ce8..8f8b034c0 100644
--- a/admin-assistant/src/main/resources/template/js/licenceManage/licenceManageList.js
+++ b/admin-assistant/src/main/resources/template/js/licenceManage/licenceManageList.js
@@ -15,46 +15,42 @@ layui.config({
 	// 新增证照
 	authBtn('1566464868733');
 	
-	showList();
 	// 证照列表
-	function showList(){
-		table.render({
-		    id: 'licencelistTable',
-		    elem: '#licencelistTable',
-		    method: 'post',
-		    url: flowableBasePath + 'licence001',
-		    where: getTableParams(),
-		    even: true,
-		    page: true,
-		    limits: getLimits(),
-	    	limit: getLimit(),
-		    cols: [[
-		        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-		        { field: 'licenceName', title: '证照名称', width: 170, templet: function (d) {
-		        	return '<a lay-event="details" class="notice-title-click">' + d.licenceName + '</a>';
-		        }},
-		        { field: 'companyName', title: '所属公司', align: 'left', width: 150 },
-		        { field: 'issueTime', title: '签发日期', align: 'center', width: 120 },
-		        { field: 'nextAnnualReview', title: '下次年审时间', align: 'center', width: 120 },
-		        { field: 'termOfValidityTime', title: '有效期至', align: 'center', width: 120 },
-		        { field: 'licenceAdmin', title: '管理人', align: 'center', width: 100 },
-		        { field: 'borrowName', title: '借用人', align: 'center', width: 100 },
-		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#licencelisttableBar'}
-		    ]],
-		    done: function(json) {
-		    	matchingLanguage();
-		    }
-		});
-	}
-	
+	table.render({
+		id: 'licencelistTable',
+		elem: '#licencelistTable',
+		method: 'post',
+		url: flowableBasePath + 'licence001',
+		where: getTableParams(),
+		even: true,
+		page: true,
+		limits: getLimits(),
+		limit: getLimit(),
+		cols: [[
+			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+			{ field: 'licenceName', title: '证照名称', width: 170, templet: function (d) {
+				return '<a lay-event="details" class="notice-title-click">' + d.licenceName + '</a>';
+			}},
+			{ field: 'issueTime', title: '签发日期', align: 'center', width: 120 },
+			{ field: 'nextAnnualReview', title: '下次年审时间', align: 'center', width: 120 },
+			{ field: 'termOfValidityTime', title: '有效期至', align: 'center', width: 120 },
+			{ field: 'licenceAdmin', title: '管理人', align: 'center', width: 100 },
+			{ field: 'borrowName', title: '借用人', align: 'center', width: 100 },
+			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#licencelisttableBar' }
+		]],
+		done: function(json) {
+			matchingLanguage();
+		}
+	});
+
 	table.on('tool(licencelistTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'details') { //详情
         	details(data);
-        } else if (layEvent === 'delet'){ //删除
+        } else if (layEvent === 'delet') { //删除
         	delet(data);
-        } else if (layEvent === 'edit'){	//编辑
+        } else if (layEvent === 'edit') { //编辑
         	edit(data);
         }
     });
diff --git a/admin-assistant/src/main/resources/template/js/myHasMation/myLicenceManagement.js b/admin-assistant/src/main/resources/template/js/myHasMation/myLicenceManagement.js
index 7c04c3319..cb228ccd0 100644
--- a/admin-assistant/src/main/resources/template/js/myHasMation/myLicenceManagement.js
+++ b/admin-assistant/src/main/resources/template/js/myHasMation/myLicenceManagement.js
@@ -27,8 +27,7 @@ layui.config({
 	    	limit: getLimit(),
 		    cols: [[
 		        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-				{ field: 'companyName', title: '所属公司', align: 'left', width: 170 },
-				{ field: 'licenceName', title: '资产名称', align: 'left', width: 120 },
+				{ field: 'licenceName', title: '证照名称', align: 'left', width: 120 },
 				{ field: 'borrowName', title: '领用人', align: 'left', width: 80 },
 				{ field: 'licenceAdmin', title: '管理员', align: 'left', width: 80 },
 		    ]],
diff --git a/admin-assistant/src/main/resources/template/js/myHasMation/mySealManagement.js b/admin-assistant/src/main/resources/template/js/myHasMation/mySealManagement.js
index e83a39c4b..b80f77078 100644
--- a/admin-assistant/src/main/resources/template/js/myHasMation/mySealManagement.js
+++ b/admin-assistant/src/main/resources/template/js/myHasMation/mySealManagement.js
@@ -1,6 +1,4 @@
 
-var rowId = "";
-
 layui.config({
 	base: basePath, 
 	version: skyeyeVersion
@@ -12,31 +10,27 @@ layui.config({
 		form = layui.form,
 		table = layui.table;
 
-	showList();
 	// 我借用中的印章列表
-	function showList(){
-		table.render({
-		    id: 'messageTable',
-		    elem: '#messageTable',
-		    method: 'post',
-		    url: flowableBasePath + 'myhasmation002',
-		    where: getTableParams(),
-		    even: true,
-		    page: true,
-		    limits: getLimits(),
-	    	limit: getLimit(),
-		    cols: [[
-		        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-				{ field: 'companyName', title: '所属公司', align: 'left', width: 170 },
-				{ field: 'sealName', title: '印章名称', align: 'left', width: 120 },
-				{ field: 'borrowName', title: '领用人', align: 'left', width: 80 },
-				{ field: 'sealAdmin', title: '管理员', align: 'left', width: 80 },
-		    ]],
-		    done: function(json) {
-		    	matchingLanguage();
-		    }
-		});
-	}
+	table.render({
+		id: 'messageTable',
+		elem: '#messageTable',
+		method: 'post',
+		url: flowableBasePath + 'myhasmation002',
+		where: getTableParams(),
+		even: true,
+		page: true,
+		limits: getLimits(),
+		limit: getLimit(),
+		cols: [[
+			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+			{ field: 'sealName', title: '印章名称', align: 'left', width: 120 },
+			{ field: 'borrowName', title: '领用人', align: 'left', width: 80 },
+			{ field: 'sealAdmin', title: '管理员', align: 'left', width: 80 },
+		]],
+		done: function(json) {
+			matchingLanguage();
+		}
+	});
 
     $("body").on("click", "#reloadmessageTable", function() {
     	loadTable();
diff --git a/admin-assistant/src/main/resources/template/js/sealManage/sealManageList.js b/admin-assistant/src/main/resources/template/js/sealManage/sealManageList.js
index 9acbe5597..e2a8c0d66 100644
--- a/admin-assistant/src/main/resources/template/js/sealManage/sealManageList.js
+++ b/admin-assistant/src/main/resources/template/js/sealManage/sealManageList.js
@@ -6,57 +6,49 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
-	
+}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
-	
 	var $ = layui.$,
 		form = layui.form,
-		laydate = layui.laydate,
 		table = layui.table;
 	
 	// 新增印章
 	authBtn('1566464558428');
 	
-	showList();
 	// 印章列表
-	function showList(){
-		showMessageTable = true;
-		table.render({
-		    id: 'seallistTable',
-		    elem: '#seallistTable',
-		    method: 'post',
-		    url: flowableBasePath + 'seal001',
-		    where: getTableParams(),
-		    even: true,
-		    page: true,
-		    limits: getLimits(),
-	    	limit: getLimit(),
-		    cols: [[
-		        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-		        { field: 'sealName', title: '印章名称', width: 170, templet: function (d) {
-		        	return '<a lay-event="details" class="notice-title-click">' + d.sealName + '</a>';
-		        }},
-		        { field: 'companyName', title: '所属公司', align: 'left', width: 150 },
-		        { field: 'enableTime', title: '启用日期', align: 'center', width: 120 },
-		        { field: 'borrowId', title: '借用人', align: 'center', width: 100 },
-		        { field: 'sealAdmin', title: '管理人', align: 'center', width: 100 },
-		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#seallisttableBar'}
-		    ]],
-		    done: function(json) {
-		    	matchingLanguage();
-		    }
-		});
-	}
-	
+	table.render({
+		id: 'seallistTable',
+		elem: '#seallistTable',
+		method: 'post',
+		url: flowableBasePath + 'seal001',
+		where: getTableParams(),
+		even: true,
+		page: true,
+		limits: getLimits(),
+		limit: getLimit(),
+		cols: [[
+			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+			{ field: 'sealName', title: '印章名称', width: 170, templet: function (d) {
+				return '<a lay-event="details" class="notice-title-click">' + d.sealName + '</a>';
+			}},
+			{ field: 'enableTime', title: '启用日期', align: 'center', width: 120 },
+			{ field: 'borrowId', title: '借用人', align: 'center', width: 100 },
+			{ field: 'sealAdmin', title: '管理人', align: 'center', width: 100 },
+			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#seallisttableBar'}
+		]],
+		done: function(json) {
+			matchingLanguage();
+		}
+	});
+
 	table.on('tool(seallistTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'details') { //详情
         	details(data);
-        } else if (layEvent === 'delet'){ //删除
+        } else if (layEvent === 'delet') { //删除
         	delet(data);
-        } else if (layEvent === 'edit'){	//编辑
+        } else if (layEvent === 'edit') { //编辑
         	edit(data);
         }
     });
diff --git a/admin-assistant/src/main/resources/template/tpl/licenceManage/licenceManageDetailsTemplate.tpl b/admin-assistant/src/main/resources/template/tpl/licenceManage/licenceManageDetailsTemplate.tpl
index 67e4043c8..77dd8bfc7 100644
--- a/admin-assistant/src/main/resources/template/tpl/licenceManage/licenceManageDetailsTemplate.tpl
+++ b/admin-assistant/src/main/resources/template/tpl/licenceManage/licenceManageDetailsTemplate.tpl
@@ -1,10 +1,4 @@
 {{#bean}}
-	<div class="layui-form-item">
-        <label class="layui-form-label">所属公司：</label>
-        <div class="layui-input-block ver-center">
-            {{companyName}}
-        </div>
-    </div>
 	<div class="layui-form-item">
 		<label class="layui-form-label">证照名称：</label>
 		<div class="layui-input-block ver-center">
diff --git a/admin-assistant/src/main/resources/template/tpl/sealManage/sealManageDetailsTemplate.tpl b/admin-assistant/src/main/resources/template/tpl/sealManage/sealManageDetailsTemplate.tpl
index ac3349d88..6fc1f1ff1 100644
--- a/admin-assistant/src/main/resources/template/tpl/sealManage/sealManageDetailsTemplate.tpl
+++ b/admin-assistant/src/main/resources/template/tpl/sealManage/sealManageDetailsTemplate.tpl
@@ -1,10 +1,4 @@
 {{#bean}}
-	<div class="layui-form-item">
-        <label class="layui-form-label">所属公司：</label>
-        <div class="layui-input-block ver-center">
-            {{companyName}}
-        </div>
-    </div>
 	<div class="layui-form-item">
 		<label class="layui-form-label">印章名称：</label>
 		<div class="layui-input-block ver-center">
-- 
GitLab