From a90fadc6e498706146b2b71fab5c009eae918fdd Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Sun, 31 Jul 2022 15:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9F=BA=E6=9C=AC=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=91=E6=A1=8C=E9=9D=A2=E6=96=B0=E5=A2=9Ecode=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/js/sysEveDesktop/sysEveDesktopAdd.js     |  1 +
 .../template/js/sysEveDesktop/sysEveDesktopEdit.js    |  1 +
 .../template/js/sysEveDesktop/sysEveDesktopList.js    |  1 +
 .../template/tpl/sysEveDesktop/sysEveDesktopAdd.html  | 11 ++++++++++-
 .../template/tpl/sysEveDesktop/sysEveDesktopEdit.html |  9 +++++++++
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopAdd.js b/userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopAdd.js
index 75bd176ba..e861c1d39 100644
--- a/userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopAdd.js
+++ b/userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopAdd.js
@@ -19,6 +19,7 @@ layui.config({
  	        	var params = {
  	        		desktopName: $("#desktopName").val(),
  	        		desktopCnName: $("#desktopCnName").val(),
+					desktopCode: $("#code").val(),
 					state: $("input[name='state']:checked").val(),
 					appPageUrl: $("#appPageUrl").val(),
 					logo: $("#logo").find("input[name='upload']").attr("oldurl")
diff --git a/userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopEdit.js b/userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopEdit.js
index bb2f7e6a4..d89ba8432 100644
--- a/userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopEdit.js
+++ b/userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopEdit.js
@@ -29,6 +29,7 @@ layui.config({
 		 	        		id: parent.rowId,
 		 	        		desktopName: $("#desktopName").val(),
 		 	        		desktopCnName: $("#desktopCnName").val(),
+							desktopCode: $("#code").val(),
 							state: $("input[name='state']:checked").val(),
 							appPageUrl: $("#appPageUrl").val(),
 							logo: $("#logo").find("input[name='upload']").attr("oldurl")
diff --git a/userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopList.js b/userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopList.js
index 852a51a88..e46e9dcf3 100644
--- a/userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopList.js
+++ b/userauth/src/main/resources/template/js/sysEveDesktop/sysEveDesktopList.js
@@ -27,6 +27,7 @@ layui.config({
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
 	        { field: 'desktopName', title: '桌面名称', align: 'left', width: 150 },
 	        { field: 'desktopCnName', title: '英文名称', align: 'left', width: 150 },
+			{ field: 'code', title: '编码', align: 'left', width: 120 },
 			{ field: 'logo', title: 'LOGO', align: 'center', width: 60, templet: function (d) {
 				if(isNull(d.logo)){
 					return '<img src="../../assets/images/os_windows.png" class="photo-img">';
diff --git a/userauth/src/main/resources/template/tpl/sysEveDesktop/sysEveDesktopAdd.html b/userauth/src/main/resources/template/tpl/sysEveDesktop/sysEveDesktopAdd.html
index f4e60a941..b6e84ae52 100644
--- a/userauth/src/main/resources/template/tpl/sysEveDesktop/sysEveDesktopAdd.html
+++ b/userauth/src/main/resources/template/tpl/sysEveDesktop/sysEveDesktopAdd.html
@@ -16,14 +16,23 @@
 		        <label class="layui-form-label">中文名称<i class="red">*</i></label>
 		        <div class="layui-input-block">
 		        	<input type="text" id="desktopName" name="desktopName" win-verify="required" placeholder="请输入桌面名称" class="layui-input"/>
+					<div class="layui-form-mid layui-word-aux">该名称在系统中唯一。</div>
 		        </div>
 		    </div>
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">英文名称<i class="red">*</i></label>
 		        <div class="layui-input-block">
 		        	<input type="text" id="desktopCnName" name="desktopCnName" win-verify="required" placeholder="请输入英文名称" class="layui-input"/>
-		        </div>
+					<div class="layui-form-mid layui-word-aux">该名称可重复。</div>
+				</div>
 		    </div>
+			<div class="layui-form-item layui-col-xs6">
+				<label class="layui-form-label">编码<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" id="code" name="code" win-verify="required" placeholder="请输入编码" class="layui-input"/>
+					<div class="layui-form-mid layui-word-aux">该编码在系统中唯一。例如：ERP_DESKTOP</div>
+				</div>
+			</div>
 			<div class="layui-form-item layui-col-xs12">
 				<label class="layui-form-label">状态<i class="red">*</i></label>
 				<div class="layui-input-block winui-radio">
diff --git a/userauth/src/main/resources/template/tpl/sysEveDesktop/sysEveDesktopEdit.html b/userauth/src/main/resources/template/tpl/sysEveDesktop/sysEveDesktopEdit.html
index 52627471f..56ecd3d4f 100644
--- a/userauth/src/main/resources/template/tpl/sysEveDesktop/sysEveDesktopEdit.html
+++ b/userauth/src/main/resources/template/tpl/sysEveDesktop/sysEveDesktopEdit.html
@@ -22,12 +22,21 @@
 				<label class="layui-form-label">中文名称<i class="red">*</i></label>
 				<div class="layui-input-block">
 					<input type="text" id="desktopName" name="desktopName" win-verify="required" placeholder="请输入桌面名称" class="layui-input" value="{{desktopName}}"/>
+					<div class="layui-form-mid layui-word-aux">该名称在系统中唯一。</div>
 				</div>
 			</div>
 			<div class="layui-form-item layui-col-xs6">
 				<label class="layui-form-label">英文名称<i class="red">*</i></label>
 				<div class="layui-input-block">
 					<input type="text" id="desktopCnName" name="desktopCnName" win-verify="required" placeholder="请输入英文名称" class="layui-input" value="{{desktopCnName}}"/>
+					<div class="layui-form-mid layui-word-aux">该名称可重复。</div>
+				</div>
+			</div>
+			<div class="layui-form-item layui-col-xs6">
+				<label class="layui-form-label">编码<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" id="code" name="code" win-verify="required" placeholder="请输入编码" class="layui-input" value="{{code}}"/>
+					<div class="layui-form-mid layui-word-aux">该编码在系统中唯一。例如：ERP_DESKTOP</div>
 				</div>
 			</div>
 			<div class="layui-form-item layui-col-xs12">
-- 
GitLab