diff --git a/crm/src/main/resources/template/js/crmCustomerContact/crmCustomerContactAdd.js b/base-server/src/main/resources/template/js/crmCustomerContact/crmCustomerContactAdd.js similarity index 100% rename from crm/src/main/resources/template/js/crmCustomerContact/crmCustomerContactAdd.js rename to base-server/src/main/resources/template/js/crmCustomerContact/crmCustomerContactAdd.js diff --git a/crm/src/main/resources/template/js/crmCustomerContact/crmCustomerContactEdit.js b/base-server/src/main/resources/template/js/crmCustomerContact/crmCustomerContactEdit.js similarity index 100% rename from crm/src/main/resources/template/js/crmCustomerContact/crmCustomerContactEdit.js rename to base-server/src/main/resources/template/js/crmCustomerContact/crmCustomerContactEdit.js diff --git a/crm/src/main/resources/template/js/crmCustomerContact/crmCustomerContactList.js b/base-server/src/main/resources/template/js/crmCustomerContact/crmCustomerContactList.js similarity index 100% rename from crm/src/main/resources/template/js/crmCustomerContact/crmCustomerContactList.js rename to base-server/src/main/resources/template/js/crmCustomerContact/crmCustomerContactList.js diff --git a/crm/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactAdd.html b/base-server/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactAdd.html similarity index 100% rename from crm/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactAdd.html rename to base-server/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactAdd.html diff --git a/crm/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactEdit.html b/base-server/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactEdit.html similarity index 100% rename from crm/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactEdit.html rename to base-server/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactEdit.html diff --git a/crm/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactEditTemplate.tpl b/base-server/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactEditTemplate.tpl similarity index 100% rename from crm/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactEditTemplate.tpl rename to base-server/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactEditTemplate.tpl diff --git a/crm/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactList.html b/base-server/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactList.html similarity index 100% rename from crm/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactList.html rename to base-server/src/main/resources/template/tpl/crmCustomerContact/crmCustomerContactList.html diff --git a/common/src/main/resources/template/js/sysDictData/sysDictDataAdd.js b/common/src/main/resources/template/js/sysDictData/sysDictDataAdd.js index 26761a77fd7dac66dcb1ee43c6989b121b500f89..0d2ea92185f47b6197cffcc58cbce29e5b91a418 100644 --- a/common/src/main/resources/template/js/sysDictData/sysDictDataAdd.js +++ b/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'); }); diff --git a/common/src/main/resources/template/js/sysDictData/sysDictDataEdit.js b/common/src/main/resources/template/js/sysDictData/sysDictDataEdit.js index 2ee686656be0143125dced438a89d910902e815e..d9c62ce582e0a33552ec7ba658f15574d4269db0 100644 --- a/common/src/main/resources/template/js/sysDictData/sysDictDataEdit.js +++ b/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'); diff --git a/common/src/main/resources/template/js/sysDictType/sysDictTypeAdd.js b/common/src/main/resources/template/js/sysDictType/sysDictTypeAdd.js index 7ab3245a21ce1d9d20b12f28449e107d64501156..05d3581f05c2a5134150d932f774e2f78000d58e 100644 --- a/common/src/main/resources/template/js/sysDictType/sysDictTypeAdd.js +++ b/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( + `
+ +
+ +
例如：多级字典为三级，这里设置为2，那么只有二级和二级的所有子层级可以选择
+
+
`); + } + }); + 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) { diff --git a/common/src/main/resources/template/js/sysDictType/sysDictTypeEdit.js b/common/src/main/resources/template/js/sysDictType/sysDictTypeEdit.js index c1316120fda47656b361601c5eb74b9a617b0a91..55b2a8097a94e33ed97c38eab3355f2cf632e725 100644 --- a/common/src/main/resources/template/js/sysDictType/sysDictTypeEdit.js +++ b/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( + `
+ +
+ +
例如：多级字典为三级，这里设置为2，那么只有二级和二级的所有子层级可以选择
+
+
`); + } + }); + + if (json.bean.dictType == 2) { + $("#dictTypeBox").after( + `
+ +
+ +
例如：多级字典为三级，这里设置为2，那么只有二级和二级的所有子层级可以选择
+
+
`); + } + $("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) { diff --git a/common/src/main/resources/template/js/sysDictType/sysDictTypeList.js b/common/src/main/resources/template/js/sysDictType/sysDictTypeList.js index 05815c12e612a6eb6cfb6b67a2cf383cb6aae12e..d357e5351ef1a97f6d3a5c3a1f002c8f300425c1 100644 --- a/common/src/main/resources/template/js/sysDictType/sysDictTypeList.js +++ b/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 "启用"; - } else if (d.status == 1) { - return "禁用"; - } + { 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 }, diff --git a/common/src/main/resources/template/tpl/sysDictType/sysDictTypeAdd.html b/common/src/main/resources/template/tpl/sysDictType/sysDictTypeAdd.html index 2c4884ef2dd0d2c4350701db84af736ea9b2f2a4..7cb6520926e4b05959fba437171006260ef14aa3 100644 --- a/common/src/main/resources/template/tpl/sysDictType/sysDictTypeAdd.html +++ b/common/src/main/resources/template/tpl/sysDictType/sysDictTypeAdd.html @@ -17,17 +17,22 @@
- +
- -
Code不能重复。
+ +
编码不能重复。
+
+
+
+
+
- - + +
diff --git a/common/src/main/resources/template/tpl/sysDictType/sysDictTypeEdit.html b/common/src/main/resources/template/tpl/sysDictType/sysDictTypeEdit.html index c9523d7a078f902e5593a24b941bf288b7a6bf0c..a57fbbbe6584f3b9320701d0c277e31cf35d5e76 100644 --- a/common/src/main/resources/template/tpl/sysDictType/sysDictTypeEdit.html +++ b/common/src/main/resources/template/tpl/sysDictType/sysDictTypeEdit.html @@ -23,17 +23,22 @@
- +
- -
Code不能重复。
+ +
编码不能重复。
+
+
+
+
+
- - + +
diff --git a/erp/src/main/resources/template/js/material/materialAdd.js b/erp/src/main/resources/template/js/material/materialAdd.js index 425933e7506b9cfb86d804ff623f085338eb749f..179473770113228f0794252d88b0751c8c636e85 100644 --- a/erp/src/main/resources/template/js/material/materialAdd.js +++ b/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(); diff --git a/erp/src/main/resources/template/js/material/materialDetails.js b/erp/src/main/resources/template/js/material/materialDetails.js index d4746e79f9fe046222cf39c031d73ea0b6d883d4..b29f1041447af4be8ccd764a5872b9f3b9c85f1e 100644 --- a/erp/src/main/resources/template/js/material/materialDetails.js +++ b/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', diff --git a/erp/src/main/resources/template/js/material/materialEdit.js b/erp/src/main/resources/template/js/material/materialEdit.js index 379b44af61bcc58b193179508eabe56da25fcc44..53d599e0ef0d99a319b32099972231236e39d30a 100644 --- a/erp/src/main/resources/template/js/material/materialEdit.js +++ b/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); diff --git a/web/src/main/resources/template/assets/lib/layui/custom.js b/web/src/main/resources/template/assets/lib/layui/custom.js index 43ada720674511b710913c7249ff0157cd5cc382..959122f07cf39d53360ed9f2bcd7c2c6dcd07493 100644 --- a/web/src/main/resources/template/assets/lib/layui/custom.js +++ b/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", // 动态枚举插件 }; //系统基础信息 diff --git a/web/src/main/resources/template/assets/lib/layui/customer/dsFormUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js similarity index 100% rename from web/src/main/resources/template/assets/lib/layui/customer/dsFormUtil.js rename to web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js diff --git a/web/src/main/resources/template/assets/lib/layui/customer/schoolUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/schoolUtil.js similarity index 100% rename from web/src/main/resources/template/assets/lib/layui/customer/schoolUtil.js rename to web/src/main/resources/template/assets/lib/layui/customer/skyeye/schoolUtil.js diff --git a/web/src/main/resources/template/assets/lib/layui/customer/skyeye/skyeyeClassEnumUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/skyeyeClassEnumUtil.js new file mode 100644 index 0000000000000000000000000000000000000000..7a13c5ab4dea6c7ba7916a07a24ce519c527f671 --- /dev/null +++ b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/skyeyeClassEnumUtil.js @@ -0,0 +1,96 @@ + +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}}{{/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; + } + +}; diff --git a/web/src/main/resources/template/assets/lib/layui/customer/sysDictDataUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/sysDictDataUtil.js similarity index 59% rename from web/src/main/resources/template/assets/lib/layui/customer/sysDictDataUtil.js rename to web/src/main/resources/template/assets/lib/layui/customer/skyeye/sysDictDataUtil.js index 49d7f472f5f09a8d06310cd5e7430bd2ee9596a9..457b9d49dc1820a6e3b4ea87553551b18bc14086 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/sysDictDataUtil.js +++ b/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; + } + }; diff --git a/web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js index 104b331f9c010996edb75f421f5a137fa86f8bff..3b6b0cf0e5067ce7d13c5c1d69d3e6b19e8b8547 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js +++ b/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}}{{/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 diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json index a8ac2a01f3e820f245e990e623392290d8f01ad5..46b3728560fbfbf5afdd383daaed0f6c022abd60 100644 --- a/web/src/main/resources/template/json/skyeyeClassEnum.json +++ b/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 diff --git a/web/src/main/resources/template/json/sysServiceMation.json b/web/src/main/resources/template/json/sysServiceMation.json index cab60456322e3f9160923247f6b2f2cfd518448f..213649beef97f19c7578bf3e6c7572bd808bf1c7 100644 --- a/web/src/main/resources/template/json/sysServiceMation.json +++ b/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