删除编码配置功能

d4505c1e · doc_wei · a0de3ad2 · a0de3ad2 · a0de3ad2 · d4505c1e
3 changed file
--- a/common/src/main/resources/template/js/codeRule/businessDataCodeRuleConfig.js
+++ b/common/src/main/resources/template/js/codeRule/businessDataCodeRuleConfig.js
-
-layui.config({
-	base: basePath,
-	version: skyeyeVersion
-}).extend({
-	window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui', 'form'], function (exports) {
-	winui.renderColor();
-	var $ = layui.$,
-		form = layui.form;
-
-	// 获取所有编码规则
-	var codeRuleSelectHtml = '';
-	AjaxPostUtil.request({url: reqBasePath + "getAllCodeRuleList", params: {}, type: 'json', method: "GET", callback: function(json) {
-		codeRuleSelectHtml = getDataUseHandlebars(getFileContent('tpl/template/select-option.tpl'), json);
-	}, async: false});
-
-	// 获取需要配置编码规则的业务功能对象
-	showGrid({
-		id: "showForm",
-		url: reqBasePath + "queryClassCodeRuleList",
-		params: {},
-		pagination: false,
-		method: "GET",
-		template: $("#baseTemplate").html(),
-		ajaxSendLoadBefore: function (hdb, json) {
-			$.each(json.bean, function (key, appIdValue) {
-				$.each(appIdValue, function (i, groupNameValue) {
-					$.each(groupNameValue, function (j, bean) {
-						bean.selectHtml = codeRuleSelectHtml;
-					});
-				});
-			});
-		},
-		ajaxSendAfter: function (json) {
-			$.each(json.bean, function (key, appIdValue) {
-				$.each(appIdValue, function (i, groupNameValue) {
-					$.each(groupNameValue, function (j, bean) {
-						$("#" + bean.id).val(bean.codeRuleId);
-					})
-				});
-			});
-
-			form.render();
-			form.on('select(codeRole)', function(data) {
-				var cudeRuleId = data.value;
-				var id = data.elem.id;
-				AjaxPostUtil.request({url: reqBasePath + "editClassCodeRuleConfig", params: {id: id, cudeRuleId: cudeRuleId}, type: 'json', method: "POST", callback: function (json) {
-					winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
-				}});
-			});
-		}
-	});
-
-	exports('businessDataCodeRuleConfig', {});
-});
--- a/common/src/main/resources/template/tpl/codeRule/businessDataCodeRuleConfig.html
+++ b/common/src/main/resources/template/tpl/codeRule/businessDataCodeRuleConfig.html
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-
-    <div style="margin: 0 auto; padding: 20px;">
-        <form class="layui-form" action="" id="showForm" autocomplete="off">
-
-        </form>
-    </div>
-
-    <script type="text/x-handlebars-template" id="baseTemplate">
-        {{#each bean}}
-            <div class="layui-col-md12">
-                <div class="layui-card">
-                    <div class="layui-card-header"><b>{{@key}}</b></div>
-                    <div class="layui-card-body layui-col-md12" style="display: inline-block;">
-                        {{#each @this}}
-                            <div class="layui-col-md12">
-                                <div class="layui-card">
-                                    <div class="layui-card-header"><b>{{@key}}</b></div>
-                                    <div class="layui-card-body" style="display: flow-root;">
-                                        {{#each @this}}
-                                        <blockquote class="layui-elem-quote layui-quote-nm layui-col-md2">
-                                            {{serviceName}}
-                                            <select lay-filter="codeRole" lay-search="" id="{{id}}" win-verify="required">
-                                                {{{selectHtml}}}
-                                            </select>
-                                        </blockquote>
-                                        {{/each}}
-                                    </div>
-                                </div>
-                            </div>
-                        {{/each}}
-                    </div>
-                </div>
-            </div>
-        {{/each}}
-    </script>
-
-    <script src="../../assets/lib/layui/layui.js"></script>
-    <script src="../../assets/lib/layui/custom.js"></script>
-    <script type="text/javascript">
-        layui.config({base: '../../js/codeRule/'}).use('businessDataCodeRuleConfig');
-    </script>
-</body>
-</html>
\ No newline at end of file
--- a/dsform/src/main/resources/template/js/dsFormPage/pageList.js
+++ b/dsform/src/main/resources/template/js/dsFormPage/pageList.js
@@ -27,8 +27,12 @@ layui.config({
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
 	        { field: 'name', title: '名称', align: 'left', width: 120 },
 	        { field: 'remark', title: '简介', align: 'left', width: 350 },
-	        { field: 'numCode', title: '编号', align: 'center', width: 150 },
-	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
+	        { field: 'numCode', title: '编号', width: 150 },
+			{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
+			{ 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: 200, toolbar: '#tableBar' }
 	    ]],
 	    done: function(json) {
 	    	matchingLanguage();