diff --git a/activiti/src/main/resources/template/js/myActiviti/initiatedProcess.js b/activiti/src/main/resources/template/js/myActiviti/initiatedProcess.js index 8c8abcb5af59736e8750a49ecf3ff2f40b2e5095..41175424c94fb31c05d68ebddd68890adedde3ae 100644 --- a/activiti/src/main/resources/template/js/myActiviti/initiatedProcess.js +++ b/activiti/src/main/resources/template/js/myActiviti/initiatedProcess.js @@ -76,49 +76,13 @@ layui.config({ table.on('tool(messageMyStartTable)', function (obj) { var data = obj.data; var layEvent = obj.event; - if (layEvent === 'edit') { //编辑 - edit(data); - } else if (layEvent === 'details') { //详情 + if (layEvent === 'details') { //详情 activitiUtil.activitiDetails(data); - } else if (layEvent === 'revoke') { //撤销 - revoke(data); } else if (layEvent === 'refreshPic') { //刷新流程图 refreshPic(data); } }); - //编辑 - function edit(data) { - sequenceId = data.sequenceId; - taskId = data.id; - processInstanceId = data.processInstanceId; - rowId = data.dataId; - _openNewWindows({ - url: data.editPageUrl, - title: systemLanguage["com.skyeye.editPageTitle"][languageType], - pageId: "myactivitiedit", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - } - }); - } - - //撤销 - function revoke(data) { - if(isNull(data.revokeMapping)){//撤销接口为空 - winui.window.msg('撤销接口调用失败', {icon: 2, time: 2000}); - return false; - } - layer.confirm('确定撤销该流程吗？', { icon: 3, title: '撤销操作' }, function (index) { - layer.close(index); - AjaxPostUtil.request({url: flowableBasePath + data.revokeMapping, params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { - winui.window.msg("撤销成功", {icon: 1, time: 2000}); - reloadMyStartTable(); - }}); - }); - } - //刷新流程图 function refreshPic(data) { layer.confirm('确认重新生成流程图吗？', { icon: 3, title: '刷新流程图操作' }, function (i) { diff --git a/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js b/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js index 4e10c7c24850748e826fcc867ff421f23a7e0e66..ff1e8d4c8814ad2d0864cbd048e2abdf495dfc8c 100644 --- a/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js +++ b/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js @@ -33,7 +33,7 @@ layui.config({ cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { field: 'processInstanceId', title: '流程ID', width: 280, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'taskType', title: '类型', width: 150, templet: function (d) { return d.processMation.title; diff --git a/activiti/src/main/resources/template/tpl/myActiviti/initiatedProcess.html b/activiti/src/main/resources/template/tpl/myActiviti/initiatedProcess.html index 2778d3819fa54a6b9d6993573040c3fc34ac3a1b..cdeeddf177d9eaab023c818275a3e60797949ec7 100644 --- a/activiti/src/main/resources/template/tpl/myActiviti/initiatedProcess.html +++ b/activiti/src/main/resources/template/tpl/myActiviti/initiatedProcess.html @@ -33,10 +33,6 @@
diff --git a/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseList.js b/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseList.js index 763c461723105e8c2571c51c9bc0c534627e3d35..79033542a1b21f7c686730092ee68b416849693a 100644 --- a/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseList.js +++ b/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseList.js @@ -31,7 +31,7 @@ layui.config({ }}, { field: 'title', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseList.js b/admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseList.js index 6ca3bf4487e63742fd13f2038fcda0892eaa3cbc..11922a094e4c6b77224b04858f7c591ac96c71ab 100644 --- a/admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseList.js +++ b/admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseList.js @@ -31,7 +31,7 @@ layui.config({ }}, { field: 'title', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/admin-assistant/src/main/resources/template/js/assetManage/assetManageChoose.js b/admin-assistant/src/main/resources/template/js/assetManage/assetManageChoose.js index ae4b9b074418ac61f340c9162d5c866aeabb1112..1f06b62ccb3fd48f69e571cbb4fa69336297cab3 100644 --- a/admin-assistant/src/main/resources/template/js/assetManage/assetManageChoose.js +++ b/admin-assistant/src/main/resources/template/js/assetManage/assetManageChoose.js @@ -138,7 +138,6 @@ layui.config({ }); form.render(); - $("body").on("click", "#reloadTable", function() { loadTable(); }); diff --git a/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js b/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js index 568944727e7188f1a08a41ffec70cc682c1b5f00..d0f09afa07df02d22a673c874cac54574fedc9bb 100644 --- a/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js +++ b/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js @@ -32,7 +32,7 @@ layui.config({ }}, { field: 'title', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnList.js b/admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnList.js index c3c6a16a69e365a4f05da2ae535784cb4d5411ff..4ffea078f7d6655d4a883b12d988c2b957746338 100644 --- a/admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnList.js +++ b/admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnList.js @@ -32,7 +32,7 @@ layui.config({ }}, { field: 'title', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js b/admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js index 8a977b4f578db49a1c328e1e3bd91c2f7013cd04..adab5381d8ebe1fe46e0d48025926b3d1cb58467 100644 --- a/admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js +++ b/admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js @@ -32,7 +32,7 @@ layui.config({ }}, { field: 'title', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js b/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js index 590aa544c6f617c57eb431b6211b8fd3b11d0198..3064aecd374a50945d3ca964bfd4c01663d4d9ca 100644 --- a/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js +++ b/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js @@ -37,10 +37,10 @@ layui.config({ return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("assetReportState", 'id', d.state, 'name'); }}, { field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) { - return isNull(d.assetAdminMation) ? '' : d.assetAdminMation.name; + return getNotUndefinedVal(d.assetAdminMation?.name); }}, { field: 'useUserMation', title: '申领人', width: 120, templet: function(d) { - return isNull(d.useUserMation) ? '' : d.useUserMation.name; + return getNotUndefinedVal(d.useUserMation?.name); }}, { field: 'storageArea', title: '存放区域', width: 140 }, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 }, diff --git a/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportMyUseChoose.js b/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportMyUseChoose.js index ea8c069a2ded4f3b218aecad03f8b975db87f60e..d3f1ae227d6d9401cb728aacbe0e034caffb5edc 100644 --- a/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportMyUseChoose.js +++ b/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportMyUseChoose.js @@ -59,7 +59,7 @@ layui.config({ { field: 'assetNum', title: '资产编号', align: 'left', width: 150 }, { field: 'specifications', title: '资产规格', align: 'left', width: 120 }, { field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) { - return isNull(d.assetAdminMation) ? '' : d.assetAdminMation.name; + return getNotUndefinedVal(d.assetAdminMation?.name); }}, { field: 'createTime', title: '申领时间', align: 'center', width: 150 }, ]], diff --git a/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportUnUseChoose.js b/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportUnUseChoose.js index 52f1ef0d9b6a4258af4081dcaffbe2810ff66312..f051080a575f33ff42f5a0308d2d0720b62c7e49 100644 --- a/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportUnUseChoose.js +++ b/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportUnUseChoose.js @@ -59,7 +59,7 @@ layui.config({ { field: 'assetNum', title: '资产编号', width: 160 }, { field: 'storageArea', title: '存放区域', width: 200 }, { field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) { - return isNull(d.assetAdminMation) ? '' : d.assetAdminMation.name; + return getNotUndefinedVal(d.assetAdminMation?.name); }}, ]], done: function(res) { diff --git a/admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveList.js b/admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveList.js index 5c9881bdded6811378d7b270b8f23307ba7a9d33..ed057b8b0471b9eed242e7bd14cd59cf2e5f7b9d 100644 --- a/admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveList.js +++ b/admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveList.js @@ -32,7 +32,7 @@ layui.config({ }}, { field: 'title', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/admin-assistant/src/main/resources/template/js/gw/gwDocumentSeeList.js b/admin-assistant/src/main/resources/template/js/gw/gwDocumentSeeList.js new file mode 100644 index 0000000000000000000000000000000000000000..91fb4504e5ffd050cefe6c804fcf7eb6a2e8ecb8 --- /dev/null +++ b/admin-assistant/src/main/resources/template/js/gw/gwDocumentSeeList.js @@ -0,0 +1,70 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + table = layui.table; + + // 加载列表数据权限 + loadAuthBtnGroup('messageTable', '1714464811697'); + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.admBasePath + 'queryGwSendDocumentList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, + { field: 'title', title: '标题', width: 300 }, + { field: 'sendDepartmentMation', title: '发文部门', width: 150, templet: function (d) { + return getNotUndefinedVal(d.sendDepartmentMation?.name); + }}, + { field: 'year', title: '年份', align: 'center', width: 100 }, + { field: 'number', title: '第几号文', align: 'center', width: 100 }, + { field: 'enterprise', title: '企字', align: 'center', width: 100 }, + { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }, + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#messageTableBar' } + ]], + done: function(json) { + matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入标题", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); + } + }); + + // 操作事件 + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'preview') {//预览 + systemCommonUtil.showPicImg(systemCommonUtil.getFilePath(data.picPath)); + } else if (layEvent === 'download') {//下载 + download(fileBasePath + data.path, data.title); + } + }); + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('gwDocumentSeeList', {}); +}); diff --git a/admin-assistant/src/main/resources/template/js/gw/gwReceiveDocumentList.js b/admin-assistant/src/main/resources/template/js/gw/gwReceiveDocumentList.js new file mode 100644 index 0000000000000000000000000000000000000000..dba432112c32cc674db563f6bfdb807bfd5cf4d0 --- /dev/null +++ b/admin-assistant/src/main/resources/template/js/gw/gwReceiveDocumentList.js @@ -0,0 +1,179 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + table = layui.table; + var serviceClassName = sysServiceMation["gwReceiveDocumentService"]["key"]; + + authBtn('1714142882792'); + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.admBasePath + 'queryGwReceiveDocumentList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, + { field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) { + return '' + d.oddNumber + ''; + }}, + { field: 'title', title: '标题', width: 300 }, + { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, + { field: 'secret', title: '密集级别', width: 90, align: 'center', templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentSecret", 'id', d.secret, 'name'); + }}, + { field: 'period', title: '保密期间', width: 90, align: 'center', templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentPeriod", 'id', d.period, 'name'); + }}, + { field: 'urgency', title: '紧急程度', width: 90, align: 'center', templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentUrgency", 'id', d.urgency, 'name'); + }}, + { field: 'openCategory', title: '公开类别', width: 90, align: 'center', templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentOpenCategory", 'id', d.openCategory, 'name'); + }}, + { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); + }}, + { field: 'year', title: '年份', align: 'center', width: 100 }, + { field: 'number', title: '第几号文', align: 'center', width: 100 }, + { field: 'enterprise', title: '企字', align: 'center', width: 100 }, + { 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: '#messageTableBar' } + ]], + done: function(json) { + matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号，标题", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); + } + }); + + // 操作事件 + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'details') { //详情 + details(data); + } else if (layEvent === 'processDetails') { //流程详情 + activitiUtil.activitiDetails(data); + } else if (layEvent === 'edit') { //编辑 + edit(data); + } else if (layEvent === 'subApproval') { //提交审批 + subApproval(data); + } else if (layEvent === 'cancellation') {//作废 + cancellation(data); + } else if (layEvent === 'revoke') {//撤销 + revoke(data); + } + }); + + // 撤销 + function revoke(data) { + var msg = '确认撤销该申请吗？'; + layer.confirm(msg, { icon: 3, title: '撤销操作'}, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.admBasePath + "revokeGwReceiveDocument", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 编辑 + function edit(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024042700006&id=' + data.id, null), + title: "外部收文申请", + pageId: "gwDocumentEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + } + }); + } + + // 提交审批 + function subApproval(data) { + layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) { + layer.close(index); + activitiUtil.startProcess(serviceClassName, null, function (approvalId) { + var params = { + id: data.id, + approvalId: approvalId + }; + AjaxPostUtil.request({url: sysMainMation.admBasePath + "submitGwReceiveDocumentToApproval", params: params, type: 'json', method: "POST", callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + }); + } + + // 作废 + function cancellation(data) { + var msg = '确认作废该申请吗？'; + layer.confirm(msg, { icon: 3, title: '作废操作' }, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.admBasePath + "invalidGwReceiveDocument", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 详情 + function details(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024042700007&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "gwDocumentDetails", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + } + }); + } + + // 添加 + $("body").on("click", "#addBean", function() { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024042700005', null), + title: "外部收文申请", + pageId: "gwDocumentAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('gwReceiveDocumentList', {}); +}); diff --git a/admin-assistant/src/main/resources/template/js/gw/gwSendDocumentList.js b/admin-assistant/src/main/resources/template/js/gw/gwSendDocumentList.js new file mode 100644 index 0000000000000000000000000000000000000000..a36cd14e9f8a2102a6ea7f488996366a2ceb835d --- /dev/null +++ b/admin-assistant/src/main/resources/template/js/gw/gwSendDocumentList.js @@ -0,0 +1,186 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + table = layui.table; + var serviceClassName = sysServiceMation["gwSendDocumentService"]["key"]; + + authBtn('1714130289379'); + + // 加载列表数据权限 + loadAuthBtnGroup('messageTable', '1714130296761'); + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.admBasePath + 'queryGwSendDocumentList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, + { field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) { + return '' + d.oddNumber + ''; + }}, + { field: 'title', title: '标题', width: 300 }, + { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, + { field: 'secret', title: '密集级别', width: 90, align: 'center', templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentSecret", 'id', d.secret, 'name'); + }}, + { field: 'period', title: '保密期间', width: 90, align: 'center', templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentPeriod", 'id', d.period, 'name'); + }}, + { field: 'urgency', title: '紧急程度', width: 90, align: 'center', templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentUrgency", 'id', d.urgency, 'name'); + }}, + { field: 'openCategory', title: '公开类别', width: 90, align: 'center', templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentOpenCategory", 'id', d.openCategory, 'name'); + }}, + { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); + }}, + { field: 'year', title: '年份', align: 'center', width: 100 }, + { field: 'number', title: '第几号文', align: 'center', width: 100 }, + { field: 'enterprise', title: '企字', align: 'center', width: 100 }, + { 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: 280, toolbar: '#messageTableBar' } + ]], + done: function(json) { + matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号，标题", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); + } + }); + + // 操作事件 + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'details') { //详情 + details(data); + } else if (layEvent === 'processDetails') { //流程详情 + activitiUtil.activitiDetails(data); + } else if (layEvent === 'edit') { //编辑 + edit(data); + } else if (layEvent === 'subApproval') { //提交审批 + subApproval(data); + } else if (layEvent === 'cancellation') {//作废 + cancellation(data); + } else if (layEvent === 'revoke') {//撤销 + revoke(data); + } else if (layEvent === 'preview') {//预览 + systemCommonUtil.showPicImg(systemCommonUtil.getFilePath(data.picPath)); + } else if (layEvent === 'download') {//下载 + download(fileBasePath + data.path, data.title); + } + }); + + // 撤销 + function revoke(data) { + var msg = '确认撤销该申请吗？'; + layer.confirm(msg, { icon: 3, title: '撤销操作'}, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.admBasePath + "revokeGwSendDocument", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 编辑 + function edit(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024042700002&id=' + data.id, null), + title: "发文申请", + pageId: "gwSendDocumentEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + } + }); + } + + // 提交审批 + function subApproval(data) { + layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) { + layer.close(index); + activitiUtil.startProcess(serviceClassName, null, function (approvalId) { + var params = { + id: data.id, + approvalId: approvalId + }; + AjaxPostUtil.request({url: sysMainMation.admBasePath + "submitGwSendDocumentToApproval", params: params, type: 'json', method: "POST", callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + }); + } + + // 作废 + function cancellation(data) { + var msg = '确认作废该申请吗？'; + layer.confirm(msg, { icon: 3, title: '作废操作' }, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.admBasePath + "invalidGwSendDocument", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 详情 + function details(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024042700003&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "gwSendDocumentDetails", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + } + }); + } + + // 添加 + $("body").on("click", "#addBean", function() { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024042700001', null), + title: "发文申请", + pageId: "gwSendDocumentAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('gwSendDocumentList', {}); +}); diff --git a/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js b/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js index 1dad8380b6188038709dbeedb1dc15e443b78b49..ed95bae1232560bc4ee832a115bc6dbc3f98791c 100644 --- a/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js +++ b/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js @@ -31,7 +31,7 @@ layui.config({ }}, { field: 'title', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertList.js b/admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertList.js index a76ad8aff0148b28e3119b361a7061b57ff82fab..82a57b26e67d3ee3a0bc3ae4de13558b4ed665ce 100644 --- a/admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertList.js +++ b/admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertList.js @@ -31,7 +31,7 @@ layui.config({ }}, { field: 'title', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/admin-assistant/src/main/resources/template/js/myHasMation/myAssetManagement.js b/admin-assistant/src/main/resources/template/js/myHasMation/myAssetManagement.js index 6f5fc3cc3cf7351da1fd5b95c6e1d317da3417ee..a6a124acdb80b97ece9e60b24ca7de765649cbae 100644 --- a/admin-assistant/src/main/resources/template/js/myHasMation/myAssetManagement.js +++ b/admin-assistant/src/main/resources/template/js/myHasMation/myAssetManagement.js @@ -32,7 +32,7 @@ layui.config({ }}, { field: 'assetNum', title: '资产编号', align: 'left', width: 150 }, { field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) { - return isNull(d.assetAdminMation) ? '' : d.assetAdminMation.name; + return getNotUndefinedVal(d.assetAdminMation?.name); }}, { field: 'createTime', title: '申领时间', align: 'center', width: 150 }, ]], 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 e2a4a4b937f80de8d0a6220caad9474c07656e96..5a33f2c2a8f458f64a3ec28d88e38a21d76380d4 100644 --- a/admin-assistant/src/main/resources/template/js/myHasMation/myLicenceManagement.js +++ b/admin-assistant/src/main/resources/template/js/myHasMation/myLicenceManagement.js @@ -26,7 +26,7 @@ layui.config({ { field: 'name', title: '证照名称', align: 'left', width: 140 }, { field: 'licenceNum', title: '证照编号', align: 'left', width: 160 }, { field: 'licenceAdmin', title: '管理员', align: 'left', width: 120, templet: function(d) { - return isNull(d.licenceAdminMation) ? '' : d.licenceAdminMation.name; + return getNotUndefinedVal(d.licenceAdminMation?.name); }}, ]], done: function(json) { 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 d368da9ea15cbee327204ae60e0097cfc8210196..f3e143d66900af610fe7004680db8b10a06944ca 100644 --- a/admin-assistant/src/main/resources/template/js/myHasMation/mySealManagement.js +++ b/admin-assistant/src/main/resources/template/js/myHasMation/mySealManagement.js @@ -25,7 +25,7 @@ layui.config({ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { field: 'name', title: '印章名称', align: 'left', width: 150 }, { field: 'licenceAdmin', title: '管理员', align: 'left', width: 120, templet: function(d) { - return isNull(d.licenceAdminMation) ? '' : d.licenceAdminMation.name; + return getNotUndefinedVal(d.licenceAdminMation?.name); }}, ]], done: function(json) { diff --git a/admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowList.js b/admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowList.js index 8030dc294f554d5da217ccc8abfd7fc5bae9ed85..30c3d2920e7d114988a60c07dc4ddb24b921c074 100644 --- a/admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowList.js +++ b/admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowList.js @@ -31,7 +31,7 @@ layui.config({ }}, { field: 'title', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertList.js b/admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertList.js index 3536e4a208aacf98491351b90f39aec51eb5eb1d..853403b12ca2993eab2f226962cfd57fce489f06 100644 --- a/admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertList.js +++ b/admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertList.js @@ -31,7 +31,7 @@ layui.config({ }}, { field: 'title', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseList.js b/admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseList.js index 3bedb2962ca31a2cec948e5a55b28ea43fa38c4a..846c5300aef2a0f85ec957b899a1f128ed235257 100644 --- a/admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseList.js +++ b/admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseList.js @@ -31,7 +31,7 @@ layui.config({ }}, { field: 'title', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/admin-assistant/src/main/resources/template/tpl/assetManage/assetManageChoose.html b/admin-assistant/src/main/resources/template/tpl/assetManage/assetManageChoose.html index 689a3a5c0dba47b450fbd1a2a4ec9c047deec447..77aa538dabd3a603dcf119f9e9b05bc9cb941c0b 100644 --- a/admin-assistant/src/main/resources/template/tpl/assetManage/assetManageChoose.html +++ b/admin-assistant/src/main/resources/template/tpl/assetManage/assetManageChoose.html @@ -17,9 +17,7 @@
-
-
-
+
diff --git a/admin-assistant/src/main/resources/template/tpl/gw/gwDocumentSeeList.html b/admin-assistant/src/main/resources/template/tpl/gw/gwDocumentSeeList.html new file mode 100644 index 0000000000000000000000000000000000000000..dcc627ed9eaf6fbfd949f27c2f1ba12974097554 --- /dev/null +++ b/admin-assistant/src/main/resources/template/tpl/gw/gwDocumentSeeList.html @@ -0,0 +1,28 @@ + + + + + + + + + +
+
+ +
+
+
+
+ +
+ + + + + \ No newline at end of file diff --git a/admin-assistant/src/main/resources/template/tpl/gw/gwReceiveDocumentList.html b/admin-assistant/src/main/resources/template/tpl/gw/gwReceiveDocumentList.html new file mode 100644 index 0000000000000000000000000000000000000000..f2007ae68c141c7749c28b368bbbdc59c10b9778 --- /dev/null +++ b/admin-assistant/src/main/resources/template/tpl/gw/gwReceiveDocumentList.html @@ -0,0 +1,43 @@ + + + + + + + + + +
+
+ + +
+
+
+
+ +
+ + + + + \ No newline at end of file diff --git a/admin-assistant/src/main/resources/template/tpl/gw/gwSendDocumentList.html b/admin-assistant/src/main/resources/template/tpl/gw/gwSendDocumentList.html new file mode 100644 index 0000000000000000000000000000000000000000..53192d478b4f64f2223119e7ebe50f5fdefa158f --- /dev/null +++ b/admin-assistant/src/main/resources/template/tpl/gw/gwSendDocumentList.html @@ -0,0 +1,45 @@ + + + + + + + + + +
+
+ + +
+
+
+
+ +
+ + + + + \ No newline at end of file diff --git a/base-server/src/main/resources/template/js/teamBusiness/teamBusinessDetails.js b/base-server/src/main/resources/template/js/teamBusiness/teamBusinessDetails.js index ed81b24924f1e842e5d922d11733915ac6a6a11b..2f53490b8cb741ffd9915fba7ac716f1944205ed 100644 --- a/base-server/src/main/resources/template/js/teamBusiness/teamBusinessDetails.js +++ b/base-server/src/main/resources/template/js/teamBusiness/teamBusinessDetails.js @@ -34,23 +34,25 @@ layui.config({ }); loadTreeTable(); // 解析成员信息 - $.each(json.bean.teamRoleList, function (i, item) { - treeTableData.push({ - id: item.roleId, - pId: '0', - name: item.name - }); - $.each(item.teamRoleUserList, function (j, bean) { + if (!isNull(json.bean.teamRoleList)) { + $.each(json.bean.teamRoleList, function (i, item) { treeTableData.push({ - id: bean.userId, - pId: item.roleId, - name: bean.userMation.name, - departmentName: bean.userMation.departmentName, - phone: bean.userMation.phone, - email: bean.userMation.email + id: item.roleId, + pId: '0', + name: item.name + }); + $.each(item.teamRoleUserList, function (j, bean) { + treeTableData.push({ + id: bean.userId, + pId: item.roleId, + name: bean.userMation.name, + departmentName: bean.userMation.departmentName, + phone: bean.userMation.phone, + email: bean.userMation.email + }); }); }); - }); + } // 解析权限信息 $.each(json.bean.teamObjectPermissionList, function (i, item) { diff --git a/base-server/src/main/resources/template/js/teamBusiness/teamBusinessEdit.js b/base-server/src/main/resources/template/js/teamBusiness/teamBusinessEdit.js index e82451d9cdde44fd39285be32ee66c99c2e05e5c..4f3b2a57d5964c0b6d21893eda5a222fdceecc6d 100644 --- a/base-server/src/main/resources/template/js/teamBusiness/teamBusinessEdit.js +++ b/base-server/src/main/resources/template/js/teamBusiness/teamBusinessEdit.js @@ -37,23 +37,25 @@ layui.config({ }); // 解析成员信息 - $.each(json.bean.teamRoleList, function (i, item) { - treeTableData.push({ - id: item.roleId, - pId: '0', - name: item.name - }); - $.each(item.teamRoleUserList, function (j, bean) { + if (!isNull(json.bean.teamRoleList)) { + $.each(json.bean.teamRoleList, function (i, item) { treeTableData.push({ - id: bean.userId, - pId: item.roleId, - name: bean.userMation.name, - departmentName: bean.userMation.departmentName, - phone: bean.userMation.phone, - email: bean.userMation.email + id: item.roleId, + pId: '0', + name: item.name + }); + $.each(item.teamRoleUserList, function (j, bean) { + treeTableData.push({ + id: bean.userId, + pId: item.roleId, + name: bean.userMation.name, + departmentName: bean.userMation.departmentName, + phone: bean.userMation.phone, + email: bean.userMation.email + }); }); }); - }); + } // 解析权限信息 $.each(json.bean.teamObjectPermissionList, function (i, item) { diff --git a/base-server/src/main/resources/template/js/teamTemplate/teamTemplateDetails.js b/base-server/src/main/resources/template/js/teamTemplate/teamTemplateDetails.js index a683fc6cf60c9dc1b091bf74d960e1f76e45112e..5ebba0a44b1e19f6c2d91c3d5b29f8f50ddc4a7b 100644 --- a/base-server/src/main/resources/template/js/teamTemplate/teamTemplateDetails.js +++ b/base-server/src/main/resources/template/js/teamTemplate/teamTemplateDetails.js @@ -29,23 +29,25 @@ layui.config({ ajaxSendAfter: function (json) { loadTreeTable(); // 解析成员信息 - $.each(json.bean.teamRoleList, function (i, item) { - treeTableData.push({ - id: item.roleId, - pId: '0', - name: item.name - }); - $.each(item.teamRoleUserList, function (j, bean) { + if (!isNull(json.bean.teamRoleList)) { + $.each(json.bean.teamRoleList, function (i, item) { treeTableData.push({ - id: bean.userId, - pId: item.roleId, - name: bean.userMation.name, - departmentName: bean.userMation.departmentName, - phone: bean.userMation.phone, - email: bean.userMation.email + id: item.roleId, + pId: '0', + name: item.name + }); + $.each(item.teamRoleUserList, function (j, bean) { + treeTableData.push({ + id: bean.userId, + pId: item.roleId, + name: bean.userMation.name, + departmentName: bean.userMation.departmentName, + phone: bean.userMation.phone, + email: bean.userMation.email + }); }); }); - }); + } // 解析权限信息 $.each(json.bean.teamObjectPermissionList, function (i, item) { diff --git a/base-server/src/main/resources/template/js/teamTemplate/teamTemplateEdit.js b/base-server/src/main/resources/template/js/teamTemplate/teamTemplateEdit.js index a5de2c28c08320f034178a738941a480b5d00fa1..b21a801de585aedf811b88cb201dc9a09db0e641 100644 --- a/base-server/src/main/resources/template/js/teamTemplate/teamTemplateEdit.js +++ b/base-server/src/main/resources/template/js/teamTemplate/teamTemplateEdit.js @@ -38,23 +38,25 @@ layui.config({ loadTreeTable(); // 解析成员信息 - $.each(json.bean.teamRoleList, function (i, item) { - treeTableData.push({ - id: item.roleId, - pId: '0', - name: item.name - }); - $.each(item.teamRoleUserList, function (j, bean) { + if (!isNull(json.bean.teamRoleList)) { + $.each(json.bean.teamRoleList, function (i, item) { treeTableData.push({ - id: bean.userId, - pId: item.roleId, - name: bean.userMation.name, - departmentName: bean.userMation.departmentName, - phone: bean.userMation.phone, - email: bean.userMation.email + id: item.roleId, + pId: '0', + name: item.name + }); + $.each(item.teamRoleUserList, function (j, bean) { + treeTableData.push({ + id: bean.userId, + pId: item.roleId, + name: bean.userMation.name, + departmentName: bean.userMation.departmentName, + phone: bean.userMation.phone, + email: bean.userMation.email + }); }); }); - }); + } // 解析权限信息 $.each(json.bean.teamObjectPermissionList, function (i, item) { diff --git a/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementList.js b/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementList.js index 391a81a99d2ba38f1fce1db5343c1be3daab4921..0c0faeb19c57a9a234dc9662efb6ea7e306dd9fb 100644 --- a/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementList.js +++ b/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementList.js @@ -31,17 +31,17 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'interviewMation', title: '面试者', width: 100, templet: function (d) { - return d.interviewMation.name; + return getNotUndefinedVal(d.interviewMation?.name); }}, { field: 'recruitDepartmentMation', title: '面试部门', width: 140, templet: function (d) { - return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitDepartmentMation.name; + return getNotUndefinedVal(d.personRequireMation?.recruitDepartmentMation?.name); }}, { field: 'recruitJobMation', title: '面试岗位', width: 150, templet: function (d) { - return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitJobMation.name; + return getNotUndefinedVal(d.personRequireMation?.recruitJobMation?.name); }}, { field: 'interviewTime', title: '面试时间', width: 140, align: 'center' }, { field: 'interviewer', title: '面试官', width: 120, templet: function (d) { - return isNull(d.interviewerMation) ? '' : d.interviewerMation.name; + return getNotUndefinedVal(d.interviewerMation?.name); }}, { field: 'state', title: '面试状态', width: 160, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossInterviewArrangementState", 'id', d.state, 'name'); diff --git a/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewerList.js b/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewerList.js index ae1d28a7968586b2dd8a3f1425a7e7b25608a1fc..70997509efa63c656292f87a05e397536c288642 100644 --- a/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewerList.js +++ b/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewerList.js @@ -27,17 +27,17 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'interviewMation', title: '面试者', width: 100, templet: function (d) { - return d.interviewMation.name; + return getNotUndefinedVal(d.interviewMation?.name); }}, { field: 'recruitDepartmentMation', title: '面试部门', width: 140, templet: function (d) { - return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitDepartmentMation.name; + return getNotUndefinedVal(d.personRequireMation?.recruitDepartmentMation?.name); }}, { field: 'recruitJobMation', title: '面试岗位', width: 150, templet: function (d) { - return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitJobMation.name; + return getNotUndefinedVal(d.personRequireMation?.recruitJobMation?.name); }}, { field: 'interviewTime', title: '面试时间', width: 140, align: 'center' }, { field: 'interviewer', title: '面试官', width: 120, templet: function (d) { - return isNull(d.interviewerMation) ? '' : d.interviewerMation.name; + return getNotUndefinedVal(d.interviewerMation?.name); }}, { field: 'state', title: '面试状态', width: 160, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossInterviewArrangementState", 'id', d.state, 'name'); diff --git a/boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js b/boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js index ee16ea5a04e83fc747e8b71771b71c17efdefc45..9f021f5ab698395c0c55d4a05f9cb70febd7dfd6 100644 --- a/boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js +++ b/boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js @@ -62,6 +62,7 @@ layui.config({ form.on('submit(formSubBean)', function(data) { if(winui.verifyForm(data.elem)) { var state = $("input[name='state']:checked").val(); + var inductionState = $("#inductionState").val(); if (state == 6) { // 同意入职 if (isNull($("#entryTime").val())) { @@ -80,7 +81,6 @@ layui.config({ winui.window.msg('请选择入职状态', {icon: 2, time: 2000}); return false; } - var inductionState = $("#inductionState").val(); if (inductionState == '4' && isNull($("#trialTime").val())) { winui.window.msg('请选择预计试用结束日期', {icon: 2, time: 2000}); return false; @@ -93,10 +93,10 @@ layui.config({ entryTime: $("#entryTime").val(), workTime: $("#workTime").val(), userIdCard: $("#userIdCard").val(), - inductionState: inductionState, + inductionState: getNotUndefinedVal(inductionState), trialTime: $("#trialTime").val() }; - AjaxPostUtil.request({url: sysMainMation.bossBasePath + "setInductionResult", params: params, type: 'json', method: "PUT", callback: function(json) { + AjaxPostUtil.request({url: sysMainMation.bossBasePath + "setInductionResult", params: params, type: 'json', method: "POST", callback: function(json) { parent.layer.close(index); parent.refreshCode = '0'; }}); diff --git a/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js index a1ac3b6b2dc4dacdfc4a19f7b1119c01aaa83588..87befd35da7bf9456619800695639ec1742aa83b 100644 --- a/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js +++ b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js @@ -31,7 +31,7 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'transferStaffMation', title: '申请人', rowspan: '2', width: 140, templet: function(d) { - return isNull(d.transferStaffMation) ? '' : d.transferStaffMation.name; + return getNotUndefinedVal(d.transferStaffMation?.name); }}, { title: '原岗位信息', align: 'center', colspan: '4'}, { title: '申请岗位信息', align: 'center', colspan: '4'}, @@ -39,7 +39,7 @@ layui.config({ return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossUserTransferType", 'id', d.transferType, 'name'); }}, { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function(d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); @@ -52,28 +52,28 @@ layui.config({ ], [ { field: 'primaryCompanyName', title: '企业', align: 'left', width: 150, templet: function(d) { - return d.primaryCompanyMation.name; + return getNotUndefinedVal(d.primaryCompanyMation?.name); }}, { field: 'primaryDepartmentName', title: '部门', align: 'left', width: 150, templet: function(d) { - return isNull(d.primaryDepartmentMation) ? '' : d.primaryDepartmentMation.name; + return getNotUndefinedVal(d.primaryDepartmentMation?.name); }}, { field: 'primaryJobName', title: '岗位', align: 'left', width: 150, templet: function(d) { - return isNull(d.primaryJobMation) ? '' : d.primaryJobMation.name; + return getNotUndefinedVal(d.primaryJobMation?.name); }}, { field: 'primaryJobScoreName', title: '岗位定级', align: 'left', width: 150, templet: function(d) { - return isNull(d.primaryJobScoreMation) ? '' : d.primaryJobScoreMation.name; + return getNotUndefinedVal(d.primaryJobScoreMation?.name); }}, { field: 'currentCompanyName', title: '企业', align: 'left', width: 150, templet: function(d) { - return d.currentCompanyMation.name; + return getNotUndefinedVal(d.currentCompanyMation?.name); }}, { field: 'currentDepartmentName', title: '部门', align: 'left', width: 150, templet: function(d) { - return isNull(d.currentDepartmentMation) ? '' : d.currentDepartmentMation.name; + return getNotUndefinedVal(d.currentDepartmentMation?.name); }}, { field: 'currentJobName', title: '岗位', align: 'left', width: 150, templet: function(d) { - return isNull(d.currentJobMation) ? '' : d.currentJobMation.name; + return getNotUndefinedVal(d.currentJobMation?.name); }}, { field: 'currentJobScoreName', title: '岗位定级', align: 'left', width: 150, templet: function(d) { - return isNull(d.currentJobScoreMation) ? '' : d.currentJobScoreMation.name; + return getNotUndefinedVal(d.currentJobScoreMation?.name); }} ] ], @@ -162,7 +162,7 @@ layui.config({ function cancellation(data) { layer.confirm('确认作废该申请吗？', { icon: 3, title: '作废操作' }, function (index) { layer.close(index); - AjaxPostUtil.request({url: sysMainMation.bossBasePath + "invalidJobTransfer", params: {id: data.id}, type: 'json', method: "PUT", callback: function (json) { + AjaxPostUtil.request({url: sysMainMation.bossBasePath + "invalidJobTransfer", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); loadTable(); }}); diff --git a/boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitList.js b/boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitList.js index 63bb959eb7a1b6aa194aa1132eb1faeb2d31a44b..08bb41f907594edd151166b3397528afa09a6057 100644 --- a/boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitList.js +++ b/boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitList.js @@ -35,7 +35,7 @@ layui.config({ }}, { field: 'leaveTime', title: '离职日期', width: 100 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerList.js b/boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerList.js index 69204942340c73393bb112a6e743e250e1d55419..33d201e07e418208b6884e0054a9f0142b8cb1b4 100644 --- a/boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerList.js +++ b/boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerList.js @@ -31,14 +31,14 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'departmentMation', title: '转正部门', width: 140, templet: function (d) { - return isNull(d.departmentMation) ? "" : d.departmentMation.name; + return getNotUndefinedVal(d.departmentMation?.name); }}, { field: 'jobMation', title: '转正岗位', width: 150, templet: function (d) { - return isNull(d.jobMation) ? "" : d.jobMation.name; + return getNotUndefinedVal(d.jobMation?.name); }}, { field: 'regularTime', title: '转正日期', align: 'center', width: 100 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function(d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/boss/src/main/resources/template/js/bossInterviewer/arrangeInterviewerIsMyList.js b/boss/src/main/resources/template/js/bossInterviewer/arrangeInterviewerIsMyList.js index 8e1aa80e8d171ea56262f8c39f11b77471d9ffc7..8fbdbf0381e24cb0bc9669abe2c37518eacfbf98 100644 --- a/boss/src/main/resources/template/js/bossInterviewer/arrangeInterviewerIsMyList.js +++ b/boss/src/main/resources/template/js/bossInterviewer/arrangeInterviewerIsMyList.js @@ -28,17 +28,17 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'interviewMation', title: '面试者', width: 100, templet: function (d) { - return d.interviewMation.name; + return getNotUndefinedVal(d.interviewMation?.name); }}, { field: 'recruitDepartmentMation', title: '面试部门', width: 140, templet: function (d) { - return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitDepartmentMation.name; + return getNotUndefinedVal(d.personRequireMation?.recruitDepartmentMation?.name); }}, { field: 'recruitJobMation', title: '面试岗位', width: 150, templet: function (d) { - return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitJobMation.name; + return getNotUndefinedVal(d.personRequireMation?.recruitJobMation?.name); }}, { field: 'interviewTime', title: '面试时间', width: 120, align: 'center' }, { field: 'interviewer', title: '面试官', width: 120, templet: function (d) { - return isNull(d.interviewerMation) ? '' : d.interviewerMation.name; + return getNotUndefinedVal(d.interviewerMation?.name); }}, { field: 'state', title: '面试状态', width: 160, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossInterviewArrangementState", 'id', d.state, 'name'); diff --git a/boss/src/main/resources/template/js/bossInterviewer/interviewerResult.js b/boss/src/main/resources/template/js/bossInterviewer/interviewerResult.js index 0dc61555545ea1fad7afa70d406a746a97071d21..55c31570778ecf48f473456dece61c2fb03486d4 100644 --- a/boss/src/main/resources/template/js/bossInterviewer/interviewerResult.js +++ b/boss/src/main/resources/template/js/bossInterviewer/interviewerResult.js @@ -33,7 +33,7 @@ layui.config({ state: $("input[name='state']:checked").val(), evaluation: $("#evaluation").val() }; - AjaxPostUtil.request({url: sysMainMation.bossBasePath + "setBossInterviewResult", params: params, type: 'json', method: "PUT", callback: function(json) { + AjaxPostUtil.request({url: sysMainMation.bossBasePath + "setBossInterviewResult", params: params, type: 'json', method: "POST", callback: function(json) { parent.layer.close(index); parent.refreshCode = '0'; }}); diff --git a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireAllList.js b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireAllList.js index 18ad9ef619d0e629006bbeede191b0ccf61c6062..3c3172a4d2e7bda5460a4da9e453c9a526709547 100644 --- a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireAllList.js +++ b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireAllList.js @@ -28,15 +28,16 @@ layui.config({ }}, { field: 'createName', title: '申请人', width: 120}, { field: 'recruitDepartmentMation', title: '需求部门', width: 140, templet: function (d) { - return d.recruitDepartmentMation.name; + return getNotUndefinedVal(d.recruitDepartmentMation?.name); }}, { field: 'recruitJobMation', title: '需求岗位', width: 150, templet: function (d) { - return d.recruitJobMation.name; + return getNotUndefinedVal(d.recruitJobMation?.name); }}, { field: 'wages', title: '薪资范围', width: 120 }, { field: 'recruitNum', title: '需求人数', width: 100 }, + { field: 'recruitedNum', title: '已招聘人数', width: 100 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossPersonRequireState", 'id', d.state, 'name'); diff --git a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireList.js b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireList.js index 50b271b4fcb4d6c616e0fb8d9c4d43178d5a1366..954ece453c8c362c4914645593882bc207a61032 100644 --- a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireList.js +++ b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireList.js @@ -30,19 +30,20 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'recruitDepartmentId', title: '需求部门', align: 'left', width: 140, templet: function (d) { - return d.recruitDepartmentMation.name; + return getNotUndefinedVal(d.recruitDepartmentMation?.name); }}, { field: 'recruitJobId', title: '需求岗位', align: 'left', width: 150, templet: function (d) { - return d.recruitJobMation.name; + return getNotUndefinedVal(d.recruitJobMation?.name); }}, { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossPersonRequireState", 'id', d.state, 'name'); }}, { field: 'wages', title: '薪资范围', width: 120 }, { field: 'recruitNum', title: '需求人数', width: 100 }, + { field: 'recruitedNum', title: '已招聘人数', width: 100 }, { 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 }, diff --git a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeList.js b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeList.js index 5483d278efe7131166e7b42ffbe153cb3eba2c00..d0cc8bc9f07321251a7e7e70769d5d566aa0400c 100644 --- a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeList.js +++ b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeList.js @@ -27,19 +27,20 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'recruitDepartmentId', title: '需求部门', align: 'left', width: 140, templet: function (d) { - return d.recruitDepartmentMation.name; + return getNotUndefinedVal(d.recruitDepartmentMation?.name); }}, { field: 'recruitJobId', title: '需求岗位', align: 'left', width: 150, templet: function (d) { - return d.recruitJobMation.name; + return getNotUndefinedVal(d.recruitJobMation?.name); }}, { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossPersonRequireState", 'id', d.state, 'name'); }}, { field: 'wages', title: '薪资范围', width: 120 }, { field: 'recruitNum', title: '需求人数', width: 100 }, + { field: 'recruitedNum', title: '已招聘人数', width: 100 }, { 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 }, diff --git a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeListChoose.js b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeListChoose.js index cbba81a2359f64f84ed814186d4cca79970f0a36..56d130498e53de30359baefe6df05b2d35febb59 100644 --- a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeListChoose.js +++ b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeListChoose.js @@ -28,16 +28,17 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'recruitDepartmentId', title: '需求部门', align: 'left', width: 140, templet: function (d) { - return d.recruitDepartmentMation.name; + return getNotUndefinedVal(d.recruitDepartmentMation?.name); }}, { field: 'recruitJobId', title: '需求岗位', align: 'left', width: 150, templet: function (d) { - return d.recruitJobMation.name; + return getNotUndefinedVal(d.recruitJobMation?.name); }}, { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossPersonRequireState", 'id', d.state, 'name'); }}, { field: 'wages', title: '薪资范围', width: 120 }, { field: 'recruitNum', title: '需求人数', width: 100 }, + { field: 'recruitedNum', title: '已招聘人数', width: 100 }, { 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 }, @@ -47,7 +48,7 @@ layui.config({ matchingLanguage(); for (var i = 0; i < res.rows.length; i++) { // 招聘结束的设置为不可选中 - if(res.rows[i].state == 'endRecruitment'){ + if (res.rows[i].state == 'endRecruitment') { systemCommonUtil.disabledRow(res.rows[i].LAY_TABLE_INDEX, 'radio'); } } diff --git a/checkwork/src/main/resources/template/js/checkWorkAbnormalAttendance/checkWorkAbnormalAttendanceList.js b/checkwork/src/main/resources/template/js/checkWorkAbnormalAttendance/checkWorkAbnormalAttendanceList.js index afdd6615cc297bf52af9e9be61ae4802f9cb9b1c..57b6bdc5004686d08f0440e350973c590d37a293 100644 --- a/checkwork/src/main/resources/template/js/checkWorkAbnormalAttendance/checkWorkAbnormalAttendanceList.js +++ b/checkwork/src/main/resources/template/js/checkWorkAbnormalAttendance/checkWorkAbnormalAttendanceList.js @@ -30,7 +30,7 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripList.js b/checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripList.js index 3bff8e2f62d208b3d1797912530997fe04e3cad7..e8e07f13971fefb744c8a78d581b0f8f461be607 100644 --- a/checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripList.js +++ b/checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripList.js @@ -31,7 +31,7 @@ layui.config({ }}, { field: 'name', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveList.js b/checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveList.js index c7bf2209b833c2e9662f4e33860d5a539ab31577..5938f9055db215a19f1aad5e6c30f8190ef74474 100644 --- a/checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveList.js +++ b/checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveList.js @@ -31,7 +31,7 @@ layui.config({ }}, { field: 'name', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveList.js b/checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveList.js index d18aacf11667724db684063712fc487e4ba13c40..b85b5afea05351a25a1470c747a1c65f1d9170bc 100644 --- a/checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveList.js +++ b/checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveList.js @@ -31,7 +31,7 @@ layui.config({ }}, { field: 'name', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeList.js b/checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeList.js index 6495d7734179b1c7030dead471d548d0ba531c06..039ba2b03569796bd2f4e8e9a5bce8905610f4e9 100644 --- a/checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeList.js +++ b/checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeList.js @@ -31,7 +31,7 @@ layui.config({ }}, { field: 'name', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/checkwork/src/main/resources/template/js/checkWorkTime/checkWorkTimeList.js b/checkwork/src/main/resources/template/js/checkWorkTime/checkWorkTimeList.js index a3c69851d9da4c3b7951d48b961780c93e24fd54..cc5773b1e76ced5d91b3b2169a03df36869b014e 100644 --- a/checkwork/src/main/resources/template/js/checkWorkTime/checkWorkTimeList.js +++ b/checkwork/src/main/resources/template/js/checkWorkTime/checkWorkTimeList.js @@ -44,7 +44,7 @@ layui.config({ { 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: '最后修改时间', align: 'center', width: 150}, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#tableBar'} + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'} ]], done: function(json) { matchingLanguage(); @@ -63,7 +63,9 @@ layui.config({ delet(data); } else if (layEvent === 'details') { //详情 details(data); - } + } else if (layEvent === 'setOnline') { //线上打卡信息 + setOnline(data); + } }); // 添加 @@ -104,6 +106,19 @@ layui.config({ } }); } + + // 线上打卡信息 + function setOnline(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024042800001&id=' + data.id, null), + title: "设置线上打卡信息", + pageId: "setOnline", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } // 详情 function details(data) { diff --git a/checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeAdd.html b/checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeAdd.html index badf353ab93278d809c860625fb03b06c966e275..9d7451bf1271b785e40c48f00da9ce4b5c94664b 100644 --- a/checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeAdd.html +++ b/checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeAdd.html @@ -64,15 +64,15 @@ 作息时间
- +
- +
- +
- +
diff --git a/checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeEdit.html b/checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeEdit.html index 7a0339d82990ec4e29213702cfeba43b28dbf531..c3484228e4fb95ae806883d67d46255c291b1f30 100644 --- a/checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeEdit.html +++ b/checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeEdit.html @@ -70,15 +70,15 @@ 作息时间
- +
- +
- +
- +
diff --git a/checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeList.html b/checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeList.html index d35fabacb903f9e79f54d21f611cbe6c47aa1a35..acb5b3e6ec44fde0452c33eeac8be5e350a31b13 100644 --- a/checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeList.html +++ b/checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeList.html @@ -23,6 +23,9 @@ {{# if(auth('1603026192319')) { }} {{# } }} + {{# if(auth('1714276416911')) { }} + 线上打卡信息 + {{# } }}
diff --git a/crm/src/main/resources/template/js/crmContract/crmContractList.js b/crm/src/main/resources/template/js/crmContract/crmContractList.js index 71277328f5426c929a48e359b8ad087f4bdd0449..f113bedaaec680150f16b4ebe9777ea449f1aafd 100644 --- a/crm/src/main/resources/template/js/crmContract/crmContractList.js +++ b/crm/src/main/resources/template/js/crmContract/crmContractList.js @@ -38,9 +38,11 @@ layui.config({ }}, { field: 'oddNumber', title: '合同编号', align: 'left', width: 120 }, { field: 'price', title: '合同金额（元）', align: 'left', width: 120 }, + { field: 'paymentPrice', title: '已回款金额（元）', align: 'left', width: 140 }, + { field: 'invoicePrice', title: '已开票金额（元）', align: 'left', width: 140 }, { field: 'signingTime', title: '签约日期', align: 'center', width: 100 }, { field: 'processInstanceId', title: '流程ID', align: 'center', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("crmContractStateEnum", 'id', d.state, 'name'); diff --git a/crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js b/crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js index 4e0d1be7b0a3dccd7e3ae17558f32a72475a19d4..5fbf43fc99fc4a7985971823f4d8554245d1a6b2 100644 --- a/crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js +++ b/crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js @@ -41,7 +41,7 @@ layui.config({ { field: 'oddNumber', title: '商机编号', align: 'left', width: 120 }, { field: 'estimatePrice', title: '预计成交金额', width: 120 }, { field: 'processInstanceId', title: '流程ID', align: 'center', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("crmOpportunityStateEnum", 'id', d.state, 'name'); diff --git a/crm/src/main/resources/template/js/follow/crmFollowList.js b/crm/src/main/resources/template/js/follow/crmFollowList.js new file mode 100644 index 0000000000000000000000000000000000000000..d0b6d5ca2ffd0d3fdaee24b580416002e7eac4f0 --- /dev/null +++ b/crm/src/main/resources/template/js/follow/crmFollowList.js @@ -0,0 +1,154 @@ + +var objectKey = ""; +var objectId = ""; + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + table = layui.table; + objectKey = GetUrlParam("objectKey"); + objectId = GetUrlParam("objectId"); + if (isNull(objectKey) || isNull(objectId)) { + winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000}); + return false; + } + + var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'crmFollowUpAuthEnum'); + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.crmBasePath + 'queryFollowUpList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, + { field: 'oddNumber', title: '回访编号', align: 'left', width: 150, templet: function (d) { + return '' + d.oddNumber + ''; + }}, + { field: 'contractId', title: '合同', width: 200, templet: function (d) { + return getNotUndefinedVal(d.contractMation?.title); + }}, + { field: 'typeId', title: '类型', align: 'center', width: 120, templet: function (d) { + return sysDictDataUtil.getDictDataNameByCodeAndKey('FOLLOW_UP_TYPE', d.typeId); + }}, + { field: 'contacts', title: '联系人', width: 120, templet: function (d) { + return getNotUndefinedVal(d.contactsMation?.name); + }}, + { field: 'satisfaction', title: '客户满意度', align: 'center', width: 120, templet: function (d) { + return sysDictDataUtil.getDictDataNameByCodeAndKey('FOLLOW_UP_SATISFACTION', d.satisfaction); + }}, + { field: 'followUserId', title: '回访人', width: 120, templet: function (d) { + return getNotUndefinedVal(d.followUserMation?.name); + }}, + { field: 'followTime', title: '回访时间', align: 'center', width: 100 }, + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', 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: 150, templet: function (d) { + var str = ''; + if (authPermission['edit']) { + str += '' + } + if (authPermission['delete']) { + str += '' + } + return str; + }} + ]], + done: function(json) { + matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入回访编号", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'edit') { + edit(data); + } else if (layEvent === 'delete') { + del(data); + } else if (layEvent === 'details') { + details(data); + } + }); + + + // 新增 + $("body").on("click", "#addBean", function() { + parent._openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050200001&objectId=' + objectId + '&objectKey=' + objectKey, null), + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "crmFollowAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + + // 编辑 + function edit(data) { + parent._openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050200002&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "crmFollowEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 详情 + function details(data) { + parent._openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050200003&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "crmFollowDetails", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 删除 + function del(data, obj) { + layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.crmBasePath + "deleteFollowUpById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {objectKey: objectKey, objectId: objectId}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('crmFollowList', {}); +}); \ No newline at end of file diff --git a/crm/src/main/resources/template/js/invoice/crmInvoiceList.js b/crm/src/main/resources/template/js/invoice/crmInvoiceList.js new file mode 100644 index 0000000000000000000000000000000000000000..daffa68eecdc64d142673dbb4da9bf8afecde72a --- /dev/null +++ b/crm/src/main/resources/template/js/invoice/crmInvoiceList.js @@ -0,0 +1,217 @@ + +var objectKey = ""; +var objectId = ""; + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + table = layui.table; + objectKey = GetUrlParam("objectKey"); + objectId = GetUrlParam("objectId"); + if (isNull(objectKey) || isNull(objectId)) { + winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000}); + return false; + } + + var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'crmInvoiceAuthEnum'); + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.crmBasePath + 'queryInvoiceList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, + { field: 'oddNumber', title: '单据编号', align: 'center', width: 150, templet: function (d) { + return '' + d.oddNumber + ''; + }}, + { field: 'invoicTime', title: '开票日期', align: 'center', width: 100 }, + { field: 'contractId', title: '合同', width: 200, templet: function (d) { + return getNotUndefinedVal(d.contractMation?.title); + }}, + { field: 'contractId1', title: '合同金额(元)', width: 120, templet: function (d) { + return getNotUndefinedVal(d.contractMation?.price); + }}, + { field: 'price', title: '开票金额（元）', width: 120 }, + { field: 'typeId', title: '开票类型', width: 150, templet: function (d) { + return sysDictDataUtil.getDictDataNameByCodeAndKey('INVOICE_TYPE', d.typeId); + }}, + { field: 'processInstanceId', title: '流程ID', align: 'center', width: 100, templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, + { field: 'invoiceHeaderId', title: '发票抬头', width: 120, templet: function (d) { + return getNotUndefinedVal(d.invoiceHeaderMation?.name); + }}, + { field: 'state', title: '状态', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); + }}, + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', 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: 250, templet: function (d) { + var str = ''; + if (d.editRow == 1) { + if (authPermission['submitToApproval']) { + str += '提交审批'; + } + if (authPermission['edit']) { + str += ''; + } + if (authPermission['delete']) { + str += '删除'; + } + if (authPermission['invalid']) { + str += '作废'; + } + } + if (d.editRow == 2 && d.state == 'inExamine') { + if (authPermission['revoke']) { + str += '撤销'; + } + } + return str; + }} + ]], + done: function(json) { + matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'edit') { //编辑 + edit(data); + } else if (layEvent === 'details'){ //详情 + details(data); + } else if (layEvent === 'processDetails') { //流程详情 + activitiUtil.activitiDetails(data); + } else if (layEvent === 'subApproval') { //提交审批 + subApproval(data); + } else if (layEvent === 'del') { //删除 + del(data); + } else if (layEvent === 'cancellation') { //作废 + cancellation(data); + } else if (layEvent === 'revoke') { //撤销 + revoke(data); + } + }); + + // 新增 + $("body").on("click", "#addBean", function() { + parent._openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050300005&objectId=' + objectId + '&objectKey=' + objectKey, null), + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "crmContractAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + + // 编辑 + function edit(data) { + parent._openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050300006&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "crmContractEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 详情 + function details(data) { + parent._openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050300007&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "crmContractDetails", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + }}); + } + + // 提交审批 + function subApproval(data) { + layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) { + layer.close(index); + activitiUtil.startProcess(data.serviceClassName, null, function (approvalId) { + var params = { + id: data.id, + approvalId: approvalId + }; + AjaxPostUtil.request({url: sysMainMation.crmBasePath + "submitInvoiceToApproval", params: params, type: 'json', method: 'POST', callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + }); + } + + // 删除 + function del(data, obj) { + layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.crmBasePath + "deleteInvoiceById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 作废 + function cancellation(data, obj) { + var msg = '确认作废该条数据吗？'; + layer.confirm(msg, { icon: 3, title: '作废操作' }, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.crmBasePath + "invalidInvoice", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 撤销 + function revoke(data) { + var msg = '确认撤销该数据吗？'; + layer.confirm(msg, { icon: 3, title: '撤销申请提交' }, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.crmBasePath + "revokeInvoice", params: {processInstanceId: data.processInstanceId}, type: 'json', method: 'PUT', callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {objectKey: objectKey, objectId: objectId}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('crmInvoiceList', {}); +}); \ No newline at end of file diff --git a/crm/src/main/resources/template/js/invoiceHeader/crmInvoiceHeaderList.js b/crm/src/main/resources/template/js/invoiceHeader/crmInvoiceHeaderList.js new file mode 100644 index 0000000000000000000000000000000000000000..c1bac230558dcede258b1872ebbc848b14006df0 --- /dev/null +++ b/crm/src/main/resources/template/js/invoiceHeader/crmInvoiceHeaderList.js @@ -0,0 +1,142 @@ + +var objectKey = ""; +var objectId = ""; + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + table = layui.table; + objectKey = GetUrlParam("objectKey"); + objectId = GetUrlParam("objectId"); + if (isNull(objectKey) || isNull(objectId)) { + winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000}); + return false; + } + + var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'crmInvoiceHeaderAuthEnum'); + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.crmBasePath + 'queryInvoiceHeaderList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, + { field: 'name', title: '发票抬头', align: 'left', width: 150, templet: function (d) { + return '' + d.name + ''; + }}, + { field: 'identificationNumber', title: '纳税识别号', width: 150 }, + { field: 'openingBank', title: '开户行', width: 150 }, + { field: 'openingAccount', title: '开户帐号', width: 150 }, + { field: 'billingAddress', title: '开票地址', width: 200 }, + { field: 'phone', title: '电话', width: 120 }, + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', 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: 150, templet: function (d) { + var str = ''; + if (authPermission['edit']) { + str += '' + } + if (authPermission['delete']) { + str += '' + } + return str; + }} + ]], + done: function(json) { + matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入发票抬头，纳税识别号", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'edit') { + edit(data); + } else if (layEvent === 'delete') { + del(data); + } else if (layEvent === 'details') { + details(data); + } + }); + + // 新增 + $("body").on("click", "#addBean", function() { + parent._openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050300002&objectId=' + objectId + '&objectKey=' + objectKey, null), + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "crmInvoiceHeaderAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + + // 编辑 + function edit(data) { + parent._openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050300003&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "crmInvoiceHeaderEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 详情 + function details(data) { + parent._openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050300004&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "crmInvoiceHeaderDetails", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 删除 + function del(data, obj) { + layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.crmBasePath + "deleteInvoiceHeaderById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {objectKey: objectKey, objectId: objectId}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('crmInvoiceHeaderList', {}); +}); \ No newline at end of file diff --git a/crm/src/main/resources/template/js/payment/crmPaymentCollectionList.js b/crm/src/main/resources/template/js/payment/crmPaymentCollectionList.js new file mode 100644 index 0000000000000000000000000000000000000000..90b893d0e0777bea0873d6cc0c8ae6901019a62f --- /dev/null +++ b/crm/src/main/resources/template/js/payment/crmPaymentCollectionList.js @@ -0,0 +1,209 @@ + +var objectKey = ""; +var objectId = ""; + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + table = layui.table; + objectKey = GetUrlParam("objectKey"); + objectId = GetUrlParam("objectId"); + if (isNull(objectKey) || isNull(objectId)) { + winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000}); + return false; + } + + var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'crmPaymentCollectionAuthEnum'); + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.crmBasePath + 'queryPaymentCollectionList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, + { field: 'oddNumber', title: '单据编号', align: 'center', width: 150, templet: function (d) { + return '' + d.oddNumber + ''; + }}, + { field: 'price', title: '回款金额（元）', width: 120 }, + { field: 'invoicePrice', title: '已开票金额（元）', align: 'left', width: 140 }, + { field: 'collectionTime', title: '回款日期', align: 'center', width: 100 }, + { field: 'processInstanceId', title: '流程ID', align: 'center', width: 100, templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, + { field: 'typeId', title: '回款方式', width: 120, templet: function (d) { + return sysDictDataUtil.getDictDataNameByCodeAndKey('PAYMENT_COLLECTION_TYPE', d.typeId); + }}, + { field: 'state', title: '状态', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); + }}, + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', 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: 250, templet: function (d) { + var str = ''; + if (d.editRow == 1) { + if (authPermission['submitToApproval']) { + str += '提交审批'; + } + if (authPermission['edit']) { + str += ''; + } + if (authPermission['delete']) { + str += '删除'; + } + if (authPermission['invalid']) { + str += '作废'; + } + } + if (d.editRow == 2 && d.state == 'inExamine') { + if (authPermission['revoke']) { + str += '撤销'; + } + } + return str; + }} + ]], + done: function(json) { + matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'edit') { //编辑 + edit(data); + } else if (layEvent === 'details'){ //详情 + details(data); + } else if (layEvent === 'processDetails') { //流程详情 + activitiUtil.activitiDetails(data); + } else if (layEvent === 'subApproval') { //提交审批 + subApproval(data); + } else if (layEvent === 'del') { //删除 + del(data); + } else if (layEvent === 'cancellation') { //作废 + cancellation(data); + } else if (layEvent === 'revoke') { //撤销 + revoke(data); + } + }); + + // 新增 + $("body").on("click", "#addBean", function() { + parent._openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050200004&objectId=' + objectId + '&objectKey=' + objectKey, null), + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "crmContractAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + + // 编辑 + function edit(data) { + parent._openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050200005&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "crmContractEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 详情 + function details(data) { + parent._openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050200006&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "crmContractDetails", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + }}); + } + + // 提交审批 + function subApproval(data) { + layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) { + layer.close(index); + activitiUtil.startProcess(data.serviceClassName, null, function (approvalId) { + var params = { + id: data.id, + approvalId: approvalId + }; + AjaxPostUtil.request({url: sysMainMation.crmBasePath + "submitPaymentCollectionToApproval", params: params, type: 'json', method: 'POST', callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + }); + } + + // 删除 + function del(data, obj) { + layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.crmBasePath + "deletePaymentCollectionById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 作废 + function cancellation(data, obj) { + var msg = '确认作废该条数据吗？'; + layer.confirm(msg, { icon: 3, title: '作废操作' }, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.crmBasePath + "invalidPaymentCollection", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 撤销 + function revoke(data) { + var msg = '确认撤销该数据吗？'; + layer.confirm(msg, { icon: 3, title: '撤销申请提交' }, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.crmBasePath + "revokePaymentCollection", params: {processInstanceId: data.processInstanceId}, type: 'json', method: 'PUT', callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {objectKey: objectKey, objectId: objectId}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('crmPaymentCollectionList', {}); +}); \ No newline at end of file diff --git a/crm/src/main/resources/template/tpl/follow/crmFollowList.html b/crm/src/main/resources/template/tpl/follow/crmFollowList.html new file mode 100644 index 0000000000000000000000000000000000000000..32dfbc6ee5daea73618631af451a3e2658d37d54 --- /dev/null +++ b/crm/src/main/resources/template/tpl/follow/crmFollowList.html @@ -0,0 +1,25 @@ + + + + + + + + + +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/crm/src/main/resources/template/tpl/invoice/crmInvoiceList.html b/crm/src/main/resources/template/tpl/invoice/crmInvoiceList.html new file mode 100644 index 0000000000000000000000000000000000000000..14de4639c0c8758dfcf97e78a4c9990be5902292 --- /dev/null +++ b/crm/src/main/resources/template/tpl/invoice/crmInvoiceList.html @@ -0,0 +1,25 @@ + + + + + + + + + +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/crm/src/main/resources/template/tpl/invoiceHeader/crmInvoiceHeaderList.html b/crm/src/main/resources/template/tpl/invoiceHeader/crmInvoiceHeaderList.html new file mode 100644 index 0000000000000000000000000000000000000000..5c8209812f5153443b1486f40ac374eab1dc75ff --- /dev/null +++ b/crm/src/main/resources/template/tpl/invoiceHeader/crmInvoiceHeaderList.html @@ -0,0 +1,25 @@ + + + + + + + + + +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/crm/src/main/resources/template/tpl/payment/crmPaymentCollectionList.html b/crm/src/main/resources/template/tpl/payment/crmPaymentCollectionList.html new file mode 100644 index 0000000000000000000000000000000000000000..80b75667a5df7ece29361d0362ad1fff60d2551e --- /dev/null +++ b/crm/src/main/resources/template/tpl/payment/crmPaymentCollectionList.html @@ -0,0 +1,25 @@ + + + + + + + + + +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js index 4bb53d13a0b6b7995478850c407b571581d21c55..03b60b8d51d260a0704b3734c5a5fbf6eed97e2e 100644 --- a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js +++ b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js @@ -30,7 +30,7 @@ layui.config({ { field: 'productionMation', rowspan: '2', title: '生产计划单', align: 'center', width: 200, templet: function (d) {return isNull(d.productionMation) ? '' : d.productionMation.oddNumber}}, { colspan: '3', title: '加工成品信息', align: 'center' }, { field: 'processInstanceId', rowspan: '2', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', rowspan: '2', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("machinStateEnum", 'id', d.state, 'name'); diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js b/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js index 1443f36aa2a87598aefbb7f4d1cacdd4fa3ea9f8..5932456431c0ef67ce652600d9ca7fde32241c8a 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js @@ -29,7 +29,7 @@ layui.config({ }}, { field: 'machinMation', rowspan: '2', title: '加工单', align: 'center', width: 200, templet: function (d) {return isNull(d.machinMation) ? '' : d.machinMation.oddNumber}}, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js index 5d1bdbcbe29a6c79fc95d12897cf4f8b687f484e..814db8727b1e4364c2e20556c5e4cec74ccab7a1 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js @@ -29,7 +29,7 @@ layui.config({ }}, { field: 'machinMation', rowspan: '2', title: '加工单', align: 'center', width: 200, templet: function (d) {return isNull(d.machinMation) ? '' : d.machinMation.oddNumber}}, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js b/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js index 749b51b999c379cc1ec70d63417023afa9fd9276..cdffd5c71fd40cadf55ca24a99456ab39bfc0b3c 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js @@ -29,7 +29,7 @@ layui.config({ }}, { field: 'machinMation', rowspan: '2', title: '加工单', align: 'center', width: 200, templet: function (d) {return isNull(d.machinMation) ? '' : d.machinMation.oddNumber}}, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js b/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js index adc3c76cf0c6bc4a405788632495ad7fff6065ea..6cfeebacfb55dc1fd1604a891e5696cd6e8781f2 100644 --- a/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js +++ b/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js @@ -35,7 +35,7 @@ layui.config({ { field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) {return isNull(d.normsMation) ? '' : d.normsMation.name}}, { field: 'number', width: 100, title: '计划生产数量'}, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("productionState", 'id', d.state, 'name'); diff --git a/erp-produce/src/main/resources/template/js/erpWorkProcedure/erpWorkProcedureChoose.js b/erp-produce/src/main/resources/template/js/erpWorkProcedure/erpWorkProcedureChoose.js index b0fba760457e8fc9263d3d161cbc9cb6b416a630..26d380fa041e466f86aff04602cc6ba25815821d 100644 --- a/erp-produce/src/main/resources/template/js/erpWorkProcedure/erpWorkProcedureChoose.js +++ b/erp-produce/src/main/resources/template/js/erpWorkProcedure/erpWorkProcedureChoose.js @@ -63,7 +63,7 @@ layui.config({ { field: 'number', title: '工序编号', align: 'left',width: 120 }, { field: 'unitPrice', title: '参考单价', align: 'left',width: 100 }, { field: 'departmentMation', title: '执行部门', align: 'left',width: 100, templet: function (d) { - return d.departmentMation.name; + return getNotUndefinedVal(d.departmentMation?.name); }}, { field: 'content', title: '工序内容', align: 'left',width: 200 } ]], diff --git a/erp/src/main/resources/template/js/allocation/allocationList.js b/erp/src/main/resources/template/js/allocation/allocationList.js index f7cba4c55bce9504fe33cc93ccfb39fed1fd7699..7df58bfad62f826852d8ac6ab7b6173617e79b38 100644 --- a/erp/src/main/resources/template/js/allocation/allocationList.js +++ b/erp/src/main/resources/template/js/allocation/allocationList.js @@ -29,7 +29,7 @@ layui.config({ }}, { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); diff --git a/erp/src/main/resources/template/js/assemblySheet/assemblySheetList.js b/erp/src/main/resources/template/js/assemblySheet/assemblySheetList.js index 9aca2f5095178e184c6de99bf43439e9c2b41b85..827125d0207a100780c05e21931469fa396a1834 100644 --- a/erp/src/main/resources/template/js/assemblySheet/assemblySheetList.js +++ b/erp/src/main/resources/template/js/assemblySheet/assemblySheetList.js @@ -28,7 +28,7 @@ layui.config({ }}, { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/erp/src/main/resources/template/js/erpstatistics/customerreconciliation.js b/erp/src/main/resources/template/js/erpstatistics/customerreconciliation.js index 68eb18d077077dee510fb3feda57cb2dd5e9c99d..65616977c04eb8f4624208fc36006edbde63f8ac 100644 --- a/erp/src/main/resources/template/js/erpstatistics/customerreconciliation.js +++ b/erp/src/main/resources/template/js/erpstatistics/customerreconciliation.js @@ -31,7 +31,7 @@ layui.config({ }}, { field: 'serviceName', title: '单据类型', align: 'left', width: 100 }, { field: 'holderMation', title: '客户', align: 'left', width: 150, templet: function (d) { - return d.holderMation.name; + return getNotUndefinedVal(d.holderMation?.name); }}, { field: 'totalPrice', title: '合计金额', align: 'left', width: 100}, { field: 'operTime', title: '单据日期', align: 'center', width: 150} diff --git a/erp/src/main/resources/template/js/erpstatistics/supplierreconciliation.js b/erp/src/main/resources/template/js/erpstatistics/supplierreconciliation.js index 4d2ea64fbce47cc47a5561e2ebba3f25c0b74a37..8e8426fffd912affcd04590aa85192006c10c233 100644 --- a/erp/src/main/resources/template/js/erpstatistics/supplierreconciliation.js +++ b/erp/src/main/resources/template/js/erpstatistics/supplierreconciliation.js @@ -31,7 +31,7 @@ layui.config({ }}, { field: 'serviceName', title: '单据类型', align: 'left', width: 100 }, { field: 'holderMation', title: '供应商', align: 'left', width: 150, templet: function (d) { - return d.holderMation.name; + return getNotUndefinedVal(d.holderMation?.name); }}, { field: 'totalPrice', title: '合计金额', align: 'left', width: 100}, { field: 'operTime', title: '单据日期', align: 'center', width: 150} diff --git a/erp/src/main/resources/template/js/holder/holderNormsList.js b/erp/src/main/resources/template/js/holder/holderNormsList.js index 45a6f3e3dc6553737e3095c2e74788471daab32c..35d4a892558848e51ce524a77356af345da46abd 100644 --- a/erp/src/main/resources/template/js/holder/holderNormsList.js +++ b/erp/src/main/resources/template/js/holder/holderNormsList.js @@ -32,10 +32,10 @@ layui.config({ cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { field: 'materialId', title: '产品名称', align: 'left',width: 150, templet: function (d) { - return isNull(d.materialMation) ? '' : d.materialMation.name; + return getNotUndefinedVal(d.materialMation?.name); }}, { field: 'normsId', title: '产品规格', align: 'left',width: 400, templet: function (d) { - return isNull(d.normsMation) ? '' : d.normsMation.name; + return getNotUndefinedVal(d.normsMation?.name); }} ]], done: function(json) { diff --git a/erp/src/main/resources/template/js/materialNormInitStock/materialNormInitStockList.js b/erp/src/main/resources/template/js/materialNormInitStock/materialNormInitStockList.js index 7edf62d1959d59282d48ed67e9dbade749c99f42..1628551aa8c1421d759ef3a1b36d90d35b058ddb 100644 --- a/erp/src/main/resources/template/js/materialNormInitStock/materialNormInitStockList.js +++ b/erp/src/main/resources/template/js/materialNormInitStock/materialNormInitStockList.js @@ -24,7 +24,7 @@ layui.config({ data: $.extend(true, [], normsStock), cols: [[ { field: 'name', title: '仓库', align: 'left', width: 200, templet: function (d) { - return d.depotMation.name; + return getNotUndefinedVal(d.depotMation?.name); }}, { field: 'stock', title: '初始数量', align: 'left', width: 80 }, { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 140, toolbar: '#tableBar'} diff --git a/erp/src/main/resources/template/js/otherOutlets/otherOutletsList.js b/erp/src/main/resources/template/js/otherOutlets/otherOutletsList.js index 80bf6a6981e84904d4786e82765d917e9f4689a8..b8656e129cc469c6ec25996ec91e7d0a721afc1e 100644 --- a/erp/src/main/resources/template/js/otherOutlets/otherOutletsList.js +++ b/erp/src/main/resources/template/js/otherOutlets/otherOutletsList.js @@ -28,12 +28,12 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'holderMation', title: '客户', align: 'left', width: 150, templet: function (d) { - return d.holderMation.name; + return getNotUndefinedVal(d.holderMation?.name); }}, { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 }, { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); diff --git a/erp/src/main/resources/template/js/otherWarehous/otherWarehousList.js b/erp/src/main/resources/template/js/otherWarehous/otherWarehousList.js index ae6573c0cd4f27290dfe33675bae74cdbd0345e7..7eca095a151f162d7f4da17f7591b63dcf04eddd 100644 --- a/erp/src/main/resources/template/js/otherWarehous/otherWarehousList.js +++ b/erp/src/main/resources/template/js/otherWarehous/otherWarehousList.js @@ -28,12 +28,12 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'holderMation', title: '供应商', align: 'left', width: 150, templet: function (d) { - return d.holderMation.name; + return getNotUndefinedVal(d.holderMation?.name); }}, { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 }, { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); diff --git a/erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js b/erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js index 0c7cad049d2099aa36718d4844d0a5bb4fa596d9..efdde62e6b2c1ecc060477b98fb13c74905da974 100644 --- a/erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js +++ b/erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js @@ -28,12 +28,12 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'holderMation', title: '供应商', align: 'left', width: 150, templet: function (d) { - return d.holderMation.name; + return getNotUndefinedVal(d.holderMation?.name); }}, { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 }, { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); diff --git a/erp/src/main/resources/template/js/purchasePut/purchasePutList.js b/erp/src/main/resources/template/js/purchasePut/purchasePutList.js index e3e48310ea6435219c8f94a70c054e21dac69e2c..1951ebc42cae61b327707ab442e2094227dd6f77 100644 --- a/erp/src/main/resources/template/js/purchasePut/purchasePutList.js +++ b/erp/src/main/resources/template/js/purchasePut/purchasePutList.js @@ -32,12 +32,12 @@ layui.config({ return str; }}, { field: 'holderMation', title: '供应商', align: 'left', width: 150, templet: function (d) { - return d.holderMation.name; + return getNotUndefinedVal(d.holderMation?.name); }}, { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 }, { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/erp/src/main/resources/template/js/purchaseReturns/purchaseReturnsList.js b/erp/src/main/resources/template/js/purchaseReturns/purchaseReturnsList.js index 67aaed8c7695a5b4fe1bee7205c105efdca1539f..201f0936815b0e0e886a0b9df0bd2abc06a3fac3 100644 --- a/erp/src/main/resources/template/js/purchaseReturns/purchaseReturnsList.js +++ b/erp/src/main/resources/template/js/purchaseReturns/purchaseReturnsList.js @@ -28,12 +28,12 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'holderMation', title: '供应商', align: 'left', width: 150, templet: function (d) { - return d.holderMation.name; + return getNotUndefinedVal(d.holderMation?.name); }}, { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 }, { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/erp/src/main/resources/template/js/retailOutlet/retailOutletList.js b/erp/src/main/resources/template/js/retailOutlet/retailOutletList.js index 532c9e0a89a39a141693b43f3515b9fe8581b659..6d0030c5772a6c681e4f1557319d5bc14988fc2a 100644 --- a/erp/src/main/resources/template/js/retailOutlet/retailOutletList.js +++ b/erp/src/main/resources/template/js/retailOutlet/retailOutletList.js @@ -28,12 +28,12 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'holderMation', title: '会员', align: 'left', width: 150, templet: function (d) { - return d.holderMation.name; + return getNotUndefinedVal(d.holderMation?.name); }}, { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 }, { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/erp/src/main/resources/template/js/retailReturns/retailReturnsList.js b/erp/src/main/resources/template/js/retailReturns/retailReturnsList.js index 6e55babfd134049a7b8f655c6fbb33baa8ec93fc..0bd8230a0d33866e6f796d18479aaa1d3701ceaf 100644 --- a/erp/src/main/resources/template/js/retailReturns/retailReturnsList.js +++ b/erp/src/main/resources/template/js/retailReturns/retailReturnsList.js @@ -30,12 +30,12 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'holderMation', title: '会员', align: 'left', width: 150, templet: function (d) { - return d.holderMation.name; + return getNotUndefinedVal(d.holderMation?.name); }}, { field: 'totalPrice', title: '退款总金额', align: 'left', width: 120 }, { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/erp/src/main/resources/template/js/salesOrder/salesOrderChoose.js b/erp/src/main/resources/template/js/salesOrder/salesOrderChoose.js index a13a116d93601383ccea4399aaa59932320cd083..390b5cc3477582a62d5ef8ee54b262566b84bc8d 100644 --- a/erp/src/main/resources/template/js/salesOrder/salesOrderChoose.js +++ b/erp/src/main/resources/template/js/salesOrder/salesOrderChoose.js @@ -74,9 +74,15 @@ layui.config({ cols: [[ { type: 'radio'}, { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'name', title: '产品名称', align: 'left',width: 150, templet: function (d) {return d.materialMation.name}}, - { field: 'model', title: '产品型号', align: 'left',width: 150, templet: function (d) {return d.materialMation.model}}, - { field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) {return d.normsMation.name}}, + { field: 'name', title: '产品名称', align: 'left',width: 150, templet: function (d) { + return getNotUndefinedVal(d.materialMation?.name) + }}, + { field: 'model', title: '产品型号', align: 'left',width: 150, templet: function (d) { + return getNotUndefinedVal(d.materialMation?.model) + }}, + { field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) { + return getNotUndefinedVal(d.normsMation?.name) + }}, { field: 'operNumber', title: '数量', align: 'left', width: 80 }, { field: 'unitPrice', title: '单价', align: 'left', width: 120 }, { field: 'allPrice', title: '金额', align: 'left', width: 80 }, diff --git a/erp/src/main/resources/template/js/salesOrder/salesOrderList.js b/erp/src/main/resources/template/js/salesOrder/salesOrderList.js index 9e58e699793fab031d421bb6a2cd10632e272db2..79b75b8d34d7723e6792cce84184c20918e44ed2 100644 --- a/erp/src/main/resources/template/js/salesOrder/salesOrderList.js +++ b/erp/src/main/resources/template/js/salesOrder/salesOrderList.js @@ -27,13 +27,13 @@ layui.config({ { field: 'oddNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) { return '' + d.oddNumber + ''; }}, - { field: 'holderMation', title: '客户', align: 'left', width: 150, templet: function (d) { - return d.holderMation.name; + { field: 'holderMation', title: '客户', align: 'left', width: 200, templet: function (d) { + return getNotUndefinedVal(d.holderMation?.name); }}, { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 }, { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); diff --git a/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js b/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js index 377213b7550299352996416268c197f1c8394c65..185d267de5a4dff1491a66031ad2990395fdf8da 100644 --- a/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js +++ b/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js @@ -32,12 +32,12 @@ layui.config({ return str; }}, { field: 'holderMation', title: '客户', align: 'left', width: 150, templet: function (d) { - return d.holderMation.name; + return getNotUndefinedVal(d.holderMation?.name); }}, { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 }, { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); diff --git a/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js b/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js index 2f1b6ddd7f65bbd66738fe4959ed36f24a24bb1d..6057ea5e4334c1c16b5f5979b6c981f06bae601e 100644 --- a/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js +++ b/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js @@ -32,12 +32,12 @@ layui.config({ return str; }}, { field: 'holderMation', title: '客户', align: 'left', width: 150, templet: function (d) { - return d.holderMation.name; + return getNotUndefinedVal(d.holderMation?.name); }}, { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 }, { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); diff --git a/erp/src/main/resources/template/js/splitDoc/splitDocList.js b/erp/src/main/resources/template/js/splitDoc/splitDocList.js index 2b94cd2ef5de04ab45e04d9fca8798499f4f7e86..f528600f8ee601de27fa97dffafc4eadfe1571c8 100644 --- a/erp/src/main/resources/template/js/splitDoc/splitDocList.js +++ b/erp/src/main/resources/template/js/splitDoc/splitDocList.js @@ -29,7 +29,7 @@ layui.config({ }}, { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/erp/src/main/resources/template/js/supplierContract/supplierContractList.js b/erp/src/main/resources/template/js/supplierContract/supplierContractList.js index 63537af4a04f3a2fb39d05419eaacce570f371b3..59ae8e2cc89ce7de45b3c97ae2c3879517db5539 100644 --- a/erp/src/main/resources/template/js/supplierContract/supplierContractList.js +++ b/erp/src/main/resources/template/js/supplierContract/supplierContractList.js @@ -40,7 +40,7 @@ layui.config({ { field: 'price', title: '合同金额（元）', align: 'left', width: 120 }, { field: 'signingTime', title: '签约日期', align: 'center', width: 100 }, { field: 'processInstanceId', title: '流程ID', align: 'center', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("supplierContractStateEnum", 'id', d.state, 'name'); diff --git a/ifs/src/main/resources/template/js/income/incomeList.js b/ifs/src/main/resources/template/js/income/incomeList.js index 3894d481e9d5688c11f6d4f2febf033fe23a72f0..cfad79461eb0a1c8b9301239352ce348641ec01f 100644 --- a/ifs/src/main/resources/template/js/income/incomeList.js +++ b/ifs/src/main/resources/template/js/income/incomeList.js @@ -21,6 +21,8 @@ layui.config({ }); function initTable() { + // 加载列表数据权限 + loadAuthBtnGroup('messageTable', '1571638010771'); table.render({ id: 'messageTable', elem: '#messageTable', @@ -37,7 +39,7 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); @@ -49,7 +51,7 @@ layui.config({ return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("correspondentEnterEnum", 'id', d.holderKey, 'name'); }}, { field: 'holderMation', title: '往来单位', align: 'left', width: 150, templet: function (d) { - return d.holderMation.name; + return getNotUndefinedVal(d.holderMation?.name); }}, { field: 'handsPersonName', title: '经手人', align: 'left', width: 120 }, { field: 'operTime', title: '单据日期', align: 'center', width: 120 }, @@ -175,7 +177,7 @@ layui.config({ } function getTableParams() { - return $.extend(true, {orderType: orderType}, initTableSearchUtil.getSearchValue("messageTable")); + return $.extend(true, {typeId: orderType}, initTableSearchUtil.getSearchValue("messageTable")); } exports('incomeList', {}); diff --git a/ifs/src/main/resources/template/js/loan/loanBorrowList.js b/ifs/src/main/resources/template/js/loan/loanBorrowList.js new file mode 100644 index 0000000000000000000000000000000000000000..cc470ce71066bc05c2f11b6d26ef2d51375568aa --- /dev/null +++ b/ifs/src/main/resources/template/js/loan/loanBorrowList.js @@ -0,0 +1,169 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + table = layui.table; + var serviceClassName = sysServiceMation["loanBorrowService"]["key"]; + + authBtn('1714910702062');//新增 + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.ifsBasePath + 'queryLoanBorrowList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, + { field: 'oddNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) { + return '' + d.oddNumber + ''; + }}, + { field: 'payTypeId', title: '付款方式', align: 'left', width: 120, templet: function (d) { + return sysDictDataUtil.getDictDataNameByCodeAndKey("IFS_PAY_TYPE", d.payTypeId); + }}, + { field: 'price', title: '借款金额', align: 'left', width: 100 }, + { field: 'collectionName', title: '收款人全称', align: 'left', width: 150 }, + { field: 'collectionCode', title: '收款账号', align: 'left', width: 120 }, + { field: 'openingBank', title: '开户行', align: 'center', width: 120 }, + { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, + { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); + }}, + { 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(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () { + refreshTable(); + }); + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'delete') { //删除 + deleteIncome(data); + } else if (layEvent === 'details') { //详情 + details(data); + } else if (layEvent === 'edit') { //编辑 + edit(data); + } else if (layEvent === 'subExamine') { //提交审核 + subExamine(data); + } else if (layEvent === 'processDetails') {//采购流程详情 + activitiUtil.activitiDetails(data); + } else if (layEvent === 'revoke') { //撤销 + revorke(data); + } + }); + + // 添加 + $("body").on("click", "#addBean", function() { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050500005', null), + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "loanBorrowAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + + // 编辑 + function edit(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050500006&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "loanBorrowEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 详情 + function details(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050500007&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "loanBorrowInfo", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + }}); + } + + // 删除 + function deleteIncome(data) { + layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { + AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "deleteLoanBorrowById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 撤销申请 + function revorke(data) { + layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "revokeLoanBorrow", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 提交数据 + function subExamine(data){ + layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) { + layer.close(index); + activitiUtil.startProcess(serviceClassName, null, function (approvalId) { + var params = { + id: data.id, + approvalId: approvalId + }; + AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "submitLoanBorrowToApproval", params: params, type: 'json', callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + }); + } + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function refreshTable() { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('loanBorrowList', {}); +}); diff --git a/ifs/src/main/resources/template/js/loan/loanRepayList.js b/ifs/src/main/resources/template/js/loan/loanRepayList.js new file mode 100644 index 0000000000000000000000000000000000000000..108a5ee8e95a75d7e4f6245b0b929383ab25e15c --- /dev/null +++ b/ifs/src/main/resources/template/js/loan/loanRepayList.js @@ -0,0 +1,169 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + table = layui.table; + var serviceClassName = sysServiceMation["loanRepayService"]["key"]; + + authBtn('1714910816333');//新增 + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.ifsBasePath + 'queryLoanRepayList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, + { field: 'oddNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) { + return '' + d.oddNumber + ''; + }}, + { field: 'payTypeId', title: '付款方式', align: 'left', width: 120, templet: function (d) { + return sysDictDataUtil.getDictDataNameByCodeAndKey("IFS_PAY_TYPE", d.payTypeId); + }}, + { field: 'price', title: '还款金额', align: 'left', width: 100 }, + { field: 'collectionName', title: '收款人全称', align: 'left', width: 150 }, + { field: 'collectionCode', title: '收款账号', align: 'left', width: 120 }, + { field: 'openingBank', title: '开户行', align: 'center', width: 120 }, + { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, + { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); + }}, + { 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(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () { + refreshTable(); + }); + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'delete') { //删除 + deleteIncome(data); + } else if (layEvent === 'details') { //详情 + details(data); + } else if (layEvent === 'edit') { //编辑 + edit(data); + } else if (layEvent === 'subExamine') { //提交审核 + subExamine(data); + } else if (layEvent === 'processDetails') {//采购流程详情 + activitiUtil.activitiDetails(data); + } else if (layEvent === 'revoke') { //撤销 + revorke(data); + } + }); + + // 添加 + $("body").on("click", "#addBean", function() { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050500008', null), + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "loanRepayAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + + // 编辑 + function edit(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050500009&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "loanRepayEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 详情 + function details(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050500010&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "loanRepayInfo", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + }}); + } + + // 删除 + function deleteIncome(data) { + layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { + AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "deleteLoanRepayById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 撤销申请 + function revorke(data) { + layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "revokeLoanRepay", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 提交数据 + function subExamine(data){ + layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) { + layer.close(index); + activitiUtil.startProcess(serviceClassName, null, function (approvalId) { + var params = { + id: data.id, + approvalId: approvalId + }; + AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "submitLoanRepayToApproval", params: params, type: 'json', callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + }); + } + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function refreshTable() { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('loanRepayList', {}); +}); diff --git a/ifs/src/main/resources/template/js/reimbursement/reimbursementList.js b/ifs/src/main/resources/template/js/reimbursement/reimbursementList.js new file mode 100644 index 0000000000000000000000000000000000000000..38ee9fa3e624e8578b7b916a16944f27f039bd9a --- /dev/null +++ b/ifs/src/main/resources/template/js/reimbursement/reimbursementList.js @@ -0,0 +1,171 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + table = layui.table; + var serviceClassName = sysServiceMation["reimbursement"]["key"]; + + // 加载列表数据权限 + loadAuthBtnGroup('messageTable', '1714869343001'); + authBtn('1714869454529');//新增 + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.ifsBasePath + 'queryReimbursementList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, + { field: 'oddNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) { + return '' + d.oddNumber + ''; + }}, + { field: 'payTypeId', title: '付款方式', align: 'left', width: 120, templet: function (d) { + return sysDictDataUtil.getDictDataNameByCodeAndKey("IFS_PAY_TYPE", d.payTypeId); + }}, + { field: 'price', title: '报销金额', align: 'left', width: 100 }, + { field: 'collectionName', title: '收款人全称', align: 'left', width: 150 }, + { field: 'collectionCode', title: '收款账号', align: 'left', width: 120 }, + { field: 'openingBank', title: '开户行', align: 'center', width: 120 }, + { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, + { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); + }}, + { 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(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () { + refreshTable(); + }); + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'delete') { //删除 + deleteIncome(data); + } else if (layEvent === 'details') { //详情 + details(data); + } else if (layEvent === 'edit') { //编辑 + edit(data); + } else if (layEvent === 'subExamine') { //提交审核 + subExamine(data); + } else if (layEvent === 'processDetails') {//采购流程详情 + activitiUtil.activitiDetails(data); + } else if (layEvent === 'revoke') { //撤销 + revorke(data); + } + }); + + // 添加 + $("body").on("click", "#addBean", function() { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050500001', null), + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "incomeAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + + // 编辑 + function edit(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050500002&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "incomeEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 详情 + function details(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024050500003&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "incomeInfo", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + }}); + } + + // 删除 + function deleteIncome(data) { + layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { + AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "deleteReimbursementById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 撤销申请 + function revorke(data) { + layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "revokeReimbursement", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 提交数据 + function subExamine(data){ + layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) { + layer.close(index); + activitiUtil.startProcess(serviceClassName, null, function (approvalId) { + var params = { + id: data.id, + approvalId: approvalId + }; + AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "submitReimbursementToApproval", params: params, type: 'json', callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + }); + } + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function refreshTable() { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('reimbursementList', {}); +}); diff --git a/ifs/src/main/resources/template/tpl/loan/loanBorrowList.html b/ifs/src/main/resources/template/tpl/loan/loanBorrowList.html new file mode 100644 index 0000000000000000000000000000000000000000..23539c7823828bd1c2b048f411317eab2a4ef63a --- /dev/null +++ b/ifs/src/main/resources/template/tpl/loan/loanBorrowList.html @@ -0,0 +1,45 @@ + + + + + + + + + +
+
+ + +
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/ifs/src/main/resources/template/tpl/loan/loanRepayList.html b/ifs/src/main/resources/template/tpl/loan/loanRepayList.html new file mode 100644 index 0000000000000000000000000000000000000000..56b2d5589972b771099cc06f38b831584e0ca785 --- /dev/null +++ b/ifs/src/main/resources/template/tpl/loan/loanRepayList.html @@ -0,0 +1,45 @@ + + + + + + + + + +
+
+ + +
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/ifs/src/main/resources/template/tpl/reimbursement/reimbursementList.html b/ifs/src/main/resources/template/tpl/reimbursement/reimbursementList.html new file mode 100644 index 0000000000000000000000000000000000000000..92078ca159f02dc7964a543d2f515f3aa9478974 --- /dev/null +++ b/ifs/src/main/resources/template/tpl/reimbursement/reimbursementList.html @@ -0,0 +1,45 @@ + + + + + + + + + +
+
+ + +
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/knowlg/src/main/resources/template/js/knowlgExamine/knowlgExamineList.js b/knowlg/src/main/resources/template/js/knowlgExamine/knowlgExamineList.js index 4ba5edd66a8326002c6ec45bc86991f9fa602183..7aa9d8f4b4c475801e329f3286ddc9b237a7e477 100644 --- a/knowlg/src/main/resources/template/js/knowlgExamine/knowlgExamineList.js +++ b/knowlg/src/main/resources/template/js/knowlgExamine/knowlgExamineList.js @@ -57,7 +57,7 @@ layui.config({ if (clickId == "checkedList") { // 已审核 cols.push({ field: 'examineId', title: '审核人', width: 120, templet: function (d) { - return isNull(d.examineMation) ? "" : d.examineMation.name; + return getNotUndefinedVal(d.examineMation?.name); }}); cols.push({ field: 'examineTime', title: '审核时间', align: 'center', width: 150 }); cols.push({ field: 'state', title: '审核结果', align: 'center', width: 100, templet: function (d) { diff --git a/pom.xml b/pom.xml index 7d054d00790a3d730163e690d1f4cbc32c3f51f7..1d7d9521b609f6bc58ecf636a03cf637b7c4af96 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,6 @@ seal-service school schedule - rmprogram quartz pro planpro diff --git a/pro/src/main/resources/template/js/proTask/proTaskList.js b/pro/src/main/resources/template/js/proTask/proTaskList.js index 6676382c29e818a213a45cd0668cebb8b6dd0e47..52a9d589913fb7a70c2b19fb209510c379993cd9 100644 --- a/pro/src/main/resources/template/js/proTask/proTaskList.js +++ b/pro/src/main/resources/template/js/proTask/proTaskList.js @@ -60,7 +60,7 @@ layui.config({ { field: 'estimatedWorkload', title: '预计工作量', align: 'center', width: 120 }, { field: 'actualWorkload', title: '实际工作量', align: 'center', width: 120 }, { field: 'processInstanceId', title: '流程ID', align: 'center', width: 100, templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("taskStateEnum", 'id', d.state, 'name'); diff --git a/pro/src/main/resources/template/js/project/projectList.js b/pro/src/main/resources/template/js/project/projectList.js index 856335b8699aabd923aa3efe695c3a30eb8ad8fc..0b2884bd05c455aaa58077252300f7cd3bb419c1 100644 --- a/pro/src/main/resources/template/js/project/projectList.js +++ b/pro/src/main/resources/template/js/project/projectList.js @@ -32,7 +32,7 @@ layui.config({ { field: 'numberCode', title: '项目单号', width: 200 }, { field: 'name', title: '项目名称', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("projectStateEnum", 'id', d.state, 'name'); diff --git a/report/src/main/resources/template/assets/report/css/ruler.css b/report/src/main/resources/template/assets/report/css/ruler.css index 48f7de45eae71fccfaa64a3b56dc43aa8c1413d0..337fb454b03f0a8dec6cafceb5c9298b722abd9f 100644 --- a/report/src/main/resources/template/assets/report/css/ruler.css +++ b/report/src/main/resources/template/assets/report/css/ruler.css @@ -111,7 +111,7 @@ body { } .hd-main .navs { - padding: 0 0 0px 25px; + padding: 0px; height: 100%; float: left; } @@ -225,14 +225,6 @@ body { line-height: 0; } -.logo-title{ - float: left; - line-height: 60px; - color: cornflowerblue; - font-size: 16px; - font-family: cursive; -} - .kuang { box-sizing: border-box; border: 1px solid darkgray; @@ -304,9 +296,15 @@ body { cursor: e-resize; } -.echarts-box{ +.echarts-box { + width: 100%; + height: 100%; +} + +.table-box { width: 100%; height: 100%; + position: absolute; } .word-box{ diff --git a/report/src/main/resources/template/assets/report/js/skyeyeReportDesigner.js b/report/src/main/resources/template/assets/report/js/skyeyeReportDesigner.js index 81a28dde1228bf0b2c9d6d25d796c26f99b6b2c5..be357fdb0049d614921f091f0a114f0b940a9ac9 100644 --- a/report/src/main/resources/template/assets/report/js/skyeyeReportDesigner.js +++ b/report/src/main/resources/template/assets/report/js/skyeyeReportDesigner.js @@ -4,6 +4,9 @@ var form; var inPageEcharts = {}; var inPageEchartsObject = {}; +// 已经添加上的echarts图表 +var inPageTable = {}; + // 已经添加上的文字模型 var inPageWordMation = {}; @@ -18,7 +21,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { var defaults = { 'rulerColor': "RGB(135, 221, 252)", // 标尺颜色 'rulerFontColor': "burlywood", // 标尺字体颜色 - 'headerBgColor': 'burlywood', // 菜单栏背景颜色 + 'headerBgColor': 'lightskyblue', // 菜单栏背景颜色 'initData': {}, // 初始化数据 'headerMenuJson': [], // 菜单栏 // excel配置 @@ -127,6 +130,9 @@ layui.define(["jquery", 'form', 'element'], function(exports) { str = f.getBgImageHtml(item, str); } else if(item.id == 'wordModel') { str = f.getWordModelHtml(item, str); + } else if(item.id == 'tableModel') { + // todo 待定 + str = f.getTableModelHtml(item, str); } else { str = f.getEchartsHtml(item, str); } @@ -204,6 +210,21 @@ layui.define(["jquery", 'form', 'element'], function(exports) { return str; }, + // 标题按钮--表格模型获取html + getTableModelHtml: function(item, str) { + str = f.getCommonParentHeader(str, item); + $.each(item.children, function (j, bean) { + str += '' + + '' + + '' + bean.name + '' + + ''; + }); + str += '' + + '' + + ''; + return str; + }, + // 标题按钮--背景图片模型获取html getBgImageHtml: function(item, str) { str = f.getCommonParentHeader(str, item); @@ -245,10 +266,65 @@ layui.define(["jquery", 'form', 'element'], function(exports) { f.addNewWordModel(modelId, wordStyleMation); }); + // 表格模型点击事件 + skyeyeHeader.find(".tableModel").click(function () { + var modelId = $(this).attr("rowId"); + f.addNewTableModel(modelId, null); + }); + + }, + + // 加载表格模型 + addNewTableModel: function(modelId, tableMation) { + // 获取boxId + var boxId = modelId + getRandomValueToString(); + // 获取表格图表id + var tableId = f.getTableBox(boxId, modelId); + // 加入页面属性 + var table = !isNull(tableMation) ? tableMation : { + attr: $.extend(true, {}, echartsCustomOptions, { + "custom.tableColumn": { "defaultValue": [], "edit": 1, "remark": "数据表格的信息", "name": "表格配置", "editorType": "101", "editorChooseValue": "", "typeName": "数据源"}, + "custom.isPage": { "defaultValue": "1", "edit": 1, "remark": "分页的标识", "name": "是否分页", "editorType": "1", "editorChooseValue": "", "typeName": "数据源", + "optionalValue": [{"id": 1, "name": "是"}, {"id": 0, "name": "否"}]}, + }), + tableColumnList: [], + isPage: 1 + } + + table["tableId"] = tableId + + // 加载表格 + dsFormTableUtil.initDynamicTable(tableId, table); + + inPageTable[boxId] = $.extend(true, {}, table); + return boxId; + }, + + getTableBox: function (boxId, modelId) { + var box = f.createBox(boxId, modelId, null); + + var tableBoxId = "table" + boxId; + var tableBox = document.createElement("div"); + // 为div设置类名 + tableBox.className = "table-box"; + tableBox.id = "label-" + tableBoxId; + tableBox.onmousedown = ee => { + var id = $("#" + tableBoxId).parent().attr("id"); + f.setMoveEvent(ee, $("#" + id)); + // 阻止事件冒泡（针对父元素的move） + ee.stopPropagation(); + }; + box.appendChild(tableBox); + + var table = document.createElement("table"); + table.id = tableBoxId; + box.appendChild(table); + + return tableBoxId; }, // 加载echarts模型 - addNewModel: function(modelId, echartsMation){ + addNewModel: function(modelId, echartsMation) { if (!f.isNull(echartsMation)) { var option = getEchartsOptions(echartsMation); // 获取boxId @@ -285,7 +361,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { }, // 根据id获取echarts信息 - getEchartsMationById: function(id){ + getEchartsMationById: function(id) { var echartsMation; $.each(params.headerMenuJson, function(i, item) { if (!f.isNull(item.children) && item.id == 'echartsModel') { @@ -297,7 +373,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { }, // 根据id获取文字模型的style信息 - getWordStyleMationById: function(id){ + getWordStyleMationById: function(id) { var wordMation; $.each(params.headerMenuJson, function(i, item) { if (!f.isNull(item.children) && item.id == 'wordModel') { @@ -308,7 +384,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { return wordMation; }, - getEchartsBox: function (boxId, modelId){ + getEchartsBox: function (boxId, modelId) { var echartsId = "echarts" + boxId; var echartsBox = document.createElement("div"); // 为div设置类名 @@ -325,7 +401,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { return echartsId; }, - getWordBox: function (boxId, modelId, styleStr, wordStyleMation){ + getWordBox: function (boxId, modelId, styleStr, wordStyleMation) { var wordId = "word" + boxId; var wordBox = document.createElement("font"); // 为div设置类名 @@ -344,7 +420,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { return wordId; }, - setDesignAttr: function(wordStyleMation){ + setDesignAttr: function(wordStyleMation) { var otherStyle = { width: wordStyleMation.defaultWidth + 'px', height: wordStyleMation.defaultHeight + 'px' @@ -352,7 +428,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { return otherStyle; }, - createBox: function(id, modelId, otherStyle){ + createBox: function(id, modelId, otherStyle) { f.removeEchartsEditMation(); // 创建一个div var div = document.createElement("div"); @@ -364,7 +440,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { div.style.top = "0px"; div.style.left = "0px"; if (!f.isNull(otherStyle)) { - $.each(otherStyle, function (key, value){ + $.each(otherStyle, function (key, value) { div.style[key] = value; }); } @@ -456,7 +532,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { return div; }, - setMoveEvent: function (ee, box){ + setMoveEvent: function (ee, box) { // 获取事件对象 var ee = ee || window.event; var maxLeft = skyeyeReportContent.width() - box.width(); @@ -489,7 +565,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { * @param y 鼠标按下时，鼠标相对于元素的y坐标 * @returns {number|number} */ - getTop: function (e, y){ + getTop: function (e, y) { var top = e.clientY - y - 104; top = top < 0 ? 0 : top; var chooseEcharts = skyeyeReportContent.find(".active").eq(0); @@ -508,7 +584,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { * @param maxLeft 允许的最大左边距 * @returns {number|number} */ - getLeft: function (e, x, maxLeft){ + getLeft: function (e, x, maxLeft) { var left = e.clientX - x - 44; left = left < 0 ? 0 : left; left = left > maxLeft ? maxLeft : left; @@ -567,9 +643,9 @@ layui.define(["jquery", 'form', 'element'], function(exports) { initExcelEvent: function() { // 不触发‘移除所有图表的编辑信息’的事件的对象的class--颜色选择器 - var notTriggerRemove = ["layui-colorpicker-main"]; + var notTriggerRemove = ["layui-colorpicker-main", "layui-anim-scaleSpring"]; // 图表点击事件 - $("body").on('click', ".echarts-box, .word-box", function (e) { + $("body").on('click', ".echarts-box, .word-box, .table-box", function (e) { f.setChooseReportItem($(this)); e.stopPropagation(); }); @@ -578,11 +654,12 @@ layui.define(["jquery", 'form', 'element'], function(exports) { $("body").on('click', skyeyeReportContent, function (e) { var pass = true; $.each(notTriggerRemove, function (i, item) { - if ($(e.target).parents("." + item).length > 0 || $(e.target).attr('class').indexOf(item) != -1) { + if ($(e.target).parents("." + item).length > 0 + || (!isNull($(e.target).attr('class')) && $(e.target).attr('class').indexOf(item) != -1)) { pass = false; } }); - if(pass){ + if (pass) { f.removeEchartsEditMation(); } }); @@ -606,6 +683,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { $("body").on('click', "#save", function (e) { var eachartsList = f.getEchartsListToSave(); var wordMationList = f.getWordMationListToSave(); + var tableMationList = f.getTableListToSave(); var bgImage = skyeyeReportContent.css("backgroundImage").replace('url(', '').replace(')', ''); if (isNull(bgImage) || bgImage == 'none' || bgImage.indexOf('none') > -1) { @@ -616,15 +694,18 @@ layui.define(["jquery", 'form', 'element'], function(exports) { contentHeight: skyeyeReportContent.height(), bgImage: bgImage, modelList: eachartsList, - wordMationList: wordMationList + wordMationList: wordMationList, + tableMationList: tableMationList }; AjaxPostUtil.request({url: sysMainMation.reportBasePath + "editReportPageContentById", params: {id: id, content: encodeURIComponent(JSON.stringify(params))}, type: 'json', method: "POST", callback: function(json) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); }}); }); + + f.loadHandlebar(); }, - getEchartsListToSave: function (){ + getEchartsListToSave: function () { var eachartsList = new Array(); $.each(skyeyeReportContent.find(".kuang"), function(i, item) { if ($(item).find(".echarts-box").length > 0) { @@ -641,7 +722,24 @@ layui.define(["jquery", 'form', 'element'], function(exports) { return eachartsList; }, - getWordMationListToSave: function (){ + getTableListToSave: function () { + var tableList = new Array(); + $.each(skyeyeReportContent.find(".kuang"), function(i, item) { + if ($(item).find(".table-box").length > 0) { + var boxId = $(item).data("boxId"); + var etableMation = inPageTable[boxId]; + tableList.push({ + modelId: $(item).data("modelId"), + attrMation: etableMation, + width: $(item).width(), + height: $(item).height() + }); + } + }); + return tableList; + }, + + getWordMationListToSave: function () { var wordMationList = new Array(); $.each(skyeyeReportContent.find(".kuang"), function(i, item) { if ($(item).find(".word-box").length > 0) { @@ -659,7 +757,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { }, // 设置选中项 - setChooseReportItem: function(_this){ + setChooseReportItem: function(_this) { if (!_this.parent().hasClass("active")) { f.removeEchartsEditMation(); // 被选中项 @@ -670,14 +768,14 @@ layui.define(["jquery", 'form', 'element'], function(exports) { }, // 移除所有图表的编辑信息 - removeEchartsEditMation: function(){ + removeEchartsEditMation: function() { $(".dian").hide(); $(".kuang").removeClass("active"); $("#showForm").parent().remove(); }, // 加载echarts报表编辑器 - loadEchartsEditor: function (){ + loadEchartsEditor: function () { var chooseObject = skyeyeReportContent.find(".active").eq(0); var boxId = chooseObject.data("boxId"); var objectMation = getDataChooseMation(boxId); @@ -737,8 +835,22 @@ layui.define(["jquery", 'form', 'element'], function(exports) { } }, + loadHandlebar: function () { + // 加载json对象 + Handlebars.registerHelper('json', function(context, type) { + if (!isNull(context)) { + return JSON.stringify(context); + } + if (type == 'array') { + return JSON.stringify([]); + } else { + return JSON.stringify({}); + } + }); + }, + // 加载编辑器‘详情’类型的展示 - loadEchartsEditorISDetail: function (key, val, boxId, indexNumber, typeName){ + loadEchartsEditorISDetail: function (key, val, boxId, indexNumber, typeName) { var formItem = editorType["100"]; var data = f.getFormItemData(key, val, boxId, indexNumber); var html = getDataUseHandlebars('{{#bean}}' + formItem.html + '{{/bean}}', data); @@ -795,6 +907,9 @@ layui.define(["jquery", 'form', 'element'], function(exports) { value = JSON.stringify(value); } } + if (val.editorType == '101') { + value = JSON.stringify(value); + } return { "bean": { modelKey: key, @@ -811,7 +926,7 @@ layui.define(["jquery", 'form', 'element'], function(exports) { }, // 添加一个新的form表单 - addNewFormBox: function(){ + addNewFormBox: function() { var editForm = '
' + '
' + ' 属性' + @@ -822,14 +937,14 @@ layui.define(["jquery", 'form', 'element'], function(exports) { }, // 加载编辑器类型 - initEditorType: function (){ + initEditorType: function () { $.getJSON("../../assets/report/json/skyeyeEditor.json", function (data) { editorType = data; }); }, // reportContent的八个角 - getEightCape: function(){ + getEightCape: function() { var capeResult = '
' + '
' + '
' + @@ -841,11 +956,13 @@ layui.define(["jquery", 'form', 'element'], function(exports) { return capeResult; }, - initData: function(){ + initData: function() { var widthScale = getScale(params.initData.contentWidth, skyeyeReportContent.width()); var heightScale = getScale(params.initData.contentHeight, skyeyeReportContent.height()); // 初始化echarts模型 f.initEchartsData(widthScale, heightScale); + // 初始化table模型 + f.initTableData(widthScale, heightScale); // 初始化文字模型 f.initWordMationData(widthScale, heightScale); // 初始化背景 @@ -879,6 +996,27 @@ layui.define(["jquery", 'form', 'element'], function(exports) { } }, + initTableData: function(widthScale, heightScale) { + var tableMationList = params.initData.tableMationList; + if (!f.isNull(tableMationList)) { + $.each(tableMationList, function (i, item) { + var leftNum = multiplication(item.attrMation.attr["custom.move.x"].defaultValue, widthScale); + var topNum = multiplication(item.attrMation.attr["custom.move.y"].defaultValue, heightScale); + item.attrMation.attr["custom.move.x"].defaultValue = leftNum; + item.attrMation.attr["custom.move.y"].defaultValue = topNum; + var boxId = f.addNewTableModel(item.modelId, item.attrMation); + $("#" + boxId).css({ + left: leftNum + "px", + top: topNum + "px", + width: multiplication(item.width, widthScale), + height: multiplication(item.height, heightScale) + }); + setBoxAttrMation("custom.box.background", boxId, item.attrMation.attr["custom.box.background"].defaultValue); + setBoxAttrMation("custom.box.border-color", boxId, item.attrMation.attr["custom.box.border-color"].defaultValue); + }); + } + }, + initWordMationData: function(widthScale, heightScale) { var wordMationList = params.initData.wordMationList; if (!f.isNull(wordMationList)) { @@ -920,7 +1058,6 @@ layui.define(["jquery", 'form', 'element'], function(exports) { '
' + '
' + '
' + - 'Skyeye系列-报表设计器' + '
' + '
' + f.getEightCape() + @@ -999,6 +1136,8 @@ function dataValueChange(value, _this) { resetChartsModel(boxId); } else if(_chooseMation.menuType == 'wordModel') { resetWordModel(boxId); + } else if(_chooseMation.menuType == 'tableModel') { + resetTableModel(boxId); } afterRunBack(controlType, value); @@ -1021,6 +1160,13 @@ function resetWordModel(boxId) { $("#" + boxId).find(".word-box").attr("style", styleStr); } +function resetTableModel(boxId) { + var tableMation = inPageTable[boxId] + tableMation.tableColumnList = tableMation.attr['custom.tableColumn'].defaultValue + // 加载表格 + dsFormTableUtil.initDynamicTable(tableMation.tableId, tableMation); +} + function getDataChooseMation(boxId) { var _object = inPageEcharts[boxId]; if (!isNull(_object)) { @@ -1032,6 +1178,12 @@ function getDataChooseMation(boxId) { _object.menuType = 'wordModel'; } } + if (isNull(_object)) { + _object = inPageTable[boxId]; + if (!isNull(_object)) { + _object.menuType = 'tableModel'; + } + } return _object; } @@ -1094,6 +1246,9 @@ function getEchartsOptions(echartsMation) { // 获取文字模型样式信息 function getWordStyleStr(propertyList) { var styleStr = ""; + if (isNull(propertyList)) { + return styleStr; + } $.each(propertyList, function (index, item) { if (!isNull(item.propertyMation)) { if (item.propertyMation.attrCode.indexOf("custom.") < 0) { diff --git a/report/src/main/resources/template/assets/report/json/skyeyeEditor.json b/report/src/main/resources/template/assets/report/json/skyeyeEditor.json index d4414fa12aa07102bcc343944a4d2df4532a050d..ad5b812b83c6301bf34533ec6c4a826d95acca54 100644 --- a/report/src/main/resources/template/assets/report/json/skyeyeEditor.json +++ b/report/src/main/resources/template/assets/report/json/skyeyeEditor.json @@ -61,5 +61,12 @@ "html": "
{{{context}}}
", "js": "", "showValueTemplate": "" + }, + "101": { + "key": "tableColumnChoose", + "name": "表格配置", + "html": "
", + "js": "var tableDataList = {{{json context 'array'}}}; $('body').on('click', '#choose{{boxId}}{{indexNumber}}', function (e) {localStorage.setItem('{{boxId}}', tableDataList); _openNewWindows({url:'../../tpl/pageReportDesign/simpleTableDesign.html?boxId=' + '{{boxId}}', title:'表格配置',pageId:'tableColumnChoose',area:['90vw','90vh'],callBack:function (refreshCode){if(refreshCode=='0'){dataValueChange(tableColumnList, $('#choose{{boxId}}{{indexNumber}}')); } else if (refreshCode=='-9999'){winui.window.msg(systemLanguage['com.skyeye.operationFailed'][languageType],{icon:2,time:2000});}}});});", + "showValueTemplate": "" } } \ No newline at end of file diff --git a/report/src/main/resources/template/js/pageReportDesign/pageReportDesign.js b/report/src/main/resources/template/js/pageReportDesign/pageReportDesign.js index 6da8a5b1730efef8e153a532bc2702f50a6f242e..e25da1c688f6d30688bda56e1643e8589a4e1085 100644 --- a/report/src/main/resources/template/js/pageReportDesign/pageReportDesign.js +++ b/report/src/main/resources/template/js/pageReportDesign/pageReportDesign.js @@ -63,12 +63,11 @@ layui.config({ }, { "icon": " fa fa-table fa-fw", "title": "表格", + "id": "tableModel", "children": [{ + "id": "customSimpleTable", "icon": " fa fa-table fa-fw", "name": "简单表格", - }, { - "icon": " fa fa-list-alt fa-fw", - "name": "复杂表格", }] }, { "icon": " fa fa-area-chart fa-fw", diff --git a/report/src/main/resources/template/js/pageReportDesign/simpleTableDesign.js b/report/src/main/resources/template/js/pageReportDesign/simpleTableDesign.js new file mode 100644 index 0000000000000000000000000000000000000000..de64e0327f90407517178dd0c75e8c7122530ac9 --- /dev/null +++ b/report/src/main/resources/template/js/pageReportDesign/simpleTableDesign.js @@ -0,0 +1,215 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'jquery', 'winui', 'form', 'soulTable', 'table'].concat(dsFormUtil.mastHaveImport), function (exports) { + winui.renderColor(); + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$, + form = layui.form, + table = layui.table, + soulTable = layui.soulTable; + var rowNum = 1; + + var boxId = GetUrlParam("boxId"); + // 默认表格数据 + var tableDataList = JSON.parse(isNull(localStorage.getItem(boxId)) ? '[]' : localStorage.getItem(boxId)) + localStorage.removeItem(boxId); + tableDataList.forEach(data => { + data.id = rowNum + rowNum++ + }) + + var alignmentData = skyeyeClassEnumUtil.getEnumDataListByClassName("alignment"); + var fixedTypeData = skyeyeClassEnumUtil.getEnumDataListByClassName("fixedType"); + var whetherEnumData = skyeyeClassEnumUtil.getEnumDataListByClassName("whetherEnum"); + + var jsEditorMap = {}; + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'get', + data: tableDataList, + even: true, + page: false, + limit: 100, + rowDrag: { + trigger: '.drag-row', + done: function(obj) {} + }, + cols: [[ + { type: 'checkbox', align: 'center' }, + { field: 'test', title: '', align: 'left', width: 40, templet: function (d) {return '';}}, + { field: 'attrKey', title: '属性*', align: 'left', width: 200, templet: function (d) { + return ``; + }}, + { field: 'name', title: '列名*', align: 'left', width: 200, templet: function (d) { + return ``; + }}, + { field: 'align', title: '对齐方式*', align: 'left', width: 120, templet: function (d) { + var _html = ``; + return _html; + }}, + { field: 'fixed', title: '固定位置', align: 'left', width: 120, templet: function (d) { + var _html = ``; + return _html; + }}, + { field: 'hide', title: '默认隐藏', align: 'left', width: 120, templet: function (d) { + var _html = ``; + return _html; + }}, + { field: 'width', title: '宽度(px)*', align: 'left', width: 120, templet: function (d) { + return ``; + }}, + { field: 'templetBox', title: '脚本', align: 'left', width: 700, templet: function (d) { + return ``; + }}, + ]], + done: function(json) { + matchingLanguage(); + if ($(`div[lay-id='messageTable']`).find('.place-holder').length == 0) { + $(`div[lay-id='messageTable']`).find('.layui-table-body').append('
'); + } + soulTable.render(this); + + jsEditorMap = {}; + $.each($(".templateClass"), function (i, item) { + var id = $(item).attr('cus-id'); + var tableData = getInPoingArr(tableDataList, 'id', id); + var jsEditor = CodeMirror.fromTextArea(document.getElementById("templet" + id), codeUtil.getConfig('text/javascript')); + if (!isNull(tableData.templet)) { + jsEditor.setValue(tableData.templet); + } + jsEditorMap[id] = jsEditor; + }); + + } + }); + + form.on('select(tableSelect)', function(data) { + var id = data.elem.id; + buildData($(`#${id}`)); + }); + $("body").on("input", ".tableInput", function () { + buildData($(this)); + }); + $("body").on("change", ".tableInput", function () { + buildData($(this)); + }); + + function buildData(_this) { + var id = _this.attr('cus-id'); + var key = _this.attr('id').replace(id, ''); + $.each(tableDataList, function (j, item) { + if (item.id == id) { + item[key] = _this.val(); + } + }); + } + + matchingLanguage(); + form.render(); + form.on('submit(formWriteBean)', function (data) { + if (winui.verifyForm(data.elem)) { + if (table.cache.messageTable.length == 0) { + winui.window.msg('请选择表格属性.', {icon: 2, time: 2000}); + return false; + } + tableDataList = [].concat(table.cache.messageTable); + resetData(tableDataList); + $.each(tableDataList, function (i, item) { + item.orderBy = i + 1; + item.templet = jsEditorMap[item.id].getValue(); + item.id = null; + delete item["attrDefinition"]; + }); + parent.tableColumnList = tableDataList; + parent.layer.close(index); + parent.refreshCode = '0'; + } + return false; + }); + + $("body").on("click", "#addRow", function() { + addRow(); + }); + + $("body").on("click", "#deleteRow", function() { + deleteRow(); + }); + + // 新增行 + function addRow() { + tableDataList = [].concat(table.cache.messageTable); + resetData(tableDataList); + tableDataList.push({id: rowNum}); + table.reloadData("messageTable", {data: tableDataList}); + rowNum++; + } + + // 删除行 + function deleteRow() { + tableDataList = [].concat(table.cache.messageTable); + resetData(tableDataList); + var check_box = table.checkStatus('messageTable').data; + for (var i = 0; i < check_box.length; i++){ + var list = []; + $.each(tableDataList, function(j, item) { + if(item.id != check_box[i].id){ + list.push(item); + } + }); + tableDataList = [].concat(list); + } + table.reloadData("messageTable", {data: tableDataList}); + } + + function resetData(tableDataList) { + $.each(tableDataList, function (i, item) { + item.templet = jsEditorMap[item.id].getValue(); + item.align = $(`#align${item.id}`).val(); + item.hide = $(`#hide${item.id}`).val(); + }); + } + + $("body").on("click", "#cancle", function() { + parent.layer.close(index); + }); +}); \ No newline at end of file diff --git a/report/src/main/resources/template/js/reportDataFrom/reportDataFromWrite.js b/report/src/main/resources/template/js/reportDataFrom/reportDataFromWrite.js index ac205081ff3ef6829528c6a1441c7c160c24df59..fd5350b58e8cb240f3da4668efc612b190af1c10 100644 --- a/report/src/main/resources/template/js/reportDataFrom/reportDataFromWrite.js +++ b/report/src/main/resources/template/js/reportDataFrom/reportDataFromWrite.js @@ -19,6 +19,7 @@ layui.config({ if (isNull(id)) { skyeyeClassEnumUtil.showEnumDataListByClassName("reportDataFromType", 'radio', "dataFromTypeBox", '', form); initDataFromBoxContent(dataShowType.getData('dataFromTypeBox'), null) + $("#serviceStr").html(getDataUseHandlebars(selOption, {rows: serviceMap})); } else { AjaxPostUtil.request({url: sysMainMation.reportBasePath + "queryReportDataFromById", params: {id: id}, type: 'json', method: 'GET', callback:function(data) { $("#name").val(data.bean.name); @@ -27,6 +28,9 @@ layui.config({ initDataFromBoxContent(data.bean.type, data.bean) + $("#serviceStr").html(getDataUseHandlebars(selOption, {rows: serviceMap})); + $("#serviceStr").val(data.bean.restEntity?.serviceStr); + var list = [] if (data.bean.type == 1) { // XML数据源 @@ -67,10 +71,6 @@ layui.config({ type: dataShowType.getData('dataFromTypeBox'), id: isNull(id) ? '' : id }; - if (getAnalysisData().length == 0) { - winui.window.msg('请进行字段解析操作。', {icon: 2, time: 2000}); - return false; - } var otherData = getDataByType(); params = $.extend(true, params, otherData); @@ -125,7 +125,8 @@ layui.config({ method: $("#restMethod").val(), header: getRestRequestHeaderData(), requestBody: restRequestBodyContent.getValue(), - analysisList: getAnalysisData() + analysisList: getAnalysisData(), + serviceStr: $("#serviceStr").val() }) }; } @@ -159,7 +160,7 @@ layui.config({ return tableData; } - function getRestRequestHeaderData(){ + function getRestRequestHeaderData() { var tableData = new Array(); var rowTr = $("#restHeaderTable tr"); $.each(rowTr, function(i, item) { @@ -351,10 +352,11 @@ layui.config({ params = { requestUrl: $("#restUrl").val(), requestMethod: $("#restMethod").val(), - requestHeader: getRestRequestHeaderDataToResolution(), - requestBody: restRequestBodyContent.getValue() + requestHeader: getRestRequestHeaderData(), + requestBody: restRequestBodyContent.getValue(), + serviceStr: $("#serviceStr").val() }; - } else if (dataFromType == 4){ + } else if (dataFromType == 4) { // SQL数据源 if (isNull($("#dataBaseId").val())) { winui.window.msg('请选择数据库', {icon: 2, time: 2000}); @@ -372,28 +374,17 @@ layui.config({ return params; } - function getRestRequestHeaderDataToResolution(){ - var tableData = new Array(); - var rowTr = $("#restHeaderTable tr"); - $.each(rowTr, function(i, item) { - //获取行编号 - var rowNum = $(item).attr("trcusid").replace("tr", ""); - tableData[$("#headerKey" + rowNum).val()] = $("#headerValue" + rowNum).val(); - }); - return JSON.stringify(tableData); - } - function getDataByDataFromType(dataFromType, json){ - if (dataFromType == 1){ + if (dataFromType == 1) { // XML数据源 return json.bean.nodeArray; - } else if (dataFromType == 2){ + } else if (dataFromType == 2) { // JSON数据源 return json.bean.nodeArray; - } else if (dataFromType == 3){ + } else if (dataFromType == 3) { // Rest接口数据源 return json.bean.nodeArray; - } else if (dataFromType == 4){ + } else if (dataFromType == 4) { // SQL数据源 return json.rows; } @@ -410,13 +401,13 @@ layui.config({ $.each(data, function (i, item) { addAnalysisRow(); $("#key" + (rowNum - 1)).val(item); - if (dataFromType == 1){ + if (dataFromType == 1) { // XML数据源 - } else if (dataFromType == 2){ + } else if (dataFromType == 2) { // JSON数据源 - } else if (dataFromType == 3){ + } else if (dataFromType == 3) { // Rest接口数据源 - } else if (dataFromType == 4){ + } else if (dataFromType == 4) { // SQL数据源 $("#key" + (rowNum - 1)).val(item.name); $("#dataType" + (rowNum - 1)).val(item.dataType); diff --git a/report/src/main/resources/template/js/reportPage/reportPageShow.js b/report/src/main/resources/template/js/reportPage/reportPageShow.js index 2270fc0cc4babe52a59dd53330d96aae6252e5e8..3c13fdb43c836022dece7d148c5a50d91be618fe 100644 --- a/report/src/main/resources/template/js/reportPage/reportPageShow.js +++ b/report/src/main/resources/template/js/reportPage/reportPageShow.js @@ -26,6 +26,7 @@ layui.config({ initEchartsData(widthScale, heightScale); initWordMationData(widthScale, heightScale); + initTableMationData(widthScale, heightScale); if (!isNull(initData.bgImage)){ content.css({ @@ -79,6 +80,30 @@ layui.config({ } } + function initTableMationData(widthScale, heightScale) { + var tableMationList = initData.tableMationList; + if (!isNull(tableMationList)) { + $.each(tableMationList, function (i, item) { + var leftNum = multiplication(item.attrMation.attr["custom.move.x"].defaultValue, widthScale); + var topNum = multiplication(item.attrMation.attr["custom.move.y"].defaultValue, heightScale); + item.attrMation.attr["custom.move.x"].defaultValue = leftNum; + item.attrMation.attr["custom.move.y"].defaultValue = topNum; + item.attrMation.businessApi = getTableDataFromRest(item.attrMation.attr); + + item.attrMation.isPage = item.attrMation.attr["custom.isPage"]?.defaultValue + var boxId = addNewTableModel(item.modelId, item.attrMation); + $("#" + boxId).css({ + left: leftNum + "px", + top: topNum + "px", + width: multiplication(item.width, widthScale), + height: multiplication(item.height, heightScale) + }); + setBoxAttrMation("custom.box.background", boxId, item.attrMation.attr["custom.box.background"].defaultValue); + setBoxAttrMation("custom.box.border-color", boxId, item.attrMation.attr["custom.box.border-color"].defaultValue); + }); + } + } + function getContentStr(str) { if (!isNull(str)) { str = str.replace(/%/g, '%25'); @@ -123,6 +148,23 @@ layui.config({ return attr; } + function getTableDataFromRest(attr) { + var businessApi = {}; + var fromId = attr['custom.dataBaseMation'].defaultValue?.id; + if (isNull(fromId)) { + return businessApi; + } + var params = { + id: fromId + }; + AjaxPostUtil.request({url: sysMainMation.reportBasePath + "queryReportDataFromById", params: params, type: 'json', method: "GET", callback: function(json) { + businessApi.serviceStr = json.bean.restEntity?.serviceStr; + businessApi.api = json.bean.restEntity?.restUrl; + businessApi.method = json.bean.restEntity?.method; + }, async: false}); + return businessApi; + } + function addNewModel(modelId, echartsMation) { if (!isNull(echartsMation)) { var option = getEchartsOptions(echartsMation); @@ -144,6 +186,22 @@ layui.config({ return ""; } + // 加载表格模型 + function addNewTableModel(modelId, tableMation) { + // 获取boxId + var boxId = modelId + getRandomValueToString(); + // 获取表格图表id + var tableId = getTableBox(boxId, modelId); + // 加入页面属性 + tableMation["tableId"] = tableId + + // 加载表格 + dsFormTableUtil.initDynamicTable(tableId, tableMation); + + inPageTable[boxId] = $.extend(true, {}, tableMation); + return boxId; + } + // 加载文字模型 function addNewWordModel(modelId, wordStyleMation) { var styleStr = getWordStyleStr(wordStyleMation.wordModelAttrList); @@ -168,6 +226,17 @@ layui.config({ return echartsId; } + function getTableBox(boxId, modelId) { + var box = createBox(boxId, modelId, null); + + var tableBoxId = "table" + boxId; + var table = document.createElement("table"); + table.id = tableBoxId; + box.appendChild(table); + + return tableBoxId; + } + function getWordBox(boxId, modelId, styleStr, wordStyleMation) { var wordId = "word" + boxId; var wordBox = document.createElement("font"); diff --git a/report/src/main/resources/template/tpl/pageReportDesign/pageReportDesign.html b/report/src/main/resources/template/tpl/pageReportDesign/pageReportDesign.html index 6bbfbc2781a0ecd714891c81eb20c289eafed699..9505ad82213cec8a347a4e0fde038e1281eaa75c 100644 --- a/report/src/main/resources/template/tpl/pageReportDesign/pageReportDesign.html +++ b/report/src/main/resources/template/tpl/pageReportDesign/pageReportDesign.html @@ -11,11 +11,11 @@ - - - - - + + + + + \ No newline at end of file diff --git a/report/src/main/resources/template/tpl/pageReportDesign/simpleTableDesign.html b/report/src/main/resources/template/tpl/pageReportDesign/simpleTableDesign.html new file mode 100644 index 0000000000000000000000000000000000000000..c88c74dc83658f354f251f453830e4923618a28a --- /dev/null +++ b/report/src/main/resources/template/tpl/pageReportDesign/simpleTableDesign.html @@ -0,0 +1,59 @@ + + + + + + + + + + + +
+
+
+ +
+
+ 拖拽表格行可修改顺序。 +
+
+ + +
+ + +
+
+
+
+
+ + +
+
+
+
+ + + + + \ No newline at end of file diff --git a/report/src/main/resources/template/tpl/reportDataFrom/dataFromTpl/restTemplate.tpl b/report/src/main/resources/template/tpl/reportDataFrom/dataFromTpl/restTemplate.tpl index 828668b0597b349c899fbea96213a0d61dfcb3d6..57a2cedd26ea734420f357a8e514947ee83b70a3 100644 --- a/report/src/main/resources/template/tpl/reportDataFrom/dataFromTpl/restTemplate.tpl +++ b/report/src/main/resources/template/tpl/reportDataFrom/dataFromTpl/restTemplate.tpl @@ -1,4 +1,10 @@ -
+
+ +
+ +
+
+
diff --git a/rmprogram/.gitignore b/rmprogram/.gitignore deleted file mode 100644 index 1a35619c86dfc9faa08040e8de693ce15e0434c9..0000000000000000000000000000000000000000 --- a/rmprogram/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -*.class - -# Package Files # -*.war -*.ear - -class -.settings -*.classpath -/bin -classes -/target/ -/.project/ -/logs/ -/.idea/ -*.iml \ No newline at end of file diff --git a/rmprogram/pom.xml b/rmprogram/pom.xml deleted file mode 100644 index c3078dd6339da80cce5c9369264ba7093f1c4470..0000000000000000000000000000000000000000 --- a/rmprogram/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - skyeye-web - com.skyeye.web - 1-SNAPSHOT - - 4.0.0 - - rmprogram - - - 8 - 8 - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmgroup/rmgroupadd.js b/rmprogram/src/main/resources/template/js/rmgroup/rmgroupadd.js deleted file mode 100644 index 5bd1b52ec3294215e70e07e4660f00364e7a9d85..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmgroup/rmgroupadd.js +++ /dev/null @@ -1,60 +0,0 @@ - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - - showGrid({ - id: "rmTypeId", - url: sysMainMation.rmprogramBasePath + "common001", - params: {}, - pagination: false, - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - matchingLanguage(); - form.render(); - form.on('select(selectParent)', function(data) { - - }); - - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - rmTypeId: $("#rmTypeId").val(), - rmGroupName: $("#rmGroupName").val(), - icon: $("#rmGroupIcon").val(), - }; - - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx009", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - } - }); - - // 菜单图标选中事件 - $("body").on("focus", "#rmGroupIcon", function (e) { - systemCommonUtil.openSysEveIconChoosePage(function(sysIconChooseClass){ - $("#rmGroupIcon").val(sysIconChooseClass); - }); - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - - }); -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmgroup/rmgroupedit.js b/rmprogram/src/main/resources/template/js/rmgroup/rmgroupedit.js deleted file mode 100644 index 44a614fc6d4a3305719cb1e1b6a918e8924933be..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmgroup/rmgroupedit.js +++ /dev/null @@ -1,74 +0,0 @@ - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - - showGrid({ - id: "showForm", - url: sysMainMation.rmprogramBasePath + "rmxcx011", - params: {rowId: parent.rowId}, - pagination: false, - template: getFileContent('tpl/rmgroup/rmgroupeditTemplate.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - showGrid({ - id: "rmTypeId", - url: sysMainMation.rmprogramBasePath + "common001", - params: {}, - pagination: false, - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function(json1){ - $("#rmTypeId").val(json.bean.rmTypeId); - - matchingLanguage(); - form.render(); - form.on('select(selectParent)', function(data) { - - }); - - form.on('submit(formEditBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - rmTypeId: $("#rmTypeId").val(), - rmGroupName: $("#rmGroupName").val(), - icon: $("#rmGroupIcon").val(), - rowId: parent.rowId - }; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx012", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - } - }); - } - }); - - // 菜单图标选中事件 - $("body").on("focus", "#rmGroupIcon", function (e) { - systemCommonUtil.openSysEveIconChoosePage(function(sysIconChooseClass){ - $("#rmGroupIcon").val(sysIconChooseClass); - }); - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - - }); - -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmgroup/rmgrouplist.js b/rmprogram/src/main/resources/template/js/rmgroup/rmgrouplist.js deleted file mode 100644 index 026b391c0832d4d1a3a7d5b8d59963b09063815e..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmgroup/rmgrouplist.js +++ /dev/null @@ -1,148 +0,0 @@ - -var rowId = ""; -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { - winui.renderColor(); - var $ = layui.$, - form = layui.form, - table = layui.table; - - authBtn('1554952601470'); - - showGrid({ - id: "rmTypeId", - url: sysMainMation.rmprogramBasePath + "common001", - params: {}, - pagination: false, - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - form.render(); - form.on('select(selectParent)', function(data) { - - }); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - refreshTable(); - } - return false; - }); - } - }); - - table.render({ - id: 'messageTable', - elem: '#messageTable', - method: 'post', - url: sysMainMation.rmprogramBasePath + 'rmxcx008', - where: {rmGroupName: $("#rmGroupName").val(), rmTypeId: $("#rmTypeId").val()}, - even: true, - page: true, - limits: [8, 16, 24, 32, 40, 48, 56], - limit: 8, - cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'rmGroupName', title: '分组名称', width: 120 }, - { field: 'icon', title: '图标码', width: 520 }, - { field: 'icon', title: '图标', width: 120, templet: function (d) { - return ''; - }}, - { field: 'typeName', title: '所属分类', width: 120 }, - { field: 'groupMemberNum', title: '组件数量', width: 120 }, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150 }, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'} - ]], - done: function(json) { - matchingLanguage(); - } - }); - - table.on('tool(messageTable)', function (obj) { - var data = obj.data; - var layEvent = obj.event; - if (layEvent === 'del') { //删除 - del(data, obj); - } else if (layEvent === 'edit') { //编辑 - edit(data); - } else if (layEvent === 'top') { //上移 - topOne(data); - } else if (layEvent === 'lower') { //下移 - lowerOne(data); - } - }); - - //删除 - function del(data, obj) { - var msg = obj ? '确认删除分组【' + obj.data.rmGroupName + '】吗？' : '确认删除选中数据吗？'; - layer.confirm(msg, { icon: 3, title: '删除分组' }, function (index) { - layer.close(index); - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx010", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - //上移 - function topOne(data) { - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx013", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.moveUpOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - //下移 - function lowerOne(data) { - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx014", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.moveDownOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - //编辑 - function edit(data) { - rowId = data.id; - _openNewWindows({ - url: "../../tpl/rmgroup/rmgroupedit.html", - title: "编辑分组", - pageId: "rmgroupedit", - area: ['600px', '50vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - //刷新数据 - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - //新增 - $("body").on("click", "#addBean", function() { - _openNewWindows({ - url: "../../tpl/rmgroup/rmgroupadd.html", - title: "新增分组", - pageId: "rmgroupadd", - area: ['600px', '50vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - - function loadTable() { - table.reloadData("messageTable", {where:{rmGroupName: $("#rmGroupName").val(), rmTypeId: $("#rmTypeId").val()}}); - } - - function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where:{rmGroupName: $("#rmGroupName").val(), rmTypeId: $("#rmTypeId").val()}}); - } - - exports('rmgrouplist', {}); -}); diff --git a/rmprogram/src/main/resources/template/js/rmgroupmember/bindproperty.js b/rmprogram/src/main/resources/template/js/rmgroupmember/bindproperty.js deleted file mode 100644 index 833e34fec9bcbf1fce66fc16ae11d7962bc60f36..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmgroupmember/bindproperty.js +++ /dev/null @@ -1,69 +0,0 @@ - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - - // 加载标签属性 - showGrid({ - id: "propertyList", - url: sysMainMation.rmprogramBasePath + "rmproperty006", - params: {}, - pagination: false, - template: getFileContent('tpl/template/checkbox-property.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - form.render('checkbox'); - var params = { - rowId: parent.rowId - }; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx039", params: params, type: 'json', callback: function (json) { - if(json.total != 0){ - for(var i in json.rows){ - $('input:checkbox[rowId="' + json.rows[i].propertyId + '"]').attr("checked", true); - } - } - form.render('checkbox'); - }}); - } - }); - - matchingLanguage(); - form.render(); - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var propertyIds = ""; - $.each($('input:checkbox:checked'),function(){ - propertyIds = propertyIds + $(this).attr("rowId") + ","; - }); - if(isNull(propertyIds)){ - winui.window.msg('请先选择标签属性。', {icon: 2, time: 2000}); - } else { - var params = { - rowId: parent.rowId, - propertyIds: propertyIds - }; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx038", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - } - return false; - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - - }); -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmgroupmember/rmgroupmemberadd.js b/rmprogram/src/main/resources/template/js/rmgroupmember/rmgroupmemberadd.js deleted file mode 100644 index f6917d2bb0ef426b58a419c541c5d6fdcc8982e4..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmgroupmember/rmgroupmemberadd.js +++ /dev/null @@ -1,214 +0,0 @@ - -var isPic = false;//是否执行生成图片 - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'swiper'], function (exports) { - winui.renderColor(); - layui.use(['form', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx', - 'solr', 'sql', 'vue'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - - $("#download").hide(); - - var htmlContent = CodeMirror.fromTextArea(document.getElementById("htmlContent"), { - mode : "xml", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - var htmlJsContent = CodeMirror.fromTextArea(document.getElementById("htmlJsContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - var wxmlContent = CodeMirror.fromTextArea(document.getElementById("wxmlContent"), { - mode : "xml", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - var wxmlJsDataContent = CodeMirror.fromTextArea(document.getElementById("wxmlJsDataContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - var wxmlJsMethodContent = CodeMirror.fromTextArea(document.getElementById("wxmlJsMethodContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - var wxmlJsMethodCreateContent = CodeMirror.fromTextArea(document.getElementById("wxmlJsMethodCreateContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - showGrid({ - id: "rmTypeId", - url: sysMainMation.rmprogramBasePath + "common001", - params: {}, - pagination: false, - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - matchingLanguage(); - form.render(); - //小程序分类变化事件 - form.on('select(selectParent)', function(data) { - showGrid({ - id: "rmGroupId", - url: sysMainMation.rmprogramBasePath + "common002", - params: {parentId: data.value}, - pagination: false, - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - form.render('select'); - } - }); - }); - - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - if(!isPic){ - winui.window.msg("请先生成预览图", {icon: 2, time: 2000}); - } else if (isNull(htmlContent.getValue())){ - winui.window.msg("请填写HTML内容", {icon: 2, time: 2000}); - } else if (isNull(wxmlContent.getValue())){ - winui.window.msg("请填写WXML内容", {icon: 2, time: 2000}); - } else { - var oCanvas = document.getElementById("thecanvas"); - var imgData = oCanvas.toDataURL(); - AjaxPostUtil.request({url: reqBasePath + "common004", params: {images:imgData, type:1}, type: 'json', callback: function(json1){ - var params = { - rmTypeId: $("#rmTypeId").val(), - rmGroupId: $("#rmGroupId").val(), - htmlContent: encodeURI(htmlContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - htmlJsContent: encodeURI(htmlJsContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - wxmlContent: encodeURI(wxmlContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - wxmlJsDataContent: encodeURI(wxmlJsDataContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - wxmlJsMethodContent: encodeURI(wxmlJsMethodContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - wxmlJsMethodCreateContent: encodeURI(wxmlJsMethodCreateContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - img: json1.bean.picUrl - }; - - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx016", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - }}); - } - } - return false; - }); - } - }); - - //HTML内容变化事件 - htmlContent.on("change",function(){ - $("#printPic").html(htmlContent.getValue()); - $("#htmlJsContentScript").html(''); - }); - - //HTML-JS内容变化事件 - htmlJsContent.on("change",function(){ - $("#printPic").html(htmlContent.getValue()); - $("#htmlJsContentScript").html(''); - }); - - // 下载canvas图片 - $("body").on("click", "#download", function() { - var oCanvas = document.getElementById("thecanvas"); - var img_data1 = Canvas2Image.saveAsPNG(oCanvas, true).getAttribute('src'); - saveFile(img_data1, 'richer.png'); - }); - - // 生成图片 - $("body").on("click", "#createPic", function() { - if(isNull($("#printPic").html().trim())){ - winui.window.msg('请填写HTML内容', {icon: 2, time: 2000}); - } else { - html2canvas($("#printPic"), { - onrendered: function(canvas) { - // 添加属性 - canvas.setAttribute('id','thecanvas'); - // 读取属性值 - document.getElementById('images').innerHTML = ''; - document.getElementById('images').appendChild(canvas); - $("#download").show(); - } - }); - isPic = true; - } - }); - - // 保存文件函数 - var saveFile = function(data, filename){ - var save_link = document.createElementNS('http://www.w3.org/1999/xhtml', 'a'); - save_link.href = data; - save_link.download = filename; - var event = document.createEvent('MouseEvents'); - event.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); - save_link.dispatchEvent(event); - }; - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - - }); -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmgroupmember/rmgroupmemberedit.js b/rmprogram/src/main/resources/template/js/rmgroupmember/rmgroupmemberedit.js deleted file mode 100644 index 099278bccada21e5cea0659fd3511c933f109540..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmgroupmember/rmgroupmemberedit.js +++ /dev/null @@ -1,156 +0,0 @@ - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'fileUpload', 'swiper'], function (exports) { - winui.renderColor(); - layui.use(['form', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx', 'solr', 'sql', 'vue'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - var htmlContent, htmlJsContent, wxmlContent, wxmlJsDataContent, wxmlJsMethodContent, wxmlJsMethodCreateContent; - - showGrid({ - id: "showForm", - url: sysMainMation.rmprogramBasePath + "rmxcx020", - params: {rowId: parent.rowId}, - pagination: false, - template: getFileContent('tpl/rmgroupmember/rmgroupmembereditTemplate.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - // 初始化上传 - $("#printsPicUrl").upload(systemCommonUtil.uploadCommon003Config('printsPicUrl', 1, json.bean.printsPicUrl, 1)); - - htmlContent = CodeMirror.fromTextArea(document.getElementById("htmlContent"), { - mode : "xml", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - htmlJsContent = CodeMirror.fromTextArea(document.getElementById("htmlJsContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - wxmlContent = CodeMirror.fromTextArea(document.getElementById("wxmlContent"), { - mode : "xml", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - wxmlJsDataContent = CodeMirror.fromTextArea(document.getElementById("wxmlJsDataContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - wxmlJsMethodContent = CodeMirror.fromTextArea(document.getElementById("wxmlJsMethodContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - wxmlJsMethodCreateContent = CodeMirror.fromTextArea(document.getElementById("wxmlJsMethodCreateContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - matchingLanguage(); - form.render(); - form.on('submit(formEditBean)', function (data) { - if (winui.verifyForm(data.elem)) { - if(isNull(htmlContent.getValue())){ - winui.window.msg("请填写HTML内容", {icon: 2, time: 2000}); - } else if (isNull(wxmlContent.getValue())){ - winui.window.msg("请填写WXML内容", {icon: 2, time: 2000}); - } else { - var params = { - htmlContent: encodeURI(htmlContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - htmlJsContent: encodeURI(htmlJsContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - wxmlContent: encodeURI(wxmlContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - wxmlJsDataContent: encodeURI(wxmlJsDataContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - wxmlJsMethodContent: encodeURI(wxmlJsMethodContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - wxmlJsMethodCreateContent: encodeURI(wxmlJsMethodCreateContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - rowId: parent.rowId, - }; - - params.img = $("#printsPicUrl").find("input[type='hidden'][name='upload']").attr("oldurl"); - - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx021", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - } - return false; - }); - } - }); - - //HTML内容变化事件 - htmlContent.on("change",function(){ - $("#printPic").html(htmlContent.getValue()); - $("#htmlJsContentScript").html(''); - }); - - //HTML-JS内容变化事件 - htmlJsContent.on("change",function(){ - $("#printPic").html(htmlContent.getValue()); - $("#htmlJsContentScript").html(''); - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - - }); - -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmgroupmember/rmgroupmemberlist.js b/rmprogram/src/main/resources/template/js/rmgroupmember/rmgroupmemberlist.js deleted file mode 100644 index 6051e3ab1dd03e4e599f427b77334d62d30089d9..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmgroupmember/rmgroupmemberlist.js +++ /dev/null @@ -1,316 +0,0 @@ - -var rowId = ""; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx', 'solr', 'sql', 'vue'], function (exports) { - winui.renderColor(); - - var $ = layui.$, - form = layui.form, - table = layui.table; - - authBtn('1560833378100'); - - var editor = CodeMirror.fromTextArea(document.getElementById("modelContent"), { - mode : "text/x-java", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : true, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true - }); - - showGrid({ - id: "rmTypeId", - url: sysMainMation.rmprogramBasePath + "common001", - params: {}, - pagination: false, - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - form.render(); - form.on('select(selectParent)', function(data) { - showGrid({ - id: "rmGroupId", - url: sysMainMation.rmprogramBasePath + "common002", - params: {parentId: data.value}, - pagination: false, - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - form.render('select'); - } - }); - }); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - refreshTable(); - } - return false; - }); - } - }); - - table.render({ - id: 'messageTable', - elem: '#messageTable', - method: 'post', - url: sysMainMation.rmprogramBasePath + 'rmxcx015', - where: getTableParams(), - even: true, - page: true, - limits: getLimits(), - limit: getLimit(), - cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'printsPicUrl', title: '效果图', width: 200, align: 'center', templet: function (d) { - return ''; - }}, - { field: 'id', title: 'HTML内容', width: 150, align: 'center', templet: function (d) { - return ''; - }}, - { field: 'id', title: 'HTML-JS内容', width: 150, align: 'center', templet: function (d) { - if (!isNull(d.htmlJsContent)){ - return ''; - } else { - return '无'; - } - }}, - { field: 'id', title: 'WXML内容', width: 150, align: 'center', templet: function (d) { - return ''; - }}, - { field: 'id', title: 'WXML-JS数据内容', width: 150, align: 'center', templet: function (d) { - if (!isNull(d.wxmlJsDataContent)){ - return ''; - } else { - return '无'; - } - }}, - { field: 'id', title: 'WXML-JS方法内容', width: 150, align: 'center', templet: function (d) { - if (!isNull(d.wxmlJsMethodContent)){ - return ''; - } else { - return '无'; - } - }}, - { field: 'id', title: 'WXML-JS初始化方法内容', width: 150, align: 'center', templet: function (d) { - if (!isNull(d.wxmlJsMethodCreateContent)){ - return ''; - } else { - return '无'; - } - }}, - { field: 'typeName', title: '所属分类', width: 120 }, - { field: 'groupName', title: '所属分组', width: 120 }, - { field: 'memberUseNum', title: '使用次数', width: 120 }, - { field: 'propertyNum', title: '标签属性数量', width: 120 }, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 180 }, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 300, toolbar: '#tableBar'} - ]], - done: function(json) { - matchingLanguage(); - } - }); - - table.on('tool(messageTable)', function (obj) { - var data = obj.data; - var layEvent = obj.event; - if (layEvent === 'del') { //删除 - del(data, obj); - } else if (layEvent === 'edit') { //编辑 - edit(data); - } else if (layEvent === 'bindProperty') { //绑定属性 - bindProperty(data); - } else if (layEvent === 'top') { //上移 - topOne(data); - } else if (layEvent === 'lower') { //下移 - lowerOne(data); - } else if (layEvent === 'htmlContent') { //HTML内容 - var mode = returnModel('html'); - if (!isNull(mode.length)) { - editor.setOption('mode', mode) - } - editor.setValue(data.htmlContent); - layer.open({ - id: 'HTML内容', - type: 1, - title: 'HTML内容', - shade: 0.3, - area: ['90vw', '90vh'], - content: $("#modelContentDiv").html() - }); - } else if (layEvent === 'htmlJsContent') { //HTML-JS内容 - var mode = returnModel('javascript'); - if (!isNull(mode.length)) { - editor.setOption('mode', mode) - } - editor.setValue(data.htmlJsContent); - layer.open({ - id: 'HTML-JS内容', - type: 1, - title: 'HTML-JS内容', - shade: 0.3, - area: ['90vw', '90vh'], - content: $("#modelContentDiv").html() - }); - } else if (layEvent === 'wxmlContent') { //WXML内容 - var mode = returnModel('html'); - if (!isNull(mode.length)) { - editor.setOption('mode', mode) - } - editor.setValue(data.wxmlContent); - layer.open({ - id: 'WXML内容', - type: 1, - title: 'WXML内容', - shade: 0.3, - area: ['90vw', '90vh'], - content: $("#modelContentDiv").html() - }); - } else if (layEvent === 'wxmlJsDataContent') { //WXML-JS数据内容 - var mode = returnModel('javascript'); - if (!isNull(mode.length)) { - editor.setOption('mode', mode) - } - editor.setValue(data.wxmlJsDataContent); - layer.open({ - id: 'WXML-JS数据内容', - type: 1, - title: 'WXML-JS数据内容', - shade: 0.3, - area: ['90vw', '90vh'], - content: $("#modelContentDiv").html() - }); - } else if (layEvent === 'wxmlJsMethodContent') { //WXML-JS方法内容 - var mode = returnModel('javascript'); - if (!isNull(mode.length)) { - editor.setOption('mode', mode) - } - editor.setValue(data.wxmlJsMethodContent); - layer.open({ - id: 'WXML-JS方法内容', - type: 1, - title: 'WXML-JS方法内容', - shade: 0.3, - area: ['90vw', '90vh'], - content: $("#modelContentDiv").html() - }); - } else if (layEvent === 'wxmlJsMethodCreateContent') { //WXML-JS初始化方法内容 - var mode = returnModel('javascript'); - if (!isNull(mode.length)) { - editor.setOption('mode', mode) - } - editor.setValue(data.wxmlJsMethodCreateContent); - layer.open({ - id: 'WXML-JS初始化方法内容', - type: 1, - title: 'WXML-JS初始化方法内容', - shade: 0.3, - area: ['90vw', '90vh'], - content: $("#modelContentDiv").html() - }); - } else if (layEvent === 'printsPicUrl') { //图片预览 - systemCommonUtil.showPicImg(fileBasePath + data.printsPicUrl); - } - }); - - // 删除 - function del(data, obj) { - layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { - layer.close(index); - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx019", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - // 上移 - function topOne(data) { - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx017", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.moveUpOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - // 下移 - function lowerOne(data) { - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx018", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.moveDownOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - // 编辑 - function edit(data) { - rowId = data.id; - _openNewWindows({ - url: "../../tpl/rmgroupmember/rmgroupmemberedit.html", - title: "编辑组件", - pageId: "rmgroupmemberedit", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - // 绑定属性 - function bindProperty(data) { - rowId = data.id; - _openNewWindows({ - url: "../../tpl/rmgroupmember/bindproperty.html", - title: "绑定属性", - pageId: "bindproperty", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - // 刷新数据 - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - // 新增 - $("body").on("click", "#addBean", function() { - _openNewWindows({ - url: "../../tpl/rmgroupmember/rmgroupmemberadd.html", - title: "新增组件", - pageId: "rmgroupmemberadd", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - - function loadTable() { - table.reloadData("messageTable", {where: getTableParams()}); - } - - function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); - } - - function getTableParams() { - return { - rmGroupId: $("#rmGroupId").val(), - rmTypeId: $("#rmTypeId").val() - }; - } - - exports('rmgroupmemberlist', {}); -}); diff --git a/rmprogram/src/main/resources/template/js/rmmysmpro/mysmproadd.js b/rmprogram/src/main/resources/template/js/rmmysmpro/mysmproadd.js deleted file mode 100644 index 8b71a5fa15d1faedfd2557c078feeb15363de46d..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmmysmpro/mysmproadd.js +++ /dev/null @@ -1,37 +0,0 @@ - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - - matchingLanguage(); - form.render(); - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - proName: $("#proName").val(), - proDesc: $("#proDesc").val() - }; - - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx023", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - - }); -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmmysmpro/mysmproedit.js b/rmprogram/src/main/resources/template/js/rmmysmpro/mysmproedit.js deleted file mode 100644 index 2fff2b14f7da4b50f6cfcac25f5de9c9ae3b829e..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmmysmpro/mysmproedit.js +++ /dev/null @@ -1,50 +0,0 @@ - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window','table', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - - showGrid({ - id: "showForm", - url: sysMainMation.rmprogramBasePath + "rmxcx025", - params: {rowId: parent.rowId}, - pagination: false, - template: getFileContent('tpl/rmmysmpro/mysmproeditTemplate.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - matchingLanguage(); - form.render(); - form.on('submit(formEditBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - proName: $("#proName").val(), - proDesc: $("#proDesc").val(), - rowId: parent.rowId - }; - - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx026", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - - } - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - - }); -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmmysmpro/mysmprolist.js b/rmprogram/src/main/resources/template/js/rmmysmpro/mysmprolist.js deleted file mode 100644 index 530b7429dddd9854604a95910fd90b37d20859d1..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmmysmpro/mysmprolist.js +++ /dev/null @@ -1,128 +0,0 @@ - -var rowId = ""; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { - winui.renderColor(); - var $ = layui.$, - form = layui.form, - table = layui.table; - - authBtn('1560823576324'); - - table.render({ - id: 'messageTable', - elem: '#messageTable', - method: 'post', - url: sysMainMation.rmprogramBasePath + 'rmxcx022', - where: {proName: $("#proName").val()}, - even: true, - page: true, - limits: [8, 16, 24, 32, 40, 48, 56], - limit: 8, - cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'proName', title: '项目名称', width: 120 }, - { field: 'proDesc', title: '项目描述', width: 520 }, - { field: 'pageNum', title: '页面数量', width: 120 }, - { field: 'modelNum', title: '组件数量', width: 120 }, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 180 }, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'} - ]], - done: function(json) { - matchingLanguage(); - } - }); - - table.on('tool(messageTable)', function (obj) { - var data = obj.data; - var layEvent = obj.event; - if (layEvent === 'del') { //删除 - del(data, obj); - } else if (layEvent === 'edit') { //编辑 - edit(data); - } else if (layEvent === 'consolePro') { //管理项目 - consolePro(data); - } - }); - - form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - refreshTable(); - } - return false; - }); - - //删除 - function del(data, obj) { - var msg = obj ? '确认删除项目【' + obj.data.proName + '】吗？' : '确认删除选中数据吗？'; - layer.confirm(msg, { icon: 3, title: '删除项目' }, function (index) { - layer.close(index); - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx024", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - //管理项目 - function consolePro(data) { - rowId = data.id; - _openNewWindows({ - url: "../../tpl/rmmysmpropage/mysmpropagelist.html", - title: "管理项目", - pageId: "rmmysmproconsolePro", - area: ['100vw', '100vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - //编辑 - function edit(data) { - rowId = data.id; - _openNewWindows({ - url: "../../tpl/rmmysmpro/mysmproedit.html", - title: "编辑项目", - pageId: "rmmysmproedit", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - //刷新数据 - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - //新增 - $("body").on("click", "#addBean", function() { - _openNewWindows({ - url: "../../tpl/rmmysmpro/mysmproadd.html", - title: "新增项目", - pageId: "rmmysmproadd", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - - function loadTable() { - table.reloadData("messageTable", {where:{proName: $("#proName").val()}}); - } - - function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where:{proName: $("#proName").val()}}); - } - - exports('mysmprolist', {}); -}); diff --git a/rmprogram/src/main/resources/template/js/rmmysmpropage/addpagebeanitem.js b/rmprogram/src/main/resources/template/js/rmmysmpropage/addpagebeanitem.js deleted file mode 100644 index 7b480b647369432a72e0e05d498c77c9b1d9533d..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmmysmpropage/addpagebeanitem.js +++ /dev/null @@ -1,36 +0,0 @@ -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - - matchingLanguage(); - form.render(); - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - name: $("#pageName").val(), - filePath: $("#filePath").val(), - fileName: $("#fileName").val(), - rowId: parent.proId - }; - - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx030", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - }); -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmmysmpropage/editpagebeanitem.js b/rmprogram/src/main/resources/template/js/rmmysmpropage/editpagebeanitem.js deleted file mode 100644 index a092a3e6ff043884476467fbcc0405c2cde72ee5..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmmysmpropage/editpagebeanitem.js +++ /dev/null @@ -1,47 +0,0 @@ -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - - showGrid({ - id: "showForm", - url: sysMainMation.rmprogramBasePath + "rmxcx033", - params: {rowId: parent.pageId}, - pagination: false, - template: getFileContent('tpl/rmmysmpropage/projectpageeditTemplate.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - matchingLanguage(); - form.render(); - form.on('submit(formEditBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - name: $("#pageName").val(), - filePath: $("#filePath").val(), - fileName: $("#fileName").val(), - rowId: parent.pageId - }; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx034", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - } - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - }); -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmmysmpropage/mysmpropagelist.js b/rmprogram/src/main/resources/template/js/rmmysmpropage/mysmpropagelist.js deleted file mode 100644 index f66c5d12d9163bbf96a4749ec21874d0f8e27e66..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmmysmpropage/mysmpropagelist.js +++ /dev/null @@ -1,395 +0,0 @@ - -var proId = "";//项目id - -var pageId = "";//页面id - -var editPageModelSelectId = "";//正在编辑模板中的页面id -var editPageModelSelectChange = false;//选中的页面，模板是否修改 - -var form = "";//表单属性 - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form', 'dragula', 'swiper', 'slider', 'colorpicker', 'fileUpload', 'layedit'], function (exports) { - winui.renderColor(); - var $ = layui.$, - table = layui.table; - form = layui.form; - - proId = parent.rowId;//项目id - $("#groupMemberTab").hide(); - //初始化加载该项目的所有页面 - showGrid({ - id: "pageList", - url: sysMainMation.rmprogramBasePath + "rmxcx029", - params: {rowId: parent.rowId}, - pagination: false, - template: getFileContent('tpl/rmmysmpropage/pageTemplate.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - options: { - 'click .page-click-item':function(index, row){//选择编辑模板中的页面 - if(row.id == editPageModelSelectId){//如果选中的页面正是当前编辑模板中的页面，则不做任何操作 - - } else { - if(editPageModelSelectChange == true){//编辑了页面但没有保存 - layer.confirm('当前修改页面没有保存，是否继续吗？', { icon: 3, title: '小程序页面编辑通知' }, function (i) { - layer.close(i); - $(".page-click-item").removeClass("check-item-shoose"); - $("#pageList>li:eq(" + index + ")").addClass("check-item-shoose"); - editPageModelSelectId = row.id; - editPageModelSelectChange = false; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx036", params: {pageId: editPageModelSelectId}, type: 'json', callback: function (json) { - showDataUseHandlebars("centerText", getFileContent('tpl/rmmysmpropage/pagemodelTemplate.tpl'), json); - }}); - }); - } else { - $(".page-click-item").removeClass("check-item-shoose"); - $("#pageList>li:eq(" + index + ")").addClass("check-item-shoose"); - editPageModelSelectId = row.id; - editPageModelSelectChange = false; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx036", params: {pageId: editPageModelSelectId}, type: 'json', callback: function (json) { - showDataUseHandlebars("centerText", getFileContent('tpl/rmmysmpropage/pagemodelTemplate.tpl'), json); - }}); - } - } - }, - 'click .reName':function(index, row){//重命名 - pageId = row.id; - _openNewWindows({ - url: "../../tpl/rmmysmpropage/editpagebeanitem.html", - title: "重命名页面", - pageId: "editpagebeanitem", - area: ['700px', '60vh'], - callBack: function (refreshCode) { - refreshGrid("pageList", {params:{rowId: proId}}); - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - //重置中间模块 - editPageModelSelectId = ""; - editPageModelSelectChange = false; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx036", params: {pageId: editPageModelSelectId}, type: 'json', callback: function (json) { - showDataUseHandlebars("centerText", getFileContent('tpl/rmmysmpropage/pagemodelTemplate.tpl'), json); - }}); - }}); - }, - 'click .toUp':function(index, row){//上移 - var params = { - proId: proId, - rowId: row.id - }; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx031", params: params, type: 'json', callback: function (json) { - refreshGrid("pageList", {params:{rowId: proId}}); - //重置中间模块 - editPageModelSelectId = ""; - editPageModelSelectChange = false; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx036", params: {pageId: editPageModelSelectId}, type: 'json', callback: function (json) { - showDataUseHandlebars("centerText", getFileContent('tpl/rmmysmpropage/pagemodelTemplate.tpl'), json); - }}); - }}); - }, - 'click .toDown':function(index, row){//下移 - var params = { - proId: proId, - rowId: row.id - }; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx032", params: params, type: 'json', callback: function (json) { - refreshGrid("pageList", {params:{rowId: proId}}); - //重置中间模块 - editPageModelSelectId = ""; - editPageModelSelectChange = false; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx036", params: {pageId: editPageModelSelectId}, type: 'json', callback: function (json) { - showDataUseHandlebars("centerText", getFileContent('tpl/rmmysmpropage/pagemodelTemplate.tpl'), json); - }}); - }}); - }, - 'click .copyPage':function(index, row){//复制 - - }, - 'click .delPage':function(index, row){//删除 - var msg = row ? '确认删除页面【' + row.name + '】吗？' : '确认删除选中数据吗？'; - layer.confirm(msg, { icon: 3, title: '删除小程序页面' }, function (index) { - layer.close(index); - - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx035", params: {rowId: row.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - refreshGrid("pageList", {params:{rowId: proId}}); - //重置中间模块 - editPageModelSelectId = ""; - editPageModelSelectChange = false; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx036", params: {pageId: editPageModelSelectId}, type: 'json', callback: function (json) { - showDataUseHandlebars("centerText", getFileContent('tpl/rmmysmpropage/pagemodelTemplate.tpl'), json); - }}); - }}); - }); - } - }, - ajaxSendAfter:function (json) { - matchingLanguage(); - //初始化加载小程序组件分组 - showGrid({ - id: "groupMember", - url: sysMainMation.rmprogramBasePath + "rmxcx027", - params: {}, - pagination: false, - template: getFileContent('tpl/rmmysmpropage/groupTemplate.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - - } - }); - } - }); - - var winH = $(window).height(); - var categorySpace = 10; - - dragula([document.getElementById('memberList'), document.getElementById('centerText')], { - copy: function (el, source) {//复制 - return source === document.getElementById('memberList'); - }, - accepts: function (el, target) {//移动 - return target !== document.getElementById('memberList'); - } - }).on('drop', function (el, container) {//放置 - if($(container).attr("id") == 'centerText'){//放置在手机里面 - if(isNull(editPageModelSelectId)){ - winui.window.msg('请先选择要编辑的页面', {icon: 2, time: 2000}); - $("#centerText").empty(); - } else { - el.className = 'layui-col-md12 import-item'; - var content = '
' + $(el).attr("htmlContent") + '
';//内容 - var operationContent = '
' + - '' + - '' + - '
'; - var JsContent = '' - $(el).html(content + operationContent + JsContent); - $(el).find(".check-item-operation").hide(); - } - } - }); - - //二级菜单点击 - $('body').on('click', '.js_item', function() { - var id = $(this).data('id'); - var title = $(this).data('name'); - showGrid({ - id: "memberList", - url: sysMainMation.rmprogramBasePath + "rmxcx028", - params: {rowId: id}, - pagination: false, - template: getFileContent('tpl/rmmysmpropage/groupMemberTemplate.tpl'), - ajaxSendLoadBefore: function(hdb) { - hdb.registerHelper("compare1", function(v1, options){ - return fileBasePath + "images/upload/smpropic/" + v1; - }); - }, - ajaxSendAfter:function (json) { - } - }); - $("#groupTitle").html(title); - $("#groupTab").animate({ - width : "hide", - opacity: "0", - paddingLeft : "hide", - paddingRight : "hide", - marginLeft : "hide", - marginRight : "hide" - }, 500); - $("#groupMemberTab").animate({ - width : "show", - opacity: "1", - paddingLeft : "show", - paddingRight : "show", - marginLeft : "show", - marginRight : "show" - }, 500); - }); - - //返回分组列表 - $('body').on('click', '#returnGroupTab', function() { - $("#groupMemberTab").animate({ - width : "hide", - opacity: "0", - paddingLeft : "hide", - paddingRight : "hide", - marginLeft : "hide", - marginRight : "hide" - }, 500); - $("#groupTab").animate({ - width : "show", - opacity: "1", - paddingLeft : "show", - paddingRight : "show", - marginLeft : "show", - marginRight : "show" - }, 500); - }); - - //展开一级菜单 - $('body').on('click', '.js_category', function() { - var $this = $(this), - $inner = $this.next('.js_categoryInner'), - $page = $this.parents('.page'), - $parent = $(this).parent('li'); - var innerH = $inner.data('height'); - bear = $page; - - if(!innerH){ - $inner.css('height', 'auto'); - innerH = $inner.height(); - $inner.removeAttr('style'); - $inner.data('height', innerH); - } - - if($parent.hasClass('js_show')){ - $parent.removeClass('js_show'); - } else { - $parent.siblings().removeClass('js_show'); - - $parent.addClass('js_show'); - if(this.offsetTop + this.offsetHeight + innerH > $page.scrollTop() + winH){ - var scrollTop = this.offsetTop + this.offsetHeight + innerH - winH + categorySpace; - - if(scrollTop > this.offsetTop){ - scrollTop = this.offsetTop - categorySpace; - } - - $page.scrollTop(scrollTop); - } - } - }); - - // 图片预览 - $('body').on('click', '.cursor', function() { - systemCommonUtil.showPicImg($(this).attr("src")); - }); - - // 页面内组件选中组件项 - $('body').on('click', '.check-item', function() { - $(".check-item").removeClass("show-operation"); - $(".check-item").removeClass("check-item-shoose");//移除之前被选中的组件 - $(".check-item").parent().find(".check-item-operation").hide();//隐藏之前选中的组件的操作 - $(this).addClass("check-item-shoose");//给当前组件添加选中样式 - $(this).addClass("show-operation"); - $(this).parent().find(".check-item-operation").show();//显示当前选中的组件的操作 - var memberId = $(this).parent().attr("rowId"); - //获取组件的标签属性 - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx040", params: {rowId: memberId}, type: 'json', callback: function (json) { - if(json.total != 0){ - var str = ""; - var jsRelyOn = ""; - var jsContent = ""; - for(var i = 0; i < json.rows.length; i++){ - if(json.rows[i].selChildData == '1'){ - var modeContent = getDataUseHandlebars(json.rows[i].templateContent, json.rows[i].propertyValue); - json.rows[i].htmlContent = json.rows[i].htmlContent.replace(/{{content}}/g, modeContent); - } - var defaultValue = ""; - if(json.rows[i].propertyUnit == '%'){//百分号计算获取宽高百分比 - defaultValue = Math.ceil($("div#centerText .show-operation").children().width() / $("div#centerText .show-operation").width() * 100); - } else { - defaultValue = $("div#centerText .show-operation").children().css(json.rows[i].propertyTag).replace(json.rows[i].propertyUnit, ''); - } - str = str + json.rows[i].htmlContent.replace(/{{id}}/g, json.rows[i].id).replace(/{{labelContent}}/g, json.rows[i].title) - .replace(/{{placeholder}}/g, json.rows[i].title).replace(/{{tag}}/g, json.rows[i].propertyTag) - .replace(/{{unit}}/g, json.rows[i].propertyUnit).replace(/{{out}}/g, json.rows[i].propertyOut) - .replace(/{{defaultValue}}/g, defaultValue); - jsRelyOn = jsRelyOn + json.rows[i].jsRelyOn; - jsContent = jsContent + json.rows[i].jsContent.replace(/{{id}}/g, json.rows[i].id).replace(/%2B/g, '\+').replace(/%26/g, "\&") - .replace(/{{defaultValue}}/g, defaultValue); - } - jsContent = ''; - if(isNull(str)){ - $("#showForm").html(noMatchingBeansMation); - } else { - str = str + '
'; - $("#showForm").html(str + jsContent); - form.render(); - form.on('submit(saveProperty)', function (data) { - console.log(data); - if (winui.verifyForm(data.elem)) { - - } - return false; - }); - } - } else { - $("#showForm").html(noMatchingBeansMation); - } - }}); - }); - - //页面内组件移除按钮 - $('body').on('click', 'button[rel="removeHandler"]', function() { - $(this).parent().parent().remove(); - }) - - //监听页面内容是否变化 - $('body').on('DOMNodeInserted', '#centerText', function() { - if(isNull(editPageModelSelectId)){//如果没有选中页面，则不做任何操作 - - } else { - editPageModelSelectChange = true; - } - }); - - //添加页面按钮 - $('body').on('click', '#addPageBean', function() { - _openNewWindows({ - url: "../../tpl/rmmysmpropage/addpagebeanitem.html", - title: "新增页面", - pageId: "addpagebeanitem", - area: ['700px', '60vh'], - callBack: function (refreshCode) { - refreshGrid("pageList", {params:{rowId: proId}}); - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - }}); - }); - - //保存页面 - $('body').on('click', '#savePageModelBean', function() { - if (!isNull(editPageModelSelectId)){//要编辑的模板页面id不为空 - editPageModelSelectChange = false; - var list = [];//存储模板生成集合 - $('#centerText').find('.import-item').each(function() { - var s = { - modelId: $(this).attr("rowId"), - pageId: editPageModelSelectId - }; - list.push(s); - }); - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx037", params: {jsonData: JSON.stringify(list), pageId: editPageModelSelectId}, type: 'json', callback: function (json) { - winui.window.msg("保存成功", {icon: 1, time: 2000}); - }}); - } else { - winui.window.msg('请先选择要编辑的页面', {icon: 2, time: 2000}); - } - }); - - //导出选中页为H5 - $('body').on('click', '#exportChoosePageToH5', function() { - if (!isNull(editPageModelSelectId)){//要编辑的模板页面id不为空 - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx041", params: {pageId: editPageModelSelectId}, type: 'json', callback: function (json) { - winui.window.msg("导出成功", {icon: 1, time: 2000}); - const link = document.createElement('a'); - link.style.display = 'none'; - link.href = fileBasePath + json.bean.url; - link.setAttribute( - 'download', - json.bean.fileName - ); - document.body.appendChild(link); - link.click(); - }}); - } else { - winui.window.msg('请先选择要导出的页面', {icon: 2, time: 2000}); - } - }); - - exports('mysmpropagelist', {}); -}); diff --git a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyadd.js b/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyadd.js deleted file mode 100644 index a4423d9114c5c4c23148b64fffd804d895ef07f0..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyadd.js +++ /dev/null @@ -1,178 +0,0 @@ -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window','jquery', 'winui', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx', 'solr', 'sql', 'vue'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - - matchingLanguage(); - form.render(); - - $("#dataShowModel").hide(); - - // 根据类型获取部分功能的使用说明 - systemCommonUtil.queryExplainMationByType(4, function (json) { - $("#exexplaintormpropertyTitle").html(json.bean.title); - $("#exexplaintormpropertyContent").html(json.bean.content); - }); - - var htmlModelContent = CodeMirror.fromTextArea(document.getElementById("htmlModelContent"), { - mode : "xml", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : true, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - var jsModelContent = CodeMirror.fromTextArea(document.getElementById("jsModelContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : true, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - var htmlContent = CodeMirror.fromTextArea(document.getElementById("htmlContent"), { - mode : "xml", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - var jsContent = CodeMirror.fromTextArea(document.getElementById("jsContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - var jsRelyOnContent = CodeMirror.fromTextArea(document.getElementById("jsRelyOnContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - //展现形式 - showGrid({ - id: "dsFormContentId", - url: reqBasePath + "queryAllDsFormComponentList", - params: {}, - pagination: false, - method: 'GET', - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - form.render('select'); - } - }); - - // 子查询变化 - form.on('radio(selChildData)', function (data) { - var val = data.value; - if(val == '1'){ - // 是 - $("#dataShowModel").show(); - showGrid({ - id: "displayTemplateId", - url: flowableBasePath + "dsformdisplaytemplate006", - params: {}, - pagination: false, - method: 'GET', - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - form.render('select'); - } - }); - } else if (val == '2'){ - // 否 - $("#dataShowModel").hide(); - } else { - winui.window.msg('状态值错误', {icon: 2, time: 2000}); - } - }); - - form.on('select(selectParent)', function(data) { - AjaxPostUtil.request({url: flowableBasePath + "queryDsFormContentMationById", params: {id: data.value}, type: 'json', method: 'GET', callback: function (json) { - htmlModelContent.setValue(json.bean.htmlContent); - jsModelContent.setValue(json.bean.jsContent); - htmlContent.setValue(json.bean.htmlContent); - jsContent.setValue(json.bean.jsContent); - }}); - }); - - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - title: $("#title").val(), - propertyTag: $("#propertyTag").val(), - propertyUnit: encodeURI($("#propertyUnit").val()), - dsFormContentId: $("#dsFormContentId").val(), - propertyOut: data.field.propertyOut, - selChildData: data.field.selChildData, - htmlContent: encodeURI(htmlContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - jsContent: encodeURI(jsContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - jsRelyOn: encodeURI(jsRelyOnContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")) - }; - - if (data.field.selChildData == '1'){ - if(isNull($("#displayTemplateId").val())) { - winui.window.msg('请选择子查询数据展示模板', {icon: 2, time: 2000}); - return false; - } else { - params.displayTemplateId = $("#displayTemplateId").val(); - } - } else { - params.displayTemplateId = ""; - } - - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmproperty002", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - }); - -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyedit.js b/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyedit.js deleted file mode 100644 index c504b77b31260f5752480f2141f3aef07de7ccf8..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyedit.js +++ /dev/null @@ -1,214 +0,0 @@ -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx', 'solr', 'sql', 'vue'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - var htmlModelContent, jsModelContent, htmlContent, jsContent, jsRelyOnContent; - - showGrid({ - id: "showForm", - url: sysMainMation.rmprogramBasePath + "rmproperty004", - params: {rowId: parent.rowId}, - pagination: false, - template: getFileContent('tpl/rmproperty/rmpropertyeditTemplate.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - - htmlModelContent = CodeMirror.fromTextArea(document.getElementById("htmlModelContent"), { - mode : "xml", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : true, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - jsModelContent = CodeMirror.fromTextArea(document.getElementById("jsModelContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : true, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - htmlContent = CodeMirror.fromTextArea(document.getElementById("htmlContent"), { - mode : "xml", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - jsContent = CodeMirror.fromTextArea(document.getElementById("jsContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - jsRelyOnContent = CodeMirror.fromTextArea(document.getElementById("jsRelyOnContent"), { - mode : "text/javascript", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : false, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - $("input:radio[name=propertyOut][value=" + json.bean.propertyOut + "]").prop("checked", true); - $("input:radio[name=selChildData][value=" + json.bean.selChildData + "]").prop("checked", true); - - if(json.bean.selChildData == '1'){//是 - $("#dataShowModel").show(); - showGrid({ - id: "displayTemplateId", - url: flowableBasePath + "dsformdisplaytemplate006", - params: {}, - pagination: false, - method: 'GET', - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function(json1){ - $("#displayTemplateId").val(json.bean.displayTemplateId); - form.render('select'); - } - }); - } else { - $("#dataShowModel").hide(); - } - - //子查询变化 - form.on('radio(selChildData)', function (data) { - var val = data.value; - if(val == '1'){//是 - $("#dataShowModel").show(); - showGrid({ - id: "displayTemplateId", - url: flowableBasePath + "dsformdisplaytemplate006", - params: {}, - pagination: false, - method: 'GET', - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - form.render('select'); - } - }); - } else if (val == '2'){//否 - $("#dataShowModel").hide(); - } else { - winui.window.msg('状态值错误', {icon: 2, time: 2000}); - } - }); - - matchingLanguage(); - form.render(); - - //展现形式 - showGrid({ - id: "dsFormContentId", - url: reqBasePath + "queryAllDsFormComponentList", - params: {}, - pagination: false, - method: 'GET', - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function(data) { - $("#dsFormContentId").val(json.bean.dsFormContentId); - form.render('select'); - } - }); - - // 根据类型获取部分功能的使用说明 - systemCommonUtil.queryExplainMationByType(4, function (json) { - $("#exexplaintormpropertyTitle").html(json.bean.title); - $("#exexplaintormpropertyContent").html(json.bean.content); - }); - - form.on('select(selectParent)', function(data) { - AjaxPostUtil.request({url: flowableBasePath + "queryDsFormContentMationById", params: {id: data.value}, type: 'json', method: 'GET', callback: function (json) { - htmlModelContent.setValue(json.bean.htmlContent); - jsModelContent.setValue(json.bean.jsContent); - htmlContent.setValue(json.bean.htmlContent); - jsContent.setValue(json.bean.jsContent); - }}); - }); - - form.on('submit(formEditBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - title: $("#title").val(), - propertyTag: $("#propertyTag").val(), - propertyUnit: encodeURI($("#propertyUnit").val()), - dsFormContentId: $("#dsFormContentId").val(), - propertyOut:data.field.propertyOut, - selChildData:data.field.selChildData, - htmlContent: encodeURI(htmlContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - jsContent: encodeURI(jsContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - jsRelyOn: encodeURI(jsRelyOnContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")), - rowId:parent.rowId - }; - if (data.field.selChildData == '1'){ - if(isNull($("#displayTemplateId").val())) { - winui.window.msg('请选择子查询数据展示模板', {icon: 2, time: 2000}); - return false; - } else { - params.displayTemplateId = $("#displayTemplateId").val(); - } - } else { - params.displayTemplateId = ""; - } - - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmproperty005", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - - } - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - - }); - -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertylist.js b/rmprogram/src/main/resources/template/js/rmproperty/rmpropertylist.js deleted file mode 100644 index 56d7096517f3a59472eb07883910fc99a6705649..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertylist.js +++ /dev/null @@ -1,208 +0,0 @@ - -var rowId = ""; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx', 'solr', 'sql', 'vue'], function (exports) { - winui.renderColor(); - var $ = layui.$, - form = layui.form, - table = layui.table; - - authBtn('1560828282644'); - - table.render({ - id: 'messageTable', - elem: '#messageTable', - method: 'post', - url: sysMainMation.rmprogramBasePath + 'rmproperty001', - where: {title: $("#title").val(), propertyTag: $("#propertyTag").val(), dsFormContentId: $("#dsFormContentId").val()}, - even: true, - page: true, - limits: getLimits(), - limit: getLimit(), - cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'title', title: '属性别名', width: 180 }, - { field: 'propertyTag', title: '属性标签', width: 100 }, - { field: 'propertyUnit', title: '属性单位', width: 100 }, - { field: 'selChildData', title: '子查询', width: 100 }, - { field: 'templateName', title: '子模板', width: 150 }, - { field: 'propertyOut', title: '外部属性', width: 100 }, - { field: 'contentName', title: '展现形式', width: 120 }, - { field: 'propertyValueNum', title: '属性值数量', width: 100 }, - { field: 'useNum', title: '使用数量', width: 100 }, - { field: 'id', title: 'HTML内容', width: 100, templet: function (d) { - if (!isNull(d.htmlContent)){ - return ''; - } else { - return '无'; - } - }}, - { field: 'id', title: 'JS内容', width: 80, templet: function (d) { - if (!isNull(d.jsContent)){ - return ''; - } else { - return '无'; - } - }}, - { field: 'id', title: 'JS依赖文件', width: 120, templet: function (d) { - if (!isNull(d.jsRelyOn)){ - return ''; - } else { - return '无'; - } - }}, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 180 }, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'} - ]], - done: function(json) { - matchingLanguage(); - } - }); - - var editor = CodeMirror.fromTextArea(document.getElementById("modelContent"), { - mode : "text/x-java", // 模式 - theme : "eclipse", // CSS样式选择 - indentUnit : 4, // 缩进单位，默认2 - smartIndent : true, // 是否智能缩进 - tabSize : 4, // Tab缩进，默认4 - readOnly : true, // 是否只读，默认false - showCursorWhenSelecting : true, - lineNumbers : true, // 是否显示行号 - styleActiveLine: true, //line选择是是否加亮 - matchBrackets: true, - }); - - table.on('tool(messageTable)', function (obj) { - var data = obj.data; - var layEvent = obj.event; - if (layEvent === 'del') { //删除 - del(data, obj); - } else if (layEvent === 'edit') { //编辑 - edit(data); - } else if (layEvent === 'htmlContent') { //HTML内容 - var mode = returnModel('html'); - if (!isNull(mode.length)) { - editor.setOption('mode', mode) - } - editor.setValue(data.htmlContent); - layer.open({ - id: 'HTML内容', - type: 1, - title: 'HTML内容', - shade: 0.3, - area: ['700px', '90vh'], - content: $("#modelContentDiv").html(), - }); - } else if (layEvent === 'jsContent') { //JS内容 - var mode = returnModel('javascript'); - if (!isNull(mode.length)) { - editor.setOption('mode', mode) - } - editor.setValue(data.jsContent); - layer.open({ - id: 'HTML-JS内容', - type: 1, - title: 'HTML-JS内容', - shade: 0.3, - area: ['700px', '90vh'], - content: $("#modelContentDiv").html(), - }); - } else if (layEvent === 'jsRelyOn') { //JS依赖文件 - var mode = returnModel('javascript'); - if (!isNull(mode.length)) { - editor.setOption('mode', mode) - } - editor.setValue(data.jsRelyOn); - layer.open({ - id: 'HTML-JS内容', - type: 1, - title: 'HTML-JS内容', - shade: 0.3, - area: ['700px', '90vh'], - content: $("#modelContentDiv").html(), - }); - } - }); - - form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - refreshTable(); - } - return false; - }); - - //展现形式 - showGrid({ - id: "dsFormContentId", - url: reqBasePath + "queryAllDsFormComponentList", - params: {}, - pagination: false, - method: 'GET', - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - form.render('select'); - } - }); - - //删除 - function del(data, obj) { - var msg = obj ? '确认删除样式属性【' + obj.data.title + '】吗？' : '确认删除选中数据吗？'; - layer.confirm(msg, { icon: 3, title: '删除样式属性' }, function (index) { - layer.close(index); - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmproperty003", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - //编辑分类 - function edit(data) { - rowId = data.id; - _openNewWindows({ - url: "../../tpl/rmproperty/rmpropertyedit.html", - title: "编辑小程序样式属性", - pageId: "rmpropertyedit", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - // 刷新数据 - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - // 新增 - $("body").on("click", "#addBean", function() { - _openNewWindows({ - url: "../../tpl/rmproperty/rmpropertyadd.html", - title: "新增小程序样式属性", - pageId: "rmpropertyadd", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - - function loadTable() { - table.reloadData("messageTable", {where:{title: $("#title").val(), propertyTag: $("#propertyTag").val(), dsFormContentId: $("#dsFormContentId").val()}}); - } - - function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where:{title: $("#title").val(), propertyTag: $("#propertyTag").val(), dsFormContentId: $("#dsFormContentId").val()}}); - } - - exports('rmpropertylist', {}); -}); diff --git a/rmprogram/src/main/resources/template/js/rmpropertyvalue/rmpropertyvalueadd.js b/rmprogram/src/main/resources/template/js/rmpropertyvalue/rmpropertyvalueadd.js deleted file mode 100644 index 1f433020cf426aefec3049b42ae8ffb10a6dc876..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmpropertyvalue/rmpropertyvalueadd.js +++ /dev/null @@ -1,51 +0,0 @@ -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - - matchingLanguage(); - form.render(); - - // 属性标签 - showGrid({ - id: "propertyId", - url: sysMainMation.rmprogramBasePath + "rmproperty006", - params: {}, - pagination: false, - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - form.render('select'); - } - }); - - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - title: $("#title").val(), - propertyValue: $("#propertyValue").val(), - propertyId: $("#propertyId").val() - }; - - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmpropertyvalue002", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - }); - -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmpropertyvalue/rmpropertyvalueedit.js b/rmprogram/src/main/resources/template/js/rmpropertyvalue/rmpropertyvalueedit.js deleted file mode 100644 index 32ba2a97fc9b0964e2c5a0f872c6c75c2ea708fe..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmpropertyvalue/rmpropertyvalueedit.js +++ /dev/null @@ -1,68 +0,0 @@ -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - - showGrid({ - id: "showForm", - url: sysMainMation.rmprogramBasePath + "rmpropertyvalue004", - params: {rowId: parent.rowId}, - pagination: false, - template: getFileContent('tpl/rmpropertyvalue/rmpropertyvalueeditTemplate.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - matchingLanguage(); - form.render(); - - //属性标签 - showGrid({ - id: "propertyId", - url: sysMainMation.rmprogramBasePath + "rmproperty006", - params: {}, - pagination: false, - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function(data) { - $("#propertyId").val(json.bean.propertyId); - form.render('select'); - } - }); - - form.on('submit(formEditBean)', function (data) { - - if (winui.verifyForm(data.elem)) { - var params = { - title: $("#title").val(), - propertyValue: $("#propertyValue").val(), - propertyId: $("#propertyId").val(), - rowId:parent.rowId, - }; - - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmpropertyvalue005", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - - } - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - - }); - -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmpropertyvalue/rmpropertyvaluelist.js b/rmprogram/src/main/resources/template/js/rmpropertyvalue/rmpropertyvaluelist.js deleted file mode 100644 index b0c4d6932dadc9f19e2f385f571334ec36624240..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmpropertyvalue/rmpropertyvaluelist.js +++ /dev/null @@ -1,126 +0,0 @@ - -var rowId = ""; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { - winui.renderColor(); - var $ = layui.$, - form = layui.form, - table = layui.table; - - authBtn('1560828440572'); - - table.render({ - id: 'messageTable', - elem: '#messageTable', - method: 'post', - url: sysMainMation.rmprogramBasePath + 'rmpropertyvalue001', - where: {title: $("#title").val(), propertyValue: $("#propertyValue").val(), propertyId: $("#propertyId").val()}, - even: true, - page: true, - limits: [8, 16, 24, 32, 40, 48, 56], - limit: 8, - cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'title', title: '属性值别名', width: 180 }, - { field: 'propertyValue', title: '属性值', width: 180 }, - { field: 'propertyTitle', title: '所属标签', width: 180 }, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 180 }, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'} - ]], - done: function(json) { - matchingLanguage(); - } - }); - - table.on('tool(messageTable)', function (obj) { - var data = obj.data; - var layEvent = obj.event; - if (layEvent === 'del') { //删除 - del(data, obj); - } else if (layEvent === 'edit') { //编辑 - edit(data); - } - }); - - //属性标签 - showGrid({ - id: "propertyId", - url: sysMainMation.rmprogramBasePath + "rmproperty006", - params: {}, - pagination: false, - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - form.render('select'); - } - }); - - form.render(); - form.on('submit(formSearch)', function (data) { - - if (winui.verifyForm(data.elem)) { - refreshTable(); - } - return false; - }); - - //删除 - function del(data, obj) { - var msg = obj ? '确认删除标签属性值【' + obj.data.title + '】吗？' : '确认删除选中数据吗？'; - layer.confirm(msg, { icon: 3, title: '删除标签属性值' }, function (index) { - layer.close(index); - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmpropertyvalue003", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - //编辑分类 - function edit(data) { - rowId = data.id; - _openNewWindows({ - url: "../../tpl/rmpropertyvalue/rmpropertyvalueedit.html", - title: "编辑标签属性值", - pageId: "rmpropertyvalueedit", - area: ['700px', '60vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - //刷新数据 - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - //新增 - $("body").on("click", "#addBean", function() { - _openNewWindows({ - url: "../../tpl/rmpropertyvalue/rmpropertyvalueadd.html", - title: "新增标签属性值", - pageId: "rmpropertyvalueadd", - area: ['700px', '60vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - - function loadTable() { - table.reloadData("messageTable", {where:{title: $("#title").val(), propertyValue: $("#propertyValue").val(), propertyId: $("#propertyId").val()}}); - } - - function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where:{title: $("#title").val(), propertyValue: $("#propertyValue").val(), propertyId: $("#propertyId").val()}}); - } - - exports('rmpropertyvaluelist', {}); -}); diff --git a/rmprogram/src/main/resources/template/js/rmtype/rmtypeadd.js b/rmprogram/src/main/resources/template/js/rmtype/rmtypeadd.js deleted file mode 100644 index 7e15e39101beb1c63cde98d4db1a720b6c4e8775..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmtype/rmtypeadd.js +++ /dev/null @@ -1,33 +0,0 @@ - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - - matchingLanguage(); - form.render(); - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - rmTypeName: $("#rmTypeName").val(), - }; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx002", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - }); -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmtype/rmtypeedit.js b/rmprogram/src/main/resources/template/js/rmtype/rmtypeedit.js deleted file mode 100644 index 04d4a4e405cb0212315f85407297a201535906fe..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmtype/rmtypeedit.js +++ /dev/null @@ -1,49 +0,0 @@ - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - - showGrid({ - id: "showForm", - url: sysMainMation.rmprogramBasePath + "rmxcx004", - params: {rowId: parent.rowId}, - pagination: false, - template: getFileContent('tpl/rmtype/rmtypeeditTemplate.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { - matchingLanguage(); - form.render(); - form.on('submit(formEditBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - rmTypeName: $("#rmTypeName").val(), - rowId: parent.rowId - }; - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx005", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - - } - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - - }); - -}); \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmtype/rmtypelist.js b/rmprogram/src/main/resources/template/js/rmtype/rmtypelist.js deleted file mode 100644 index 3d3a5264e1dc03f8363ac13582cb9702b4ad2a09..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/js/rmtype/rmtypelist.js +++ /dev/null @@ -1,129 +0,0 @@ - -var rowId = ""; -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { - winui.renderColor(); - var $ = layui.$, - form = layui.form, - table = layui.table; - - authBtn('1554952090490'); - - table.render({ - id: 'messageTable', - elem: '#messageTable', - method: 'post', - url: sysMainMation.rmprogramBasePath + 'rmxcx001', - where: {rmTypeName: $("#rmTypeName").val()}, - even: true, - page: true, - limits: [8, 16, 24, 32, 40, 48, 56], - limit: 8, - cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'rmTypeName', title: '分类名称', width: 120 }, - { field: 'groupNum', title: '分组数量', width: 120 }, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 180 }, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'} - ]], - done: function(json) { - matchingLanguage(); - } - }); - - table.on('tool(messageTable)', function (obj) { - var data = obj.data; - var layEvent = obj.event; - if (layEvent === 'del') { //删除 - del(data, obj); - } else if (layEvent === 'edit') { //编辑 - edit(data); - } else if (layEvent === 'top') { //上移 - topOne(data); - } else if (layEvent === 'lower') { //下移 - lowerOne(data); - } - }); - - form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - refreshTable(); - } - return false; - }); - - //删除 - function del(data, obj) { - var msg = obj ? '确认删除分类【' + obj.data.rmTypeName + '】吗？' : '确认删除选中数据吗？'; - layer.confirm(msg, { icon: 3, title: '删除分类' }, function (index) { - layer.close(index); - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx003", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - //上移 - function topOne(data) { - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx006", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.moveUpOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - //下移 - function lowerOne(data) { - AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx007", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.moveDownOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - //编辑分类 - function edit(data) { - rowId = data.id; - _openNewWindows({ - url: "../../tpl/rmtype/rmtypeedit.html", - title: "编辑分类", - pageId: "rmtypeedit", - area: ['500px', '30vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - //刷新数据 - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - //新增分类 - $("body").on("click", "#addBean", function() { - _openNewWindows({ - url: "../../tpl/rmtype/rmtypeadd.html", - title: "新增分类", - pageId: "rmtypeadd", - area: ['500px', '30vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - - function loadTable() { - table.reloadData("messageTable", {where:{rmTypeName: $("#rmTypeName").val()}}); - } - - function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where:{rmTypeName: $("#rmTypeName").val()}}); - } - - exports('rmtypelist', {}); -}); diff --git a/rmprogram/src/main/resources/template/tpl/rmgroup/rmgroupadd.html b/rmprogram/src/main/resources/template/tpl/rmgroup/rmgroupadd.html deleted file mode 100644 index 44f6e0585c4ef63f7d13c1ce1aff81a740d8b548..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmgroup/rmgroupadd.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - -
-
-
-
- - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmgroup/rmgroupedit.html b/rmprogram/src/main/resources/template/tpl/rmgroup/rmgroupedit.html deleted file mode 100644 index 73e4c02cb1564f1e198a61a9b87737a4057f1a68..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmgroup/rmgroupedit.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - -
-
- -
-
- - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmgroup/rmgroupeditTemplate.tpl b/rmprogram/src/main/resources/template/tpl/rmgroup/rmgroupeditTemplate.tpl deleted file mode 100644 index a168433b6ee788fc85d20ca82bcc47591b88c775..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmgroup/rmgroupeditTemplate.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{{#bean}} -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - -
-
-{{/bean}} \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmgroup/rmgrouplist.html b/rmprogram/src/main/resources/template/tpl/rmgroup/rmgrouplist.html deleted file mode 100644 index 46274c35a38ccc45a1eba5e0c7bf140ac16a3366..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmgroup/rmgrouplist.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - -
-
-
-
- -
- -
- -
- -
- - -
-
-
-
-
-
- - -
-
-
-
- -
- - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmgroupmember/bindproperty.html b/rmprogram/src/main/resources/template/tpl/rmgroupmember/bindproperty.html deleted file mode 100644 index 35bdd9ae9813d46d37cb7bc9790bdfcfd325aa5b..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmgroupmember/bindproperty.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - -
-
-
- -
-
-
-
-
- - -
-
-
-
- - - - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmgroupmember/rmgroupmemberadd.html b/rmprogram/src/main/resources/template/tpl/rmgroupmember/rmgroupmemberadd.html deleted file mode 100644 index 13698497b230b3cfb2f61925dcb5f6757fa8d470..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmgroupmember/rmgroupmemberadd.html +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
- -
-
- 生成图片 -
-
-
-
- -
-
- -
-
- 下载 -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - -
-
-
-
- - - - - - - - - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmgroupmember/rmgroupmemberedit.html b/rmprogram/src/main/resources/template/tpl/rmgroupmember/rmgroupmemberedit.html deleted file mode 100644 index 392d0678499f3d62f757dc006a2853eac7df0d8f..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmgroupmember/rmgroupmemberedit.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - -
-
- -
-
- - - - - - - - - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmgroupmember/rmgroupmembereditTemplate.tpl b/rmprogram/src/main/resources/template/tpl/rmgroupmember/rmgroupmembereditTemplate.tpl deleted file mode 100644 index a3702882218f1fe5efb865d6d81e70c4008458a1..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmgroupmember/rmgroupmembereditTemplate.tpl +++ /dev/null @@ -1,72 +0,0 @@ -{{#bean}} -
- -
- {{typeName}} -
-
-
- -
- {{groupName}} -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- 格式：png,jpg,jpeg,gif -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - -
-
-{{/bean}} \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmgroupmember/rmgroupmemberlist.html b/rmprogram/src/main/resources/template/tpl/rmgroupmember/rmgroupmemberlist.html deleted file mode 100644 index 64694843584eac418601cc4e1dbf1c9312932728..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmgroupmember/rmgroupmemberlist.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - -
-
-
-
- -
- -
- -
- -
- - -
-
-
-
-
-
- - -
-
-
-
- -
- -
- -
- - - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmmysmpro/mysmproadd.html b/rmprogram/src/main/resources/template/tpl/rmmysmpro/mysmproadd.html deleted file mode 100644 index 81c4a08510d8c61c72f9186d533a14f5fe69bbb9..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmmysmpro/mysmproadd.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - -
-
-
-
- - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmmysmpro/mysmproedit.html b/rmprogram/src/main/resources/template/tpl/rmmysmpro/mysmproedit.html deleted file mode 100644 index 88dd2cab06e3fdaf43ce2b4ea24c38d9e128ff40..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmmysmpro/mysmproedit.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - -
-
- -
-
- - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmmysmpro/mysmproeditTemplate.tpl b/rmprogram/src/main/resources/template/tpl/rmmysmpro/mysmproeditTemplate.tpl deleted file mode 100644 index f5818c80de90e9e99bbd60ddc8e43936020bf2a2..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmmysmpro/mysmproeditTemplate.tpl +++ /dev/null @@ -1,20 +0,0 @@ -{{#bean}} -
- -
- -
-
-
- -
- -
-
-
-
- - -
-
-{{/bean}} \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmmysmpro/mysmprolist.html b/rmprogram/src/main/resources/template/tpl/rmmysmpro/mysmprolist.html deleted file mode 100644 index df80729639899069f9a23f8dd755085e1ccffe78..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmmysmpro/mysmprolist.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - -
-
-
-
- -
- -
- - -
-
-
-
-
-
- - -
-
-
-
- -
- - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/addpagebeanitem.html b/rmprogram/src/main/resources/template/tpl/rmmysmpropage/addpagebeanitem.html deleted file mode 100644 index ea0d2d49010ff43b3b851d27ab0a1a4b34279b61..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/addpagebeanitem.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
- 小程序导出路径为：page/路径/文件名.文件类型（文件类型：js、json、wxml、wxss）
- H5页面导出路径为：html/路径/文件名.html；对应JS导出路径为：js/路径/文件名.js -
-
-
-
-
- - -
-
-
-
- - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/editpagebeanitem.html b/rmprogram/src/main/resources/template/tpl/rmmysmpropage/editpagebeanitem.html deleted file mode 100644 index 6f724a651d1ef96f0c9e1af42e59f733d2950d44..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/editpagebeanitem.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - -
-
- -
-
- - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/groupMemberTemplate.tpl b/rmprogram/src/main/resources/template/tpl/rmmysmpropage/groupMemberTemplate.tpl deleted file mode 100644 index 5a6a862bfbe0aa16e74b8bd856fd9b29121cd639..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/groupMemberTemplate.tpl +++ /dev/null @@ -1,7 +0,0 @@ -{{#each rows}} -
-
- -
-
-{{/each}} \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/groupTemplate.tpl b/rmprogram/src/main/resources/template/tpl/rmmysmpropage/groupTemplate.tpl deleted file mode 100644 index 9b7f4ce81bb6eb4272e82942b9060b74fd13bcb8..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/groupTemplate.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{{#each rows}} -
  • -
    -

    {{name}}{{groupList.length}}

    -
    -
    -
    - {{#each groupList}} - -
    -

    {{name}}{{memberNum}}

    -
    -     - {{/each}} -
    -
    -
    • -{{/each}} \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/mysmpropagelist.html b/rmprogram/src/main/resources/template/tpl/rmmysmpropage/mysmpropagelist.html deleted file mode 100644 index 74f6fe0f6b6bb547772463d3d12aa4f3010da10a..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/mysmpropagelist.html +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - -
    -
    - - - -
    -
    - -
    -
    -
    -
      -
    • 页面管理
      • -
    • 组件管理
      • -
    -
    -
    -
      -
    -
    -
    -
    -
      - -
    -
    -
    -
    -
    - - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
      -
    • 页面属性
      • -
    • 数据管理
      • -
    -
    -
    -
    - -
    -
    -
    2
    -
    -
    -
    -
    - - - - - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/pageTemplate.tpl b/rmprogram/src/main/resources/template/tpl/rmmysmpropage/pageTemplate.tpl deleted file mode 100644 index cfdcbdb3db6a1ba19e05a807af1ac06dca016506..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/pageTemplate.tpl +++ /dev/null @@ -1,22 +0,0 @@ -{{#each rows}} -
  • -
    - {{name}} -
    -
    - - - - - -
    -
    -
    - 文件名：{{fileName}} -
    -
    - 路径：page/{{filePath}} -
    -
    -
    • -{{/each}} \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/pagemodelTemplate.tpl b/rmprogram/src/main/resources/template/tpl/rmmysmpropage/pagemodelTemplate.tpl deleted file mode 100644 index 7ea3247899dea709c275ebc9d932b3d3ebf496b6..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/pagemodelTemplate.tpl +++ /dev/null @@ -1,19 +0,0 @@ -{{#each rows}} -
    -
    - {{{htmlContent}}} -
    - - -
    -{{/each}} \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/projectpageeditTemplate.tpl b/rmprogram/src/main/resources/template/tpl/rmmysmpropage/projectpageeditTemplate.tpl deleted file mode 100644 index 8e87bc6b979ba0ad0768c3cf0b697a885d403b72..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmmysmpropage/projectpageeditTemplate.tpl +++ /dev/null @@ -1,30 +0,0 @@ -{{#bean}} -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    - 小程序导出路径为：page/路径/文件名.文件类型（文件类型：js、json、wxml、wxss）
    - H5页面导出路径为：html/路径/文件名.html；对应JS导出路径为：js/路径/文件名.js -
    -
    -
    -
    -
    - - -
    -
    -{{/bean}} \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmproperty/rmpropertyadd.html b/rmprogram/src/main/resources/template/tpl/rmproperty/rmpropertyadd.html deleted file mode 100644 index c779eac40721c9bd257bea8031a88f5f63e86751..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmproperty/rmpropertyadd.html +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - -
    -
    -
    -
    -
    -
    -
    -
    - 属性内容
    -
    -
    - -
    - -
    例如：宽度
    -
    -
    -
    - -
    - -
    例如：width
    -
    -
    -
    - -
    - -
    例如：width:100%;单位为：%
    -
    -
    -
    - -
    - -

    -
    例如：width为内部属性，class为外部属性
    -
    -
    -
    - -
    - - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - - -
    -
    -
    -
    - - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmproperty/rmpropertyedit.html b/rmprogram/src/main/resources/template/tpl/rmproperty/rmpropertyedit.html deleted file mode 100644 index 490b19996689f99cf9ed3cac266592ea772558bd..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmproperty/rmpropertyedit.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - -
    -
    - -
    -
    - - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmproperty/rmpropertyeditTemplate.tpl b/rmprogram/src/main/resources/template/tpl/rmproperty/rmpropertyeditTemplate.tpl deleted file mode 100644 index 0f99e5df99322560e2dd88ff6539065f2cac6b2b..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmproperty/rmpropertyeditTemplate.tpl +++ /dev/null @@ -1,98 +0,0 @@ -{{#bean}} -
    -
    -
    -
    -
    -
    - 属性内容
    -
    -
    - -
    - -
    例如：宽度
    -
    -
    -
    - -
    - -
    例如：width
    -
    -
    -
    - -
    - -
    例如：width:100%;单位为：%
    -
    -
    -
    - -
    - -

    -
    例如：width为内部属性，class为外部属性
    -
    -
    -
    - -
    - - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - - -
    -
    -{{/bean}} \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmproperty/rmpropertylist.html b/rmprogram/src/main/resources/template/tpl/rmproperty/rmpropertylist.html deleted file mode 100644 index e67436164bf43a0ac4e0da5e5749dffdb7795bac..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmproperty/rmpropertylist.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - -
    -
    -
    -
    - -
    - -
    - -
    - -
    - -
    - -
    - - -
    -
    -
    -
    - -
    -
    - - -
    -
    - -
    - -
    - -
    -
    - -
    - - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmpropertyvalue/rmpropertyvalueadd.html b/rmprogram/src/main/resources/template/tpl/rmpropertyvalue/rmpropertyvalueadd.html deleted file mode 100644 index 3636052b507a04b81beb8e14633d28bccecfebec..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmpropertyvalue/rmpropertyvalueadd.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - - -
    -
    -
    -
    - - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmpropertyvalue/rmpropertyvalueedit.html b/rmprogram/src/main/resources/template/tpl/rmpropertyvalue/rmpropertyvalueedit.html deleted file mode 100644 index 6bea6423b41a000e8bb4dc8763aa1c69adda3674..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmpropertyvalue/rmpropertyvalueedit.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - -
    -
    - -
    -
    - - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmpropertyvalue/rmpropertyvalueeditTemplate.tpl b/rmprogram/src/main/resources/template/tpl/rmpropertyvalue/rmpropertyvalueeditTemplate.tpl deleted file mode 100644 index 059e57a7ea2a7ac6a7283f60e0c783f55c887337..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmpropertyvalue/rmpropertyvalueeditTemplate.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{{#bean}} -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - - -
    -
    -{{/bean}} \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmpropertyvalue/rmpropertyvaluelist.html b/rmprogram/src/main/resources/template/tpl/rmpropertyvalue/rmpropertyvaluelist.html deleted file mode 100644 index 1a6ae8dce5671f06e0f28d7634627a3b8aff17c1..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmpropertyvalue/rmpropertyvaluelist.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - -
    -
    -
    -
    - -
    - -
    - -
    - -
    - -
    - -
    - - -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    - -
    - - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmtype/rmtypeadd.html b/rmprogram/src/main/resources/template/tpl/rmtype/rmtypeadd.html deleted file mode 100644 index 8e3be174121dfd3ff14184bdf22459bc4e03ea6b..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmtype/rmtypeadd.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - -
    -
    -
    - -
    - -
    -
    -
    -
    - - -
    -
    -
    -
    - - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmtype/rmtypeedit.html b/rmprogram/src/main/resources/template/tpl/rmtype/rmtypeedit.html deleted file mode 100644 index 6e4f0a748c150156053a28c292f88b89f251d825..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmtype/rmtypeedit.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - -
    -
    - -
    -
    - - - - - \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmtype/rmtypeeditTemplate.tpl b/rmprogram/src/main/resources/template/tpl/rmtype/rmtypeeditTemplate.tpl deleted file mode 100644 index 503b4e025f1dcaf2d63ceedba4f668564ae9dcbb..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmtype/rmtypeeditTemplate.tpl +++ /dev/null @@ -1,14 +0,0 @@ -{{#bean}} -
    - -
    - -
    -
    -
    -
    - - -
    -
    -{{/bean}} \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/tpl/rmtype/rmtypelist.html b/rmprogram/src/main/resources/template/tpl/rmtype/rmtypelist.html deleted file mode 100644 index 4dce82419a1f3cef0ece1e3cbbc27463516b3cd0..0000000000000000000000000000000000000000 --- a/rmprogram/src/main/resources/template/tpl/rmtype/rmtypelist.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - -
    -
    -
    -
    - -
    - -
    - - -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    - -
    - - - - - \ No newline at end of file diff --git a/seal-service/src/main/resources/template/js/myParts/myPartsList.js b/seal-service/src/main/resources/template/js/myParts/myPartsList.js index a1180039a45d6f7340f217901018f80a2ee70c1b..80d7df8d517cf1b57cab36fcf00d5b689b118e80 100644 --- a/seal-service/src/main/resources/template/js/myParts/myPartsList.js +++ b/seal-service/src/main/resources/template/js/myParts/myPartsList.js @@ -24,10 +24,10 @@ layui.config({ cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { field: 'materialId', title: '产品', align: 'left', width: 150, templet: function (d) { - return isNull(d.materialMation) ? '' : d.materialMation.name; + return getNotUndefinedVal(d.materialMation?.name); }}, { field: 'normsId', title: '规格', align: 'left', width: 400, templet: function (d) { - return isNull(d.normsMation) ? '' : d.normsMation.name; + return getNotUndefinedVal(d.normsMation?.name); }}, { field: 'stock', title: '剩余数量', align: 'left', width: 100 } ]], diff --git a/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js b/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js index cfbdf057a1a39f15e078233dc90a140f9a8c1117..04e91c1348486b62e622e2a9b30507058695dbbe 100644 --- a/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js +++ b/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js @@ -28,7 +28,7 @@ layui.config({ return '' + d.oddNumber + ''; }}, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - return '' + d.processInstanceId + ''; + return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); diff --git a/userauth/src/main/resources/template/js/appWorkPage/appWorkPageList.js b/userauth/src/main/resources/template/js/appWorkPage/appWorkPageList.js index 3830124349acc6808fae4d2271e01b2eb03af33d..08df4e37dd69b7de67ff03c6f9ea8459e18d2f02 100644 --- a/userauth/src/main/resources/template/js/appWorkPage/appWorkPageList.js +++ b/userauth/src/main/resources/template/js/appWorkPage/appWorkPageList.js @@ -35,7 +35,7 @@ layui.config({ return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("menuType", 'id', d.type, 'name'); }}, { field: 'desktopId', title: '所属桌面', align: 'left', width: 120, templet: function (d) { - return isNull(d.desktopMation) ? '' : d.desktopMation.name; + return getNotUndefinedVal(d.desktopMation?.name) }}, { field: 'url', title: '页面路径', align: 'left', width: 300}, { field: 'orderBy', title: '排序号', align: 'left', width: 80}, diff --git a/userauth/src/main/resources/template/js/sysEveMenu/sysEveMenuList.js b/userauth/src/main/resources/template/js/sysEveMenu/sysEveMenuList.js index c73185e4e805f343b7cbca5ba2e30baef774c43b..ae99fc7b8bc8fcfc048e2435c6025c48e41667fc 100644 --- a/userauth/src/main/resources/template/js/sysEveMenu/sysEveMenuList.js +++ b/userauth/src/main/resources/template/js/sysEveMenu/sysEveMenuList.js @@ -37,10 +37,7 @@ layui.config({ return d.level == 0 ? '父菜单' : '子菜单'; }}, { field: 'desktopName', title: '所属桌面', width: 120, templet: function (d) { - if (isNull(d.desktopMation)) { - return ''; - } - return d.desktopMation.name; + return getNotUndefinedVal(d.desktopMation?.name) }}, { field: 'isShare', title: '共享', align: 'center', width: 80, templet: function (d) { return d.isShare == 0 ? '否' : '是'; diff --git a/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffChoose.js b/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffChoose.js index 9462a6af942babc9ba9f1e457b2c139eb6a3ea62..5651d3f276fc2a2d0e0342751d276998fad14acc 100644 --- a/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffChoose.js +++ b/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffChoose.js @@ -13,8 +13,6 @@ layui.config({ form = layui.form, table = layui.table, tableCheckBoxUtil = layui.tableCheckBoxUtil; - var selTemplate = getFileContent('tpl/template/select-option.tpl') - // 选择类型，默认单选，true:多选，false:单选 var userStaffCheckType = isNull(parent.systemCommonUtil.userStaffCheckType) ? false : parent.systemCommonUtil.userStaffCheckType; @@ -49,7 +47,7 @@ layui.config({ id: 'messageTable', elem: '#messageTable', method: 'post', - url: reqBasePath + 'staff008', + url: reqBasePath + 'staff001', where: getTableParams(), even: true, page: true, @@ -62,14 +60,8 @@ layui.config({ return d.jobNumber + ' ' + d.userName; }}, { field: 'staffType', title: '类型', rowspan: '3', align: 'left', width: 90, templet: function (d) { - if(d.staffType == 1){ - return '普通员工'; - } else if (d.staffType == 2){ - return '教职工'; - } else { - return '参数错误'; - } - }}, + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("userStaffType", 'id', d.staffType, 'name'); + }}, { field: 'email', title: '邮箱', rowspan: '3', align: 'left', width: 170 }, { field: 'userPhoto', title: '头像', rowspan: '3', align: 'center', width: 60, templet: function (d) { if(isNull(d.userPhoto)){ @@ -80,18 +72,10 @@ layui.config({ }}, { field: 'userIdCard', title: '身份证', rowspan: '3', align: 'center', width: 160 }, { field: 'userSex', title: '性别', width: 60, rowspan: '3', align: 'center', templet: function (d) { - if(d.userSex == '0'){ - return "保密"; - } else if (d.userSex == '1'){ - return "男"; - } else if (d.userSex == '2'){ - return "女"; - } else { - return "参数错误"; - } + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sexEnum", 'id', d.userSex, 'name'); }}, { field: 'state', title: '状态', rowspan: '3', width: 60, align: 'center', templet: function (d) { - return getStaffStateName(d); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("userStaffState", 'id', d.state, 'name'); }}, { title: '公司信息', align: 'center', colspan: '3'}, { field: 'phone', title: '手机号', rowspan: '3', align: 'center', width: 100}, @@ -105,10 +89,11 @@ layui.config({ ], done: function(res, curr, count){ matchingLanguage(); - if(!loadCompany){ - initCompany(); - } - if(userStaffCheckType){ + + initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入姓名，工号", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); + if (userStaffCheckType) { // 设置选中 tableCheckBoxUtil.checkedDefault({ gridId: 'messageTable', @@ -136,102 +121,31 @@ layui.config({ } }); - table.on('tool(messageTable)', function (obj) { - var data = obj.data; - var layEvent = obj.event; - }); - - var loadCompany = false; - // 初始化公司 - function initCompany(){ - loadCompany = true; - systemCommonUtil.getSysCompanyList(function (json) { - // 加载企业数据 - $("#companyList").html(getDataUseHandlebars(selTemplate, json)); - form.render('select'); - }); - } - - // 初始化部门 - function initDepartment(){ - showGrid({ - id: "departmentList", - url: reqBasePath + "companydepartment007", - params: {companyId: $("#companyList").val()}, - pagination: false, - method: 'POST', - template: selTemplate, - ajaxSendLoadBefore: function(hdb) {}, - ajaxSendAfter:function (json) { - form.render('select'); - } - }); - } - - function initJob() { - // 根据部门id获取岗位集合 - systemCommonUtil.queryJobListByDepartmentId($("#departmentList").val(), function(data) { - $("#jobList").html(getDataUseHandlebars(selTemplate, data)); - form.render('select'); - }); - } - - // 公司监听事件 - form.on('select(companyList)', function(data) { - initDepartment(); - initJob(); - }); - - // 部门监听事件 - form.on('select(departmentList)', function(data) { - initJob(); - }); - // 保存 $("body").on("click", "#saveCheckBox", function() { var selectedData = tableCheckBoxUtil.getValue({ gridId: 'messageTable' }); - if(selectedData.length == 0){ + if (selectedData.length == 0) { winui.window.msg("请选择员工", {icon: 2, time: 2000}); return false; } - AjaxPostUtil.request({url: reqBasePath + "staff009", params: {ids: selectedData.toString()}, type: 'json', method: "POST", callback: function (json) { - parent.systemCommonUtil.checkStaffMation = [].concat(json.rows); - parent.layer.close(index); - parent.refreshCode = '0'; - }}); + parent.systemCommonUtil.checkStaffMation = [].concat(selectedData); + parent.layer.close(index); + parent.refreshCode = '0'; }); form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - refreshTable(); - } - return false; - }); - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - function loadTable() { - table.reloadData("messageTable", {where: getTableParams()}); - } - - function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); - } + loadTable(); + }); + + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } function getTableParams() { - return { - userName: $("#userName").val(), - userSex: $("#userSex").val(), - userIdCard: $("#userIdCard").val(), - companyName: $("#companyList").val(), - departmentName: $("#departmentList").val(), - jobName: $("#jobList").val() - }; + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); } exports('sysEveUserStaffChoose', {}); diff --git a/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffList.js b/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffList.js index 475b01f4d9710982381c30686d2544f5957b67bb..733ec69e3b7d2bdb13401d28c3d4914508b91be9 100644 --- a/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffList.js +++ b/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffList.js @@ -62,14 +62,8 @@ layui.config({ }}, { field: 'jobNumber', title: '工号', rowspan: '3', align: 'left', width: 100, fixed: 'left'}, { field: 'staffType', title: '类型', rowspan: '3', align: 'left', width: 90, templet: function (d) { - if (d.staffType == 1) { - return '普通员工'; - } else if (d.staffType == 2) { - return '教职工'; - } else { - return '参数错误'; - } - }}, + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("userStaffType", 'id', d.staffType, 'name'); + }}, { field: 'email', title: '邮箱', rowspan: '3', align: 'left', width: 170 }, { field: 'userPhoto', title: '头像', rowspan: '3', align: 'center', width: 60, templet: function (d) { if (isNull(d.userPhoto)) { @@ -87,18 +81,10 @@ layui.config({ }}, { field: 'userIdCard', title: '身份证', rowspan: '3', align: 'center', width: 160 }, { field: 'userSex', title: '性别', width: 80, rowspan: '3', align: 'center', templet: function (d) { - if(d.userSex == '0'){ - return "保密"; - } else if (d.userSex == '1'){ - return "男"; - } else if (d.userSex == '2'){ - return "女"; - } else { - return "参数错误"; - } - }}, + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sexEnum", 'id', d.userSex, 'name'); + }}, { field: 'state', title: '状态', rowspan: '3', width: 60, align: 'center', templet: function (d) { - return getStaffStateName(d); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("userStaffState", 'id', d.state, 'name'); }}, { title: '公司信息', align: 'center', colspan: '3'}, { field: 'phone', title: '手机号', rowspan: '3', align: 'center', width: 100}, diff --git a/userauth/src/main/resources/template/tpl/sysEveUserStaff/sysEveUserStaffChoose.html b/userauth/src/main/resources/template/tpl/sysEveUserStaff/sysEveUserStaffChoose.html index 20f1af4c9117d05a686f34e201f34107c4e7d604..a79c50905d76a1da99cd8494c5ca0dc1ebc6efa5 100644 --- a/userauth/src/main/resources/template/tpl/sysEveUserStaff/sysEveUserStaffChoose.html +++ b/userauth/src/main/resources/template/tpl/sysEveUserStaff/sysEveUserStaffChoose.html @@ -5,71 +5,22 @@ - - -
    -
    - -
    -
    -
    -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - - -
    -
    -
    +
    +
    - - +
    -
    -
    -
    +
    diff --git a/wages/src/main/resources/template/js/wagesStaffMation/wagesStaffDesignMationList.js b/wages/src/main/resources/template/js/wagesStaffMation/wagesStaffDesignMationList.js index 0d68260892279762078a2f21a6d36c49883e4af0..b0dfbc3b012e70fa10b4f7d6b66a9beb0cf476b6 100644 --- a/wages/src/main/resources/template/js/wagesStaffMation/wagesStaffDesignMationList.js +++ b/wages/src/main/resources/template/js/wagesStaffMation/wagesStaffDesignMationList.js @@ -12,7 +12,6 @@ layui.config({ form = layui.form, table = layui.table, soulTable = layui.soulTable; - var selTemplate = getFileContent('tpl/template/select-option.tpl') // 已设定员工薪资档案 table.render({ @@ -36,14 +35,8 @@ layui.config({ return d.jobNumber + '_' + d.userName; }}, { field: 'staffType', title: '类型', rowspan: '3', align: 'left', width: 90, templet: function (d) { - if(d.staffType == 1){ - return '普通员工'; - } else if (d.staffType == 2){ - return '教职工'; - } else { - return '参数错误'; - } - }}, + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("userStaffType", 'id', d.staffType, 'name'); + }}, { field: 'email', title: '邮箱', rowspan: '3', align: 'left', width: 170 }, { field: 'userPhoto', title: '头像', rowspan: '3', align: 'center', width: 60, templet: function (d) { if(isNull(d.userPhoto)){ @@ -53,18 +46,10 @@ layui.config({ } }}, { field: 'userSex', title: '性别', width: 60, rowspan: '3', align: 'center', templet: function (d) { - if(d.userSex == '0'){ - return "保密"; - } else if (d.userSex == '1'){ - return "男"; - } else if (d.userSex == '2'){ - return "女"; - } else { - return "参数错误"; - } - }}, + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sexEnum", 'id', d.userSex, 'name'); + }}, { field: 'state', title: '状态', rowspan: '3', width: 60, align: 'center', templet: function (d) { - return getStaffStateName(d); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("userStaffState", 'id', d.state, 'name'); }}, { field: 'actWages', title: '月标准薪资(元)', rowspan: '3', align: 'left', width: 120}, { title: '公司信息', align: 'center', colspan: '3'}, @@ -78,10 +63,10 @@ layui.config({ { field: 'jobName', title: '职位', align: 'left', width: 120} ] ], - done: function(json) { - if(!loadCompany){ - initCompany(); - } + done: function(res) { + initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入姓名，工号", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); soulTable.render(this); matchingLanguage(); } @@ -97,57 +82,6 @@ layui.config({ } }); - var loadCompany = false; - // 初始化公司 - function initCompany(){ - loadCompany = true; - systemCommonUtil.getSysCompanyList(function (json) { - // 加载企业数据 - $("#companyList").html(getDataUseHandlebars(selTemplate, json)); - form.render('select'); - }); - } - - // 初始化部门 - function initDepartment(){ - if (isNull($("#companyList").val())) { - $("#companyList").val('') - form.render('select'); - } else { - showGrid({ - id: "departmentList", - url: reqBasePath + "companydepartment007", - params: {companyId: $("#companyList").val()}, - pagination: false, - method: 'POST', - template: selTemplate, - ajaxSendLoadBefore: function(hdb) {}, - ajaxSendAfter:function (json) { - form.render('select'); - } - }); - } - } - - function initJob(){ - // 根据部门id获取岗位集合 - systemCommonUtil.queryJobListByDepartmentId($("#departmentList").val(), function(data) { - $("#jobList").html(getDataUseHandlebars(selTemplate, data)); - form.render('select'); - }); - } - - // 公司监听事件 - form.on('select(companyList)', function(data) { - initDepartment(); - initJob(); - }); - - // 部门监听事件 - form.on('select(departmentList)', function(data) { - initJob(); - }); - // 薪资变更 function wagesDesign(data) { rowId = data.id; @@ -161,37 +95,19 @@ layui.config({ loadTable(); }}); } - + form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - refreshTable(); - } - return false; + $("body").on("click", "#reloadTable", function() { + loadTable(); }); - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - function loadTable() { - table.reloadData("messageTable", {where: getTableParams()}); - } - - function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); - } - - function getTableParams() { - return { - companyId: $("#companyList").val(), - departmentId: $("#departmentList").val(), - jobId: $("#jobList").val(), - userName: $("#userName").val(), - jobNumber: $("#jobNumber").val(), - userSex: $("#userSex").val() - }; - } + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } exports('wagesStaffDesignMationList', {}); }); diff --git a/wages/src/main/resources/template/js/wagesStaffMation/wagesStaffWaitDesignMationList.js b/wages/src/main/resources/template/js/wagesStaffMation/wagesStaffWaitDesignMationList.js index bf8e850b3f28b18901e091301997d8160c6f5bab..f088c8cb463ff379a32d685250d03c45cd8ef718 100644 --- a/wages/src/main/resources/template/js/wagesStaffMation/wagesStaffWaitDesignMationList.js +++ b/wages/src/main/resources/template/js/wagesStaffMation/wagesStaffWaitDesignMationList.js @@ -12,7 +12,6 @@ layui.config({ form = layui.form, table = layui.table, soulTable = layui.soulTable; - var selTemplate = getFileContent('tpl/template/select-option.tpl') // 待设定薪资员工列表 table.render({ @@ -36,13 +35,7 @@ layui.config({ return d.jobNumber + '_' + d.userName; }}, { field: 'staffType', title: '类型', rowspan: '3', align: 'left', width: 90, templet: function (d) { - if(d.staffType == 1){ - return '普通员工'; - } else if (d.staffType == 2){ - return '教职工'; - } else { - return '参数错误'; - } + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("userStaffType", 'id', d.staffType, 'name'); }}, { field: 'email', title: '邮箱', rowspan: '3', align: 'left', width: 170 }, { field: 'userPhoto', title: '头像', rowspan: '3', align: 'center', width: 60, templet: function (d) { @@ -53,18 +46,10 @@ layui.config({ } }}, { field: 'userSex', title: '性别', width: 60, rowspan: '3', align: 'center', templet: function (d) { - if(d.userSex == '0'){ - return "保密"; - } else if (d.userSex == '1'){ - return "男"; - } else if (d.userSex == '2'){ - return "女"; - } else { - return "参数错误"; - } - }}, + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sexEnum", 'id', d.userSex, 'name'); + }}, { field: 'state', title: '状态', rowspan: '3', width: 60, align: 'center', templet: function (d) { - return getStaffStateName(d); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("userStaffState", 'id', d.state, 'name'); }}, { title: '公司信息', align: 'center', colspan: '3'}, { field: 'phone', title: '手机号', rowspan: '3', align: 'center', width: 100}, @@ -77,12 +62,13 @@ layui.config({ { field: 'jobName', title: '职位', align: 'left', width: 120} ] ], - done: function(json) { - if(!loadCompany){ - initCompany(); - } + done: function(res) { soulTable.render(this); matchingLanguage(); + + initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入姓名，工号", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); } }); @@ -96,57 +82,6 @@ layui.config({ } }); - var loadCompany = false; - // 初始化公司 - function initCompany(){ - loadCompany = true; - systemCommonUtil.getSysCompanyList(function (json) { - // 加载企业数据 - $("#companyList").html(getDataUseHandlebars(selTemplate, json)); - form.render('select'); - }); - } - - // 初始化部门 - function initDepartment(){ - if (isNull($("#companyList").val())) { - $("#companyList").val('') - form.render('select'); - } else { - showGrid({ - id: "departmentList", - url: reqBasePath + "companydepartment007", - params: {companyId: $("#companyList").val()}, - pagination: false, - method: 'POST', - template: selTemplate, - ajaxSendLoadBefore: function(hdb) {}, - ajaxSendAfter:function (json) { - form.render('select'); - } - }); - } - } - - function initJob(){ - // 根据部门id获取岗位集合 - systemCommonUtil.queryJobListByDepartmentId($("#departmentList").val(), function(data) { - $("#jobList").html(getDataUseHandlebars(selTemplate, data)); - form.render('select'); - }); - } - - // 公司监听事件 - form.on('select(companyList)', function(data) { - initDepartment(); - initJob(); - }); - - // 部门监听事件 - form.on('select(departmentList)', function(data) { - initJob(); - }); - // 薪资设定 function wagesDesign(data) { rowId = data.id; @@ -160,37 +95,19 @@ layui.config({ loadTable(); }}); } - + form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - refreshTable(); - } - return false; + $("body").on("click", "#reloadTable", function() { + loadTable(); }); - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - function loadTable() { - table.reloadData("messageTable", {where: getTableParams()}); - } - - function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); - } - - function getTableParams() { - return { - companyId: $("#companyList").val(), - departmentId: $("#departmentList").val(), - jobId: $("#jobList").val(), - userName: $("#userName").val(), - jobNumber: $("#jobNumber").val(), - userSex: $("#userSex").val() - }; - } + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } exports('wagesStaffWaitDesignMationList', {}); }); diff --git a/wages/src/main/resources/template/tpl/wagesStaffMation/wagesStaffDesignMationList.html b/wages/src/main/resources/template/tpl/wagesStaffMation/wagesStaffDesignMationList.html index 90f61917f6c3c6f76fad5fd3fe870ec61da90bcb..963c9d1f817a94e60c8b1f086d8245f6c7fa882f 100644 --- a/wages/src/main/resources/template/tpl/wagesStaffMation/wagesStaffDesignMationList.html +++ b/wages/src/main/resources/template/tpl/wagesStaffMation/wagesStaffDesignMationList.html @@ -7,55 +7,10 @@ -
    -
    该列表仅展示待设定的未离职的员工的薪资。
    -
    -
    -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - - -
    -
    -
    -
    +
    该列表仅展示待设定的未离职的员工的薪资。
    - +
    diff --git a/wages/src/main/resources/template/tpl/wagesStaffMation/wagesStaffWaitDesignMationList.html b/wages/src/main/resources/template/tpl/wagesStaffMation/wagesStaffWaitDesignMationList.html index 590baa102514f00baa137d00716b66c741039be4..9ee7b92e716ea3f085a70c2038265738e85f6b99 100644 --- a/wages/src/main/resources/template/tpl/wagesStaffMation/wagesStaffWaitDesignMationList.html +++ b/wages/src/main/resources/template/tpl/wagesStaffMation/wagesStaffWaitDesignMationList.html @@ -7,58 +7,13 @@ -
    -
    该列表仅展示待设定的未离职的员工的薪资。
    -
    -
    -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - - -
    -
    -
    -
    +
    该列表仅展示待设定的未离职的员工的薪资。
    - +
    -
    +