数据字典分类增加多级控制

common/src/main/resources/template/js/sysDictData/sysDictDataAdd.js

@@ -15,7 +15,7 @@ layui.config({
 		textool.init({eleId: 'remark', maxlength: 200});
 
 		// 加载数据字典分类
-		sysDictDataUtil.queryDictTypeListByStatus(0, function (json) {
+		sysDictDataUtil.queryDictTypeListByEnabled(1, function (json) {
 			$("#dictTypeId").html(getDataUseHandlebars(selOption, json));
 			form.render('select');
 		});

common/src/main/resources/template/js/sysDictData/sysDictDataEdit.js

@@ -25,7 +25,7 @@ layui.config({
 		 	ajaxSendAfter: function (json) {
 
 				// 加载数据字典分类
-				sysDictDataUtil.queryDictTypeListByStatus(0, function (data) {
+				sysDictDataUtil.queryDictTypeListByEnabled(1, function (data) {
 					$("#dictTypeId").html(getDataUseHandlebars(selOption, data));
 					$("#dictTypeId").val(json.bean.dictTypeId);
 					form.render('select');

common/src/main/resources/template/js/sysDictType/sysDictTypeAdd.js

@@ -10,18 +10,37 @@ layui.config({
 		var index = parent.layer.getFrameIndex(window.name);
 	    var $ = layui.$,
 			textool = layui.textool;
-
 		textool.init({eleId: 'remark', maxlength: 200});
 
+		skyeyeClassEnumUtil.showEnumDataListByClassName("commonEnable", 'radio', "enabled", '', form);
+
+		form.on('radio(dictType)', function (data) {
+			var val = data.value;
+			if (val == 1) {
+				$("#chooseLevel").parent().parent().remove();
+			} else if (val == 2) {
+				$("#dictTypeBox").after(
+					`<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="chooseLevel" name="chooseLevel" win-verify="required|number" placeholder="请输入可选层级" class="layui-input"/>
+									<div class="layui-form-mid layui-word-aux">例如：多级字典为三级，这里设置为2，那么只有二级和二级的所有子层级可以选择</div>
+								</div>
+							</div>`);
+			}
+		});
+
 	    matchingLanguage();
  		form.render();
  	    form.on('submit(formAddBean)', function (data) {
  	        if (winui.verifyForm(data.elem)) {
+				var dictType = $("input[name='dictType']:checked").val();
  	        	var params = {
 					dictName: $("#dictName").val(),
 					dictCode: $("#dictCode").val(),
-					status: $("input[name='status']:checked").val(),
-					dictType: 1,
+					enabled: $("#enabled input:radio:checked").val(),
+					dictType: dictType,
+					chooseLevel: dictType == 1 ? 1 : $('#chooseLevel').val(),
 					remark: $("#remark").val(),
  	        	};
  	        	AjaxPostUtil.request({url: reqBasePath + "writeDictTypeMation", params: params, type: 'json', method: "POST", callback: function (json) {

common/src/main/resources/template/js/sysDictType/sysDictTypeEdit.js

@@ -23,7 +23,35 @@ layui.config({
 			},
 		 	ajaxSendAfter: function (json) {
 
-				$("input:radio[name=status][value=" + json.bean.status + "]").attr("checked", true);
+				skyeyeClassEnumUtil.showEnumDataListByClassName("commonEnable", 'radio', "enabled", json.bean.enabled, form);
+
+				form.on('radio(dictType)', function (data) {
+					var val = data.value;
+					if (val == 1) {
+						$("#chooseLevel").parent().parent().remove();
+					} else if (val == 2) {
+						$("#dictTypeBox").after(
+							`<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="chooseLevel" name="chooseLevel" win-verify="required|number" placeholder="请输入可选层级" class="layui-input"/>
+									<div class="layui-form-mid layui-word-aux">例如：多级字典为三级，这里设置为2，那么只有二级和二级的所有子层级可以选择</div>
+								</div>
+							</div>`);
+					}
+				});
+
+				if (json.bean.dictType == 2) {
+					$("#dictTypeBox").after(
+						`<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="chooseLevel" name="chooseLevel" win-verify="required|number" placeholder="请输入可选层级" class="layui-input" value="${json.bean.chooseLevel}"/>
+									<div class="layui-form-mid layui-word-aux">例如：多级字典为三级，这里设置为2，那么只有二级和二级的所有子层级可以选择</div>
+								</div>
+							</div>`);
+				}
+				$("input:radio[name=dictType][value=" + json.bean.dictType + "]").attr("checked", true);
 
 				textool.init({eleId: 'remark', maxlength: 200});
 
@@ -31,12 +59,14 @@ layui.config({
 				form.render();
 		 	    form.on('submit(formEditBean)', function (data) {
 		 	        if (winui.verifyForm(data.elem)) {
+						var dictType = $("input[name='dictType']:checked").val();
 		 	        	var params = {
 							id: parent.rowId,
 							dictName: $("#dictName").val(),
 							dictCode: $("#dictCode").val(),
-							status: $("input[name='status']:checked").val(),
-							dictType: 1,
+							enabled: $("#enabled input:radio:checked").val(),
+							dictType: dictType,
+							chooseLevel: dictType == 1 ? 1 : $('#chooseLevel').val(),
 							remark: $("#remark").val(),
 		 	        	};
 		 	        	AjaxPostUtil.request({url: reqBasePath + "writeDictTypeMation", params: params, type: 'json', method: "POST", callback: function (json) {

common/src/main/resources/template/js/sysDictType/sysDictTypeList.js

@@ -27,7 +27,7 @@ layui.config({
 		cols: [[
 			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
 			{ field: 'dictName', title: '名称', width: 200 },
-			{ field: 'dictCode', title: 'Code', width: 300 },
+			{ field: 'dictCode', title: '编码', width: 300 },
 			{ field: 'dictType', title: '字典类型', align: 'center', width: 100, templet: function (d) {
 				if (d.dictType == 1) {
 					return '一级分类';
@@ -35,12 +35,8 @@ layui.config({
 					return '多级分类';
 				}
 			}},
-			{ field: 'status', title: '状态', align: 'center', width: 100, templet: function (d) {
-				if (d.status == 0) {
-					return "<span class='state-new'>启用</span>";
-				} else if (d.status == 1) {
-					return "<span class='state-down'>禁用</span>";
-				}
+			{ field: 'enabled', title: '状态', align: 'center', width: 100, templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("commonEnable", 'id', d.enabled, 'name');
 			}},
 			{ field: 'remark', title: '备注', width: 300 },
 			{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },

common/src/main/resources/template/tpl/sysDictType/sysDictTypeAdd.html

@@ -17,17 +17,22 @@
 		        </div>
 		    </div>
 			<div class="layui-form-item layui-col-xs6">
-				<label class="layui-form-label">Code<i class="red">*</i></label>
+				<label class="layui-form-label">编码<i class="red">*</i></label>
 				<div class="layui-input-block">
-					<input type="text" id="dictCode" name="dictCode" win-verify="required" placeholder="请输入Code" class="layui-input"/>
-					<div class="layui-form-mid layui-word-aux">Code不能重复。</div>
+					<input type="text" id="dictCode" name="dictCode" 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-xs12">
 				<label class="layui-form-label">状态<i class="red">*</i></label>
+				<div class="layui-input-block winui-radio" id="enabled">
+				</div>
+			</div>
+			<div class="layui-form-item layui-col-xs6" id="dictTypeBox">
+				<label class="layui-form-label">字典类型<i class="red">*</i></label>
 				<div class="layui-input-block winui-radio">
-					<input type="radio" name="status" value="0" title="启用" checked="checked"/>
-					<input type="radio" name="status" value="1" title="禁用" />
+					<input type="radio" name="dictType" value="1" title="一级字典" lay-filter="dictType" checked="checked"/>
+					<input type="radio" name="dictType" value="2" title="多级字典" lay-filter="dictType" />
 				</div>
 			</div>
 			<div class="layui-form-item layui-col-xs12">

common/src/main/resources/template/tpl/sysDictType/sysDictTypeEdit.html

@@ -23,17 +23,22 @@
 			</div>
 		</div>
 		<div class="layui-form-item layui-col-xs6">
-			<label class="layui-form-label">Code<i class="red">*</i></label>
+			<label class="layui-form-label">编码<i class="red">*</i></label>
 			<div class="layui-input-block">
-				<input type="text" id="dictCode" name="dictCode" win-verify="required" placeholder="请输入Code" class="layui-input" value="{{dictCode}}"/>
-				<div class="layui-form-mid layui-word-aux">Code不能重复。</div>
+				<input type="text" id="dictCode" name="dictCode" win-verify="required" placeholder="请输入编码" class="layui-input" value="{{dictCode}}"/>
+				<div class="layui-form-mid layui-word-aux">编码不能重复。</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" id="enabled">
+			</div>
+		</div>
+		<div class="layui-form-item layui-col-xs6" id="dictTypeBox">
+			<label class="layui-form-label">字典类型<i class="red">*</i></label>
 			<div class="layui-input-block winui-radio">
-				<input type="radio" name="status" value="0" title="启用" />
-				<input type="radio" name="status" value="1" title="禁用" />
+				<input type="radio" name="dictType" value="1" title="一级字典" lay-filter="dictType" />
+				<input type="radio" name="dictType" value="2" title="多级字典" lay-filter="dictType" />
 			</div>
 		</div>
 		<div class="layui-form-item layui-col-xs12">

erp/src/main/resources/template/js/material/materialAdd.js

@@ -20,7 +20,7 @@ layui.config({
 	    
 	    textool.init({eleId: 'remark', maxlength: 200});
 
-		var enableData = systemCommonUtil.getEnumDataListByClassName("commonEnable");
+		var enableData = skyeyeClassEnumUtil.getEnumDataListByClassName("commonEnable");
 		var skuTableObj = skuTable.render({
 			boxId: 'skuTableBox',
 			specTableElemId: 'fairy-spec-table',
@@ -68,9 +68,9 @@ layui.config({
 			fuzzySearch(id, '#name', null, true); //初始化模糊搜索方法
 		});
 
-		systemCommonUtil.showEnumDataListByClassName("commonEnable", 'radio', "enabled", '', form);
-		systemCommonUtil.showEnumDataListByClassName("materialFromType", 'radio', "fromType", '', form);
-		systemCommonUtil.showEnumDataListByClassName("materialType", 'radio', "materialType", '', form);
+		skyeyeClassEnumUtil.showEnumDataListByClassName("commonEnable", 'radio', "enabled", '', form);
+		skyeyeClassEnumUtil.showEnumDataListByClassName("materialFromType", 'radio', "fromType", '', form);
+		skyeyeClassEnumUtil.showEnumDataListByClassName("materialType", 'radio', "materialType", '', form);
 
 		skyeyeEnclosure.init('enclosureUpload');
 		matchingLanguage();

erp/src/main/resources/template/js/material/materialDetails.js

@@ -21,16 +21,16 @@ layui.config({
 			method: 'GET',
 		 	template: $("#beanTemplate").html(),
 			ajaxSendLoadBefore: function(hdb, json) {
-				json.bean.enabled = systemCommonUtil.getEnumDataNameByClassName('commonEnable', 'id', json.bean.enabled, 'name');
-				json.bean.fromType = systemCommonUtil.getEnumDataNameByClassName('materialFromType', 'id', json.bean.fromType, 'name');
-				json.bean.type = systemCommonUtil.getEnumDataNameByClassName('materialType', 'id', json.bean.type, 'name');
+				json.bean.enabled = skyeyeClassEnumUtil.getEnumDataNameByClassName('commonEnable', 'id', json.bean.enabled, 'name');
+				json.bean.fromType = skyeyeClassEnumUtil.getEnumDataNameByClassName('materialFromType', 'id', json.bean.fromType, 'name');
+				json.bean.type = skyeyeClassEnumUtil.getEnumDataNameByClassName('materialType', 'id', json.bean.type, 'name');
 			},
 		 	ajaxSendAfter:function (json) {
 				var skuData = {};
 				$.each(json.bean.norms, function (index, item) {
 					skuData[item.tableNum] = item;
 				});
-				var enableData = systemCommonUtil.getEnumDataListByClassName("commonEnable");
+				var enableData = skyeyeClassEnumUtil.getEnumDataListByClassName("commonEnable");
 				skuTable.render({
 					boxId: 'skuTableBox',
 					specTableElemId: 'fairy-spec-table',

erp/src/main/resources/template/js/material/materialEdit.js

@@ -56,7 +56,7 @@ layui.config({
 				$.each(j.bean.norms, function (index, item) {
 					skuData[item.tableNum] = item;
 				});
-				var enableData = systemCommonUtil.getEnumDataListByClassName("commonEnable");
+				var enableData = skyeyeClassEnumUtil.getEnumDataListByClassName("commonEnable");
 				var skuTableObj = skuTable.render({
 					boxId: 'skuTableBox',
 					specTableElemId: 'fairy-spec-table',
@@ -91,9 +91,9 @@ layui.config({
 					otherMationData: j.bean
 				});
 
-				systemCommonUtil.showEnumDataListByClassName("commonEnable", 'radio', "enabled", j.bean.enabled, form);
-				systemCommonUtil.showEnumDataListByClassName("materialFromType", 'radio', "fromType", j.bean.fromType, form);
-				systemCommonUtil.showEnumDataListByClassName("materialType", 'radio', "materialType", j.bean.materialType, form);
+				skyeyeClassEnumUtil.showEnumDataListByClassName("commonEnable", 'radio', "enabled", j.bean.enabled, form);
+				skyeyeClassEnumUtil.showEnumDataListByClassName("materialFromType", 'radio', "fromType", j.bean.fromType, form);
+				skyeyeClassEnumUtil.showEnumDataListByClassName("materialType", 'radio', "materialType", j.bean.materialType, form);
 
 				// 初始化工序
 				procedureMationList = [].concat(j.bean.procedureMationList);

web/src/main/resources/template/assets/lib/layui/custom.js

@@ -13,7 +13,7 @@ var customerJS = {
 	"calculationUtil": "../../assets/lib/layui/customer/calculationUtil.js", // 加减乘除工具函数
 	"skyeyeEnclosure": "../../assets/lib/layui/customer/skyeyeEnclosure.js", // 附件工具函数
 	"ajaxPostUtil": "../../assets/lib/layui/customer/ajaxPostUtil.js", // ajax工具函数
-	"dsFormUtil": "../../assets/lib/layui/customer/dsFormUtil.js", // 动态表单工具函数
+	"dsFormUtil": "../../assets/lib/layui/customer/skyeye/dsFormUtil.js", // 动态表单工具函数
 	"systemModelUtil": "../../assets/lib/layui/customer/systemModelUtil.js", // 系统编辑器模板工具函数
 	"ueEditorUtil": "../../assets/lib/layui/customer/ueEditorUtil.js", // ueEditor编辑器工具函数
 	"accountSubjectUtil": "../../assets/lib/layui/customer/accountSubjectUtil.js", // 财务会计相关的工具函数
@@ -32,12 +32,13 @@ var customerJS = {
 	"organizationUtil": "../../assets/lib/layui/customer/organizationUtil.js", // 组织机构相关工具类
 	"threeUtil": "../../assets/lib/layui/customer/threeUtil.js", // 3D编辑器相关工具类
 	"reportModelTypeUtil": "../../assets/lib/layui/customer/reportModelTypeUtil.js", // 模型分类工具类
-	"schoolUtil": "../../assets/lib/layui/customer/schoolUtil.js", // 学校模块工具类
+	"schoolUtil": "../../assets/lib/layui/customer/skyeye/schoolUtil.js", // 学校模块工具类
 	"checkWorkUtil": "../../assets/lib/layui/customer/checkWorkUtil.js", // 考勤模块工具类
 	"arrayUtil": "../../assets/lib/layui/customer/arrayUtil.js", // 集合工具类
 	"initTableChooseUtil": "../../assets/lib/layui/customer/tableUtil/initTableChooseUtil.js", // 加载表格选择的表格插件
-	"sysDictDataUtil": "../../assets/lib/layui/customer/sysDictDataUtil.js", // 数据字典插件
+	"sysDictDataUtil": "../../assets/lib/layui/customer/skyeye/sysDictDataUtil.js", // 数据字典插件
 	"initTableSearchUtil": "../../assets/lib/layui/customer/tableUtil/initTableSearchUtil.js", // 表格高级查询插件
+	"skyeyeClassEnumUtil": "../../assets/lib/layui/customer/skyeye/skyeyeClassEnumUtil.js", // 动态枚举插件
 };
 
 //系统基础信息

web/src/main/resources/template/assets/lib/layui/customer/skyeye/skyeyeClassEnumUtil.js

+
+var skyeyeClassEnumUtil = {
+
+    classEnumMap: {},
+
+    /**
+     * 展示枚举类的集合数据
+     *
+     * @param code 枚举类对应的前台code
+     * @param showType 展示类型
+     * @param showBoxId 展示位置
+     * @param defaultId 默认回显值
+     * @param form form对象
+     * @param callback 回调函数
+     */
+    showEnumDataListByClassName: function (code, showType, showBoxId, defaultId, form, callback) {
+        var json = skyeyeClassEnumUtil.getEnumDataListByClassName(code);
+        if (showType == 'select') {
+            $("#" + showBoxId).html(getDataUseHandlebars(getFileContent('tpl/template/select-option.tpl'), json));
+            if (!isNull(defaultId)) {
+                $("#" + showBoxId).val(defaultId);
+            } else {
+                $.each(json.rows, function (i, item) {
+                    if (item.isDefault) {
+                        $("#" + showBoxId).val(item.id);
+                    }
+                });
+            }
+            form.render('select');
+        } else if (showType == 'checkbox') {
+            $("#" + showBoxId).html(getDataUseHandlebars(getFileContent('tpl/template/checkbox-property.tpl'), json));
+            if (!isNull(defaultId)) {
+                var arr = defaultId.split(",");
+                for(var i = 0; i < arr.length; i++){
+                    $('input:checkbox[rowId="' + arr[i] + '"]').attr("checked", true);
+                }
+            } else {
+                $.each(json.rows, function (i, item) {
+                    if (item.isDefault) {
+                        $('input:checkbox[rowId="' + item.id + '"]').attr("checked", true);
+                    }
+                });
+            }
+            form.render('checkbox');
+        } else if (showType == 'radio') {
+            $("#" + showBoxId).html(getDataUseHandlebars('{{#each rows}}<input type="radio" name="' + showBoxId + 'Name" value="{{id}}" title="{{name}}" />{{/each}}', json));
+            if (!isNull(defaultId)) {
+                $("#" + showBoxId + " input:radio[name=" + showBoxId + "Name][value=" + defaultId + "]").attr("checked", true);
+            } else {
+                $.each(json.rows, function (i, item) {
+                    if (item.isDefault) {
+                        $("#" + showBoxId + " input:radio[name=" + showBoxId + "Name][value=" + item.id + "]").attr("checked", true);
+                    }
+                });
+            }
+            form.render('radio');
+        }
+        if (typeof (callback) == "function") {
+            callback(json);
+        }
+    },
+
+    getEnumDataNameByClassName: function (code, key, value, getKey) {
+        var json = skyeyeClassEnumUtil.getEnumDataListByClassName(code);
+        var result = getInPoingArr(json.rows, key, value, getKey);
+        return isNull(result) ? '' : result;
+    },
+
+    getEnumDataListByClassName: function (code) {
+        if (isNull(skyeyeClassEnumUtil.classEnumMap[code])) {
+            var params = {
+                className: encodeURIComponent(skyeyeClassEnum[code]["className"])
+            };
+            if (!isNull(skyeyeClassEnum[code]["filterValue"])) {
+                params["filterValue"] = skyeyeClassEnum[code]["filterValue"];
+                params["filterKey"] = skyeyeClassEnum[code]["filterKey"];
+            }
+            AjaxPostUtil.request({url: reqBasePath + "getEnumDataByClassName", params: params, type: 'json', method: "POST", callback: function(json) {
+                skyeyeClassEnumUtil.classEnumMap[code] = json;
+            }, async: false});
+        }
+        return skyeyeClassEnumUtil.classEnumMap[code];
+    },
+
+    getEnumDataNameByCodeAndKey: function (code, idKey, key, displayNameKey) {
+        var json = skyeyeClassEnumUtil.getEnumDataListByClassName(code);
+        var displayName = '';
+        $.each(json.rows, function (i, item) {
+            if (item[idKey] == key) {
+                displayName = item[displayNameKey];
+            }
+        });
+        return displayName;
+    }
+
+};

web/src/main/resources/template/assets/lib/layui/customer/sysDictDataUtil.js → web/src/main/resources/template/assets/lib/layui/customer/skyeye/sysDictDataUtil.js

@@ -2,17 +2,19 @@
 
 var sysDictDataUtil = {
 
+    dictDataMap: {},
+
     /**
      * 获取指定状态的数据字典分类
      *
-     * @param status 状态（0正常 1停用）
+     * @param enabled 状态（1 启用  2.停用）
      * @param callback 回执函数
      */
-    queryDictTypeListByStatus: function (status, callback) {
+    queryDictTypeListByEnabled: function (enabled, callback) {
         var params = {
-            status: status
+            enabled: enabled
         };
-        AjaxPostUtil.request({url: reqBasePath + "queryDictTypeListByStatus", params: params, type: 'json', method: "GET", callback: function(json) {
+        AjaxPostUtil.request({url: reqBasePath + "queryDictTypeListByEnabled", params: params, type: 'json', method: "GET", callback: function(json) {
             if (typeof(callback) == "function") {
                 callback(json);
             }
@@ -29,7 +31,7 @@ var sysDictDataUtil = {
         var params = {
             dictTypeCode: dictTypeCode
         };
-        AjaxPostUtil.request({url: reqBasePath + "queryDictDataListByDictTypeCode", params: params, type: 'json', method: "GET", callback: function(json) {
+        sysDictDataUtil.queryDictDataListByDictTypeCode(dictTypeCode, function (json) {
             if (showType == 'select') {
                 $("#" + showBoxId).html(getDataUseHandlebars(getFileContent('tpl/template/select-option.tpl'), json));
                 if (!isNull(defaultId)) {
@@ -49,7 +51,7 @@ var sysDictDataUtil = {
             if (typeof (callback) == "function") {
                 callback(json);
             }
-        }, async: false});
+        });
     },
 
     /**
@@ -59,14 +61,29 @@ var sysDictDataUtil = {
      * @param callback 回执函数
      */
     queryDictDataListByDictTypeCode: function (dictTypeCode, callback) {
-        var params = {
-            dictTypeCode: dictTypeCode
-        };
-        AjaxPostUtil.request({url: reqBasePath + "queryDictDataListByDictTypeCode", params: params, type: 'json', method: "GET", callback: function(json) {
-            if (typeof(callback) == "function") {
-                callback(json);
-            }
-        }, async: false});
+        if (isNull(sysDictDataUtil.dictDataMap[dictTypeCode])) {
+            var params = {
+                dictTypeCode: dictTypeCode
+            };
+            AjaxPostUtil.request({url: reqBasePath + "queryDictDataListByDictTypeCode", params: params, type: 'json', method: "GET", callback: function(json) {
+                sysDictDataUtil.dictDataMap[dictTypeCode] = json;
+            }, async: false});
+        }
+        if (typeof(callback) == "function") {
+            callback(sysDictDataUtil.dictDataMap[dictTypeCode]);
+        }
     },
 
+    getDictDataNameByCodeAndKey: function (dictTypeCode, key) {
+        var displayName = '';
+        sysDictDataUtil.queryDictDataListByDictTypeCode(dictTypeCode, function (json) {
+            $.each(json.rows, function (i, item) {
+                if (item.id == key) {
+                    displayName = item.name;
+                }
+            });
+        });
+        return displayName;
+    }
+
 };

web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js

@@ -611,84 +611,6 @@ var systemCommonUtil = {
                 show('#' + id, data);
             }
         };
-    },
-
-    /**
-     * 展示枚举类的集合数据
-     *
-     * @param code 枚举类对应的前台code
-     * @param showType 展示类型
-     * @param showBoxId 展示位置
-     * @param defaultId 默认回显值
-     * @param form form对象
-     * @param callback 回调函数
-     */
-    showEnumDataListByClassName: function (code, showType, showBoxId, defaultId, form, callback) {
-        var json = systemCommonUtil.getEnumDataListByClassName(code);
-        if (showType == 'select') {
-            $("#" + showBoxId).html(getDataUseHandlebars(getFileContent('tpl/template/select-option.tpl'), json));
-            if (!isNull(defaultId)) {
-                $("#" + showBoxId).val(defaultId);
-            } else {
-                $.each(json.rows, function (i, item) {
-                    if (item.isDefault) {
-                        $("#" + showBoxId).val(item.id);
-                    }
-                });
-            }
-            form.render('select');
-        } else if (showType == 'checkbox') {
-            $("#" + showBoxId).html(getDataUseHandlebars(getFileContent('tpl/template/checkbox-property.tpl'), json));
-            if (!isNull(defaultId)) {
-                var arr = defaultId.split(",");
-                for(var i = 0; i < arr.length; i++){
-                    $('input:checkbox[rowId="' + arr[i] + '"]').attr("checked", true);
-                }
-            } else {
-                $.each(json.rows, function (i, item) {
-                    if (item.isDefault) {
-                        $('input:checkbox[rowId="' + item.id + '"]').attr("checked", true);
-                    }
-                });
-            }
-            form.render('checkbox');
-        } else if (showType == 'radio') {
-            $("#" + showBoxId).html(getDataUseHandlebars('{{#each rows}}<input type="radio" name="' + showBoxId + 'Name" value="{{id}}" title="{{name}}" />{{/each}}', json));
-            if (!isNull(defaultId)) {
-                $("#" + showBoxId + " input:radio[name=" + showBoxId + "Name][value=" + defaultId + "]").attr("checked", true);
-            } else {
-                $.each(json.rows, function (i, item) {
-                    if (item.isDefault) {
-                        $("#" + showBoxId + " input:radio[name=" + showBoxId + "Name][value=" + item.id + "]").attr("checked", true);
-                    }
-                });
-            }
-            form.render('radio');
-        }
-        if (typeof (callback) == "function") {
-            callback(json);
-        }
-    },
-
-    getEnumDataNameByClassName: function (code, key, value, getKey) {
-        var json = systemCommonUtil.getEnumDataListByClassName(code);
-        var result = getInPoingArr(json.rows, key, value, getKey);
-        return isNull(result) ? '' : result;
-    },
-
-    getEnumDataListByClassName: function (code) {
-        var params = {
-            className: encodeURIComponent(skyeyeClassEnum[code]["className"])
-        };
-        if (!isNull(skyeyeClassEnum[code]["filterValue"])) {
-            params["filterValue"] = skyeyeClassEnum[code]["filterValue"];
-            params["filterKey"] = skyeyeClassEnum[code]["filterKey"];
-        }
-        var result = {};
-        AjaxPostUtil.request({url: reqBasePath + "getEnumDataByClassName", params: params, type: 'json', method: "POST", callback: function(json) {
-            result = json;
-        }, async: false});
-        return result;
-    },
+    }
 
 };
\ No newline at end of file

web/src/main/resources/template/json/skyeyeClassEnum.json

@@ -3,6 +3,10 @@
         "name": "启用/禁用",
         "className": "skyeye-pro#com.skyeye.common.enumeration.EnableEnum"
     },
+    "commonIsDefault": {
+        "name": "是否默认",
+        "className": "com.skyeye.common.enumeration.IsDefaultEnum"
+    },
 
     "verificationParams": {
         "name": "字段校验枚举",
@@ -39,4 +43,5 @@
         "name": "视图枚举",
         "className": "skyeye-pro#com.skyeye.common.SkyeyeViewEnum"
     }
+
 }
\ No newline at end of file

web/src/main/resources/template/json/sysServiceMation.json

@@ -38,6 +38,7 @@
     "licenceManageRevert": {"name": "证照归还", "key": "com.skyeye.eve.licence.service.impl.LicenceApplyRevertServiceImpl"},
     "licenceManageBorrow": {"name": "证照借用", "key": "com.skyeye.eve.licence.service.impl.LicenceApplyBorrowServiceImpl"},
 
+    "crmCustomer": {"name": "客户信息", "key": "com.skyeye.customer.service.impl.CustomerServiceImpl"},
     "crmOpportUnity": {"name": "商机审核一阶段", "key": "com.skyeye.opportunity.service.impl.CrmOpportunityServiceImpl"},
     "myCrmContract": {"name": "合同审批", "key": "com.skyeye.contract.service.impl.CrmContractServiceImpl"},
 
@@ -60,5 +61,7 @@
     "bossPersonRequire": {"name": "人员需求申请", "key": "com.skyeye.service.impl.BossPersonRequireServiceImpl"},
     "bossInterviewRegularWorker": {"name": "转正申请", "key": "com.skyeye.service.impl.BossInterviewRegularWorkerServiceImpl"},
     "bossInterviewQuit": {"name": "离职申请", "key": "com.skyeye.service.impl.BossInterviewQuitServiceImpl"},
-    "bossInterviewJobTransfer": {"name": "岗位调动申请", "key": "com.skyeye.service.impl.BossInterviewJobTransferServiceImpl"}
+    "bossInterviewJobTransfer": {"name": "岗位调动申请", "key": "com.skyeye.service.impl.BossInterviewJobTransferServiceImpl"},
+
+    "contacts": {"name": "联系人", "key": "com.skyeye.contacts.service.impl.ContactsServiceImpl"}
 }
\ No newline at end of file