diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/TherapyRecuperationModule.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/TherapyRecuperationModule.java index 8abaef0..1138389 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/TherapyRecuperationModule.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/TherapyRecuperationModule.java @@ -131,7 +131,7 @@ public class TherapyRecuperationModule { Sys_menu root = addMenu(module.getId(), "", "普惠疗休养V3", ROOT, "inclusiveTherapyV3", "pc"); List roles = dao.query(Sys_role.class, Cnd.where("disabled", "=", false)); for (String[] screen : SCREENS) { - Sys_menu menu = addMenu(module.getId(), root.getId(), screen[1], ROOT + "?screen=" + screen[0], + Sys_menu menu = addMenu(module.getId(), root.getId(), screen[1], ROOT + screen[2], "inclusiveTherapyV3." + screen[3], "pc"); int position = MENU_SCREENS.indexOf(screen[0]); dao.update(Sys_menu.class, Chain.make("showit", position >= 0) @@ -147,7 +147,7 @@ public class TherapyRecuperationModule { } } } - Sys_menu signup = addMenu(module.getId(), root.getId(), "疗休养报名", ROOT + "?screen=signup", "inclusiveTherapyV3.signup", "pc"); + Sys_menu signup = addMenu(module.getId(), root.getId(), "疗休养报名", ROOT + "/mobile/index", "inclusiveTherapyV3.signup", "pc"); dao.update(Sys_menu.class, Chain.make("showit", false), Cnd.where("id", "=", signup.getId())); Sys_module h5Module = dao.fetch(Sys_module.class, Cnd.where("name", "=", module.getName()).and("platform", "=", "h5")); if (h5Module == null) { diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/TherapyWorkspaceController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/TherapyWorkspaceController.java index 11e98ca..109b213 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/TherapyWorkspaceController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/TherapyWorkspaceController.java @@ -5,18 +5,16 @@ import cn.dev33.satoken.stp.StpUtil; import com.budwk.app.zhgh.staffbenefit.therapyRecuperation.TherapyRecuperationModule; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.mvc.annotation.*; -import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; @IocBean @At("/platform/inclusiveTherapyV3") public class TherapyWorkspaceController { @At("") @SaCheckLogin - @Ok("beetl:/platform/zhgh/staffbenefit/therapyRecuperation/index.html") - public void index(String screen, HttpServletRequest request) { + @Ok("void") + public void index(String screen, HttpServletResponse response) throws IOException { if (screen == null) { for (String key : TherapyRecuperationModule.MENU_SCREENS) { for (String[] candidate : TherapyRecuperationModule.SCREENS) { @@ -41,23 +39,6 @@ public class TherapyWorkspaceController { } if (!found) throw new IllegalArgumentException("未知的普惠疗休养V3页面"); } - List tabs = new ArrayList<>(); - String[][] groups = {{"overview", "cluster", "adjustment"}, - {"branchQuery", "branchAudit", "travelAudit"}, {"userQuery", "schoolAudit", "import"}}; - for (String[] group : groups) { - if (Arrays.asList(group).contains(screen)) { - for (String key : group) { - for (String[] candidate : TherapyRecuperationModule.SCREENS) { - if (candidate[0].equals(key) && StpUtil.hasPermission("inclusiveTherapyV3." + candidate[3])) { - tabs.add(candidate); - } - } - } - break; - } - } - request.setAttribute("therapyTabs", tabs); - request.setAttribute("therapyShowTabs", tabs.size() > 1); - request.setAttribute("therapyPageUrl", url); + response.sendRedirect(url); } } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/service/impl/TheRapyRecuperationLineUnionSelectServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/service/impl/TheRapyRecuperationLineUnionSelectServiceImpl.java index 494dd8e..370278e 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/service/impl/TheRapyRecuperationLineUnionSelectServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/service/impl/TheRapyRecuperationLineUnionSelectServiceImpl.java @@ -71,7 +71,7 @@ public class TheRapyRecuperationLineUnionSelectServiceImpl extends TherapyServic us.playEndTime, us.changeEndTime, us.isOpen, - us.signUpMode, + IFNULL(us.signUpMode, line.signUpMode) AS signUpMode, line.createMode, gh.unionname AS createUnionName, u.username AS createUserName, diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/support/TherapyContext.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/support/TherapyContext.java index 8603aeb..46e69db 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/support/TherapyContext.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/support/TherapyContext.java @@ -13,6 +13,15 @@ import java.util.Collection; @IocBean public class TherapyContext { + public static boolean isEmbeddedPage() { + return "1".equals(Mvcs.getReq().getParameter("therapyEmbedded")); + } + + public static String getEmbeddedPageUrl() { + String query = Mvcs.getReq().getQueryString(); + return Mvcs.getReq().getRequestURI() + (Strings.isBlank(query) ? "?" : "?" + query + "&") + "therapyEmbedded=1"; + } + public static String getUserId() { return SecurityUtil.getUserId(); } diff --git a/src/main/resources/db/v4_from_v3/init_staff_therapy_menus_roles.sql b/src/main/resources/db/v4_from_v3/init_staff_therapy_menus_roles.sql index cc40560..d1060ee 100644 --- a/src/main/resources/db/v4_from_v3/init_staff_therapy_menus_roles.sql +++ b/src/main/resources/db/v4_from_v3/init_staff_therapy_menus_roles.sql @@ -15,84 +15,84 @@ FROM sys_module WHERE name='职工权益' AND platform='pc' LIMIT 1; -- 旅行社管理 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag) SELECT '7ea90000000000000000000000000001', id, CONCAT(path, '0001'), - '旅行社管理', 'menu', '/platform/inclusiveTherapyV3?screen=agency', '_self', 'fa fa-th-large', 1, 0, + '旅行社管理', 'menu', '/platform/inclusiveTherapyV3/travelAgency', '_self', 'fa fa-th-large', 1, 0, 'inclusiveTherapyV3.travelAgency', 1, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0 FROM sys_menu WHERE permission='inclusiveTherapyV3'; -- 线路管理 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag) SELECT '7ea90000000000000000000000000002', id, CONCAT(path, '0002'), - '线路管理', 'menu', '/platform/inclusiveTherapyV3?screen=line', '_self', 'fa fa-th-large', 1, 0, + '线路管理', 'menu', '/platform/inclusiveTherapyV3/line', '_self', 'fa fa-th-large', 1, 0, 'inclusiveTherapyV3.line', 2, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0 FROM sys_menu WHERE permission='inclusiveTherapyV3'; -- 分工会选择线路 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag) SELECT '7ea90000000000000000000000000003', id, CONCAT(path, '0003'), - '分工会选择线路', 'menu', '/platform/inclusiveTherapyV3?screen=branchSelect', '_self', 'fa fa-th-large', 1, 0, + '分工会选择线路', 'menu', '/platform/inclusiveTherapyV3/lineFghSelect?mode=1', '_self', 'fa fa-th-large', 1, 0, 'inclusiveTherapyV3.lineFghSelect', 3, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0 FROM sys_menu WHERE permission='inclusiveTherapyV3'; -- 校工会选择线路 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag) SELECT '7ea90000000000000000000000000004', id, CONCAT(path, '0004'), - '校工会选择线路', 'menu', '/platform/inclusiveTherapyV3?screen=schoolSelect', '_self', 'fa fa-th-large', 1, 0, + '校工会选择线路', 'menu', '/platform/inclusiveTherapyV3/lineXghSelect?mode=2', '_self', 'fa fa-th-large', 1, 0, 'inclusiveTherapyV3.lineXghSelect', 4, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0 FROM sys_menu WHERE permission='inclusiveTherapyV3'; -- 满意度统计 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag) SELECT '7ea90000000000000000000000000005', id, CONCAT(path, '0005'), - '满意度统计', 'menu', '/platform/inclusiveTherapyV3?screen=queryStatistics', '_self', 'fa fa-th-large', 1, 0, + '满意度统计', 'menu', '/platform/inclusiveTherapyV3/query/statics', '_self', 'fa fa-th-large', 1, 0, 'inclusiveTherapyV3.queryStatics', 5, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0 FROM sys_menu WHERE permission='inclusiveTherapyV3'; -- 分工会信息查询 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag) SELECT '7ea90000000000000000000000000006', id, CONCAT(path, '0006'), - '分工会信息查询', 'menu', '/platform/inclusiveTherapyV3?screen=branchQuery', '_self', 'fa fa-th-large', 1, 0, + '分工会信息查询', 'menu', '/platform/inclusiveTherapyV3/query', '_self', 'fa fa-th-large', 1, 0, 'inclusiveTherapyV3.TheRapyQuery', 6, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0 FROM sys_menu WHERE permission='inclusiveTherapyV3'; -- 校工会信息查询 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag) SELECT '7ea90000000000000000000000000007', id, CONCAT(path, '0007'), - '校工会信息查询', 'menu', '/platform/inclusiveTherapyV3?screen=userQuery', '_self', 'fa fa-th-large', 1, 0, + '校工会信息查询', 'menu', '/platform/inclusiveTherapyV3/user/query', '_self', 'fa fa-th-large', 1, 0, 'inclusiveTherapyV3.TheRapyUserQuery', 7, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0 FROM sys_menu WHERE permission='inclusiveTherapyV3'; -- 线路选择查询 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag) SELECT '7ea90000000000000000000000000008', id, CONCAT(path, '0008'), - '线路选择查询', 'menu', '/platform/inclusiveTherapyV3?screen=overview', '_self', 'fa fa-th-large', 1, 0, + '线路选择查询', 'menu', '/platform/inclusiveTherapyV3/lineSelectionOverview', '_self', 'fa fa-th-large', 1, 0, 'inclusiveTherapyV3.lineSelectionOverview', 8, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0 FROM sys_menu WHERE permission='inclusiveTherapyV3'; -- 成团结果通知 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag) SELECT '7ea90000000000000000000000000009', id, CONCAT(path, '0009'), - '成团结果通知', 'menu', '/platform/inclusiveTherapyV3?screen=lineStatistics', '_self', 'fa fa-th-large', 1, 0, + '成团结果通知', 'menu', '/platform/inclusiveTherapyV3/statistics', '_self', 'fa fa-th-large', 1, 0, 'inclusiveTherapyV3.statistics', 9, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0 FROM sys_menu WHERE permission='inclusiveTherapyV3'; -- 基础设置 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag) SELECT '7ea9000000000000000000000000000a', id, CONCAT(path, '0010'), - '基础设置', 'menu', '/platform/inclusiveTherapyV3?screen=config', '_self', 'fa fa-th-large', 1, 0, + '基础设置', 'menu', '/platform/inclusiveTherapyV3/TheRapyConfig', '_self', 'fa fa-th-large', 1, 0, 'inclusiveTherapyV3.TheRapyConfig', 10, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0 FROM sys_menu WHERE permission='inclusiveTherapyV3'; -- 分工会线路选择统计 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag) SELECT '7ea9000000000000000000000000000b', id, CONCAT(path, '0011'), - '分工会线路选择统计', 'menu', '/platform/inclusiveTherapyV3?screen=unionStatistics', '_self', 'fa fa-th-large', 1, 0, + '分工会线路选择统计', 'menu', '/platform/inclusiveTherapyV3/statistics/unionLineNumberStatistics', '_self', 'fa fa-th-large', 1, 0, 'inclusiveTherapyV3.unionLineNumberStatistics', 11, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0 FROM sys_menu WHERE permission='inclusiveTherapyV3'; -- 人数统计 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag) SELECT '7ea9000000000000000000000000000c', id, CONCAT(path, '0012'), - '人数统计', 'menu', '/platform/inclusiveTherapyV3?screen=agencyStatistics', '_self', 'fa fa-th-large', 1, 0, + '人数统计', 'menu', '/platform/inclusiveTherapyV3/travelAgencyMonthlyStatistics', '_self', 'fa fa-th-large', 1, 0, 'inclusiveTherapyV3.travelAgencyMonthlyStatistics', 12, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0 FROM sys_menu WHERE permission='inclusiveTherapyV3'; diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/compat.js b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/compat.js index f222b3a..ef5b4fd 100644 --- a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/compat.js +++ b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/compat.js @@ -1,17 +1,6 @@ const sublime = { jumpPagePjax(url) { window.location.href = url; - }, - showLoadingbar() { - if (!document.getElementById('therapy-loading')) { - const bar = document.createElement('div'); - bar.id = 'therapy-loading'; - document.body.appendChild(bar); - } - }, - closeLoadingbar() { - const bar = document.getElementById('therapy-loading'); - if (bar) bar.remove(); } }; @@ -89,7 +78,6 @@ Vue.directive('throttle', { $.ajaxSetup({ traditional: true, error(xhr) { - sublime.closeLoadingbar(); const message = xhr.responseJSON && xhr.responseJSON.msg || '请求失败，请稍后重试'; if (window.ELEMENT) ELEMENT.Message.error(message); else if (window.vant) vant.Toast.fail(message); diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/initTableMixins.js b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/initTableMixins.js index 505681a..d814e76 100644 --- a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/initTableMixins.js +++ b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/initTableMixins.js @@ -93,10 +93,8 @@ const initTableMixins = { }, pageData(url) { const address = url ? url : loc() + "/pageData" - sublime.showLoadingbar(); this.tableLoading = true $.post(address, this.pageForm, (data) => { - sublime.closeLoadingbar(); this.tableLoading = false if (data.code == 0) { this.tableData = data.data.list; @@ -105,7 +103,6 @@ const initTableMixins = { this.$message.error(data.msg); } }, "json").always(() => { - sublime.closeLoadingbar(); this.tableLoading = false; }); }, diff --git a/src/main/resources/views/layouts/platform.html b/src/main/resources/views/layouts/platform.html index dc9cfba..bcc9f86 100644 --- a/src/main/resources/views/layouts/platform.html +++ b/src/main/resources/views/layouts/platform.html @@ -384,7 +384,7 @@ layout("/layouts/v4/baseLayout.html"){ return search(menus, []); } - const result = findMenuPath(this.menus, targetHref) + const result = findMenuPath(this.menus, this.getMenuOwnerFullPath()) || findMenuPath(this.menus, targetHref) if(result){ this.activeMenuIndex = result[result.length-1]['id'] this.openedMenus = result.map(v=>v.id) @@ -399,6 +399,10 @@ layout("/layouts/v4/baseLayout.html"){ // 默认选中 getMenuOwnerPath() { const pathname = window.location.pathname + if (pathname === "/platform/inclusiveTherapyV3") { + const screen = new URLSearchParams(window.location.search).get("screen") + if (screen) return pathname + "?screen=" + encodeURIComponent(screen) + } // API配置表单不是独立菜单，直接刷新表单地址时仍归属API配置菜单。 if (pathname === "/platform/personGovernance/apiConfig/form") { return "/platform/personGovernance/apiConfig" diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyAudit.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyAudit.html index 79343e3..8bbabd0 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyAudit.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyAudit.html @@ -954,14 +954,12 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){ return data }, pageData() { - sublime.showLoadingbar(); this.tableLoading = true const pageForm = clone(this.pageForm) pageForm.states = JSON.stringify(pageForm.states) $.post(loc() + "/pageData", pageForm, (data) => { - sublime.closeLoadingbar(); this.tableLoading = false if (data.code === 0) { this.tableData = data.data.list; diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyTravelAudit.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyTravelAudit.html index 371b30d..5f2e4e9 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyTravelAudit.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyTravelAudit.html @@ -797,14 +797,12 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){ this.unionOptions = data }, pageData() { - sublime.showLoadingbar(); this.tableLoading = true const pageForm = clone(this.pageForm) pageForm.states = JSON.stringify(pageForm.states) $.post(loc() + "/pageData", pageForm, (data) => { - sublime.closeLoadingbar(); this.tableLoading = false if (data.code === 0) { this.tableData = data.data.list; diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyXghAudit.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyXghAudit.html index a4924a3..c186b68 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyXghAudit.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyXghAudit.html @@ -957,14 +957,12 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){ return data }, pageData() { - sublime.showLoadingbar(); this.tableLoading = true const pageForm = clone(this.pageForm) pageForm.states = JSON.stringify(pageForm.states) $.post(loc() + "/pageData", pageForm, (data) => { - sublime.closeLoadingbar(); this.tableLoading = false if (data.code === 0) { this.tableData = data.data.list; diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/line.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/line.html index 48b922a..17952aa 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/line.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/line.html @@ -842,10 +842,10 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){ this.$message.success(resp.msg) await this.$confirm('需要将该线路设置为出行线路吗?', '提示', { confirmButtonText: '确定', - cancelButtonText: '返回列表', + cancelButtonText: '取消', type: 'warning' }).then(async () => { - window.top.location.href = '/platform/inclusiveTherapyV3?screen=schoolSelect' + window.top.location.href = '/platform/inclusiveTherapyV3/lineXghSelect?mode=2' }).catch(() => { this.$refs.guava.index() this.pageData() diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/index.html index d1a0d23..7b2e351 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/index.html @@ -1,12 +1,5 @@ - -
- - ${tab[1],escape} - -
- diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html index 42f2061..c12c666 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html @@ -1,3 +1,7 @@ + + + + 普惠疗休养V3 @@ -47,5 +51,6 @@ Vue.directive('auth', {inserted(el, binding) { if (!requested.some(role => roles.includes(role))) el.parentNode.removeChild(el); }}); - + ${layoutContent} + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyQuery.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyQuery.html index 9ce6813..90503d2 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyQuery.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyQuery.html @@ -1450,7 +1450,6 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){ this.$message.warning('请先选择需要查看的记录'); return } - sublime.showLoadingbar(); this.tableLoading = true const pageForm = clone(this.pageFormUser) pageForm.id = this.applyUserRow.id @@ -1466,7 +1465,6 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){ } }) .always(() => { - sublime.closeLoadingbar(); this.tableLoading = false }); this.$refs.guava.view() @@ -1505,7 +1503,6 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){ this.tableLoading = true this.tableData = [] $.post(loc() + "/getSelfUnionUser", this.pageForm, (data) => { - sublime.closeLoadingbar(); this.tableLoading = false if (data.code === 0) { this.tableData = data.data.list; @@ -1640,7 +1637,6 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){ this.tableLoading = true this.tableData = [] $.post(loc() + "/getLxsData", this.pageForm, (data) => { - sublime.closeLoadingbar(); this.tableLoading = false if (data.code === 0) { this.tableData = data.data.list; @@ -1654,7 +1650,6 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){ this.tableLoading = true this.tableData = [] $.post(loc() + "/getJdData", this.pageForm, (data) => { - sublime.closeLoadingbar(); this.tableLoading = false if (data.code === 0) { this.tableData = data.data.list; @@ -1668,7 +1663,6 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){ this.tableLoading = true this.tableData = [] $.post(loc() + "/getXlData", this.pageForm, (data) => { - sublime.closeLoadingbar(); this.tableLoading = false if (data.code === 0) { this.tableData = data.data.list; @@ -1682,7 +1676,6 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){ this.tableLoading = true this.tableData = [] $.post(loc() + "/getRyData", this.pageForm, (data) => { - sublime.closeLoadingbar(); this.tableLoading = false if (data.code === 0) { this.tableData = data.data.list; diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineAdjustment.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineAdjustment.html index 0591db8..63bf48a 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineAdjustment.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineAdjustment.html @@ -317,7 +317,6 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){ return d ? d.label : null }, async pageData() { - sublime.showLoadingbar() this.tableLoading = true try { const resp = await $.post(loc() + '/pageData', this.pageForm) @@ -330,7 +329,6 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){ } catch (error) { this.$actionError(error) } finally { - sublime.closeLoadingbar() this.tableLoading = false } },