diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/basics.js b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/basics.js index 5ee7d25..99e8af7 100644 --- a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/basics.js +++ b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/basics.js @@ -1,12 +1,12 @@ -const uploadFileType = ['jpg', 'png', 'doc', 'docx', 'xls', 'xlsx', 'pdf'] -const docType = ['doc', 'docx', 'xls', 'xlsx', 'pdf'] +var uploadFileType = ['jpg', 'png', 'doc', 'docx', 'xls', 'xlsx', 'pdf'] +var docType = ['doc', 'docx', 'xls', 'xlsx', 'pdf'] -const FILE_UPLOAD_ADDRESS = '/platform/inclusiveTherapyV3/common/uploadFile' -const FILE_DELETE_ADDRESS = '/platform/inclusiveTherapyV3/common/deleteFile' -const FILE_STREAM_PREVIEW_ADDRESS = '/platform/inclusiveTherapyV3/common/preview' -const FILE_STREAM_DOWNLOAD_ADDRESS = '/platform/inclusiveTherapyV3/common/download' +var FILE_UPLOAD_ADDRESS = '/platform/inclusiveTherapyV3/common/uploadFile' +var FILE_DELETE_ADDRESS = '/platform/inclusiveTherapyV3/common/deleteFile' +var FILE_STREAM_PREVIEW_ADDRESS = '/platform/inclusiveTherapyV3/common/preview' +var FILE_STREAM_DOWNLOAD_ADDRESS = '/platform/inclusiveTherapyV3/common/download' -const preview = async (filename, id) => { +var preview = async (filename, id) => { const suffix = filename.substring(filename.lastIndexOf('.') + 1) if (!docType.includes(suffix.toLowerCase())) { let image = new Image(); @@ -19,19 +19,19 @@ const preview = async (filename, id) => { } } -const download = (id) => { +var download = (id) => { window.open(FILE_STREAM_DOWNLOAD_ADDRESS + '?id=' + id) } -const PREVIEW_IMAGE = (val) => { +var PREVIEW_IMAGE = (val) => { let image = new Image(); image.src = FILE_STREAM_PREVIEW_ADDRESS + "?id=" + val let viewer = new Viewer(image); viewer.show(); } -const CREATE_PREVIEW_URL = (val) => { +var CREATE_PREVIEW_URL = (val) => { return /^(https?:|data:|blob:|\/)/.test(val || "") ? val : FILE_STREAM_PREVIEW_ADDRESS + "?id=" + encodeURIComponent(val) } @@ -40,13 +40,13 @@ const CREATE_PREVIEW_URL = (val) => { * 遮盖层颜色 * @type {string} */ -const COVER_LAYER_COLOR = "rgba(0,0,0,.45)" +var COVER_LAYER_COLOR = "rgba(0,0,0,.45)" /** * 民族 * @type {string[]} */ -const nation = [ +var nation = [ '汉族', '蒙古族', '回族', @@ -113,7 +113,7 @@ function clone(obj) { return JSON.parse(JSON.stringify(obj)) } -const calcTableHeight = (eleIds = []) => { +var calcTableHeight = (eleIds = []) => { if (eleIds) { eleIds.forEach(e_id => { const ele = document.querySelector('#' + e_id) diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/compat.js b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/compat.js index ef5b4fd..b377d43 100644 --- a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/compat.js +++ b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/compat.js @@ -1,4 +1,4 @@ -const sublime = { +var sublime = { jumpPagePjax(url) { window.location.href = url; } diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-lake-text-v3.png b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-lake-text-v3.png new file mode 100644 index 0000000..703de3e Binary files /dev/null and b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-lake-text-v3.png differ diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-mountain-text-v3.png b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-mountain-text-v3.png new file mode 100644 index 0000000..45a7626 Binary files /dev/null and b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-mountain-text-v3.png differ diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-notice-cover-v2.png b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-notice-cover-v2.png index 44a2161..a6a47da 100644 Binary files a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-notice-cover-v2.png and b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-notice-cover-v2.png differ diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-province-in-v2.png b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-province-in-v2.png index 948b8bc..7c2ec00 100644 Binary files a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-province-in-v2.png and b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-province-in-v2.png differ diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-province-out-v2.png b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-province-out-v2.png index ef93d65..16bd5b2 100644 Binary files a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-province-out-v2.png and b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-province-out-v2.png differ diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-route-in-bg-v1.png b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-route-in-bg-v1.png new file mode 100644 index 0000000..7214e38 Binary files /dev/null and b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-route-in-bg-v1.png differ diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-route-in-card-v2.png b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-route-in-card-v2.png new file mode 100644 index 0000000..0da0ffc Binary files /dev/null and b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-route-in-card-v2.png differ diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-route-out-bg-v1.png b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-route-out-bg-v1.png new file mode 100644 index 0000000..b9500ca Binary files /dev/null and b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-route-out-bg-v1.png differ diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-route-out-card-v2.png b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-route-out-card-v2.png new file mode 100644 index 0000000..226c2cd Binary files /dev/null and b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/img/home-route-out-card-v2.png differ diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/initTableMixins.js b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/initTableMixins.js index d814e76..8e3cf64 100644 --- a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/initTableMixins.js +++ b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/initTableMixins.js @@ -1,4 +1,4 @@ -const initTableMixins = { +var therapyTableMixins = { data() { return { festival: ['元旦', '春节', '清明节', '劳动节', '端午节', '中秋节', '国庆节', '其它'], diff --git a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/v.js b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/v.js index bfe8d67..c84791a 100644 --- a/src/main/resources/static/assets/staffbenefit/therapyRecuperation/v.js +++ b/src/main/resources/static/assets/staffbenefit/therapyRecuperation/v.js @@ -2,7 +2,7 @@ * 根据enum获取选项 * @returns {Promise<*>} */ -const getEnumOptions = async (enumName) => { +var getEnumOptions = async (enumName) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/enumOptions", {enumName}) return data } @@ -11,7 +11,7 @@ const getEnumOptions = async (enumName) => { * 根据code获取字典选项 * @returns {Promise<*>} */ -const getDictOptions = async (code) => { +var getDictOptions = async (code) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/dictOptions", {code}) return data } @@ -20,7 +20,7 @@ const getDictOptions = async (code) => { * 根据code获取字典选项信息 * @returns {Promise<*>} */ -const getDictState = async (code) => { +var getDictState = async (code) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/dictState", {code}) return data } @@ -29,7 +29,7 @@ const getDictState = async (code) => { * 获取校区 * @returns {Promise<*>} */ -const getCampus = async () => { +var getCampus = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getCampus") return data } @@ -39,19 +39,19 @@ const getCampus = async () => { * 获取代表团 * @returns {Promise<*>} */ -const getDbt = async (jdhId) => { +var getDbt = async (jdhId) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getDbt", {jdhId}) return data } //查询当前用户管理的院级工会 -const getUnion = async () => { +var getUnion = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getUnion") return data } //查询当前用户管理的院级工会下的单位 -const getUnit = async (unionid) => { +var getUnit = async (unionid) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getUnit", {unionid: unionid}) return data } @@ -60,13 +60,13 @@ const getUnit = async (unionid) => { * 获取代表小组 * @returns {Promise<*>} */ -const getGroup = async (jdhId) => { +var getGroup = async (jdhId) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getGroup", {jdhId}) return data } //获取所有开启的教代会 -const getOpenJdh = async () => { +var getOpenJdh = async () => { const {data} = await $.get("/platform/jdh/Common/getOpenJdhxx") return data } @@ -75,7 +75,7 @@ const getOpenJdh = async () => { * 获取院级工会 * @returns {Promise<*>} */ -const getUnions = async (delegationId = null, isPermission = false) => { +var getUnions = async (delegationId = null, isPermission = false) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/unions", {delegationId, isPermission}) return data } @@ -84,7 +84,7 @@ const getUnions = async (delegationId = null, isPermission = false) => { * 获取活动院级工会 * @returns {Promise<*>} */ -const getActivityUnions = async () => { +var getActivityUnions = async () => { const {data} = await $.get("/platform/activity/basic/union/getActivityUnions",) return data } @@ -93,12 +93,12 @@ const getActivityUnions = async () => { * 获取单位 * @returns {Promise<*>} */ -const getUnits = async (unionId = null) => { +var getUnits = async (unionId = null) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/units", {unionId}) return data } -const getClubUnits = async () => { +var getClubUnits = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getClubUnits", {}) return data } @@ -107,7 +107,7 @@ const getClubUnits = async () => { * 获取单位 * @returns {Promise<*>} */ -const getActivityUnits = async (unionId) => { +var getActivityUnits = async (unionId) => { const {data} = await $.get("/platform/activity/basic/union/getActivityUnits", {unionId}) return data } @@ -117,7 +117,7 @@ const getActivityUnits = async (unionId) => { * 获取本分工会的单位 * @returns {Promise<*>} */ -const getUnionUnits = async () => { +var getUnionUnits = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/unionUnits") return data } @@ -126,7 +126,7 @@ const getUnionUnits = async () => { * 获取福利单位 * @returns {Promise<*>} */ -const getWelfareUnits = async () => { +var getWelfareUnits = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/welfareUnits") return data } @@ -135,7 +135,7 @@ const getWelfareUnits = async () => { * 获取福利单位的二级单位 * @returns {Promise<*>} */ -const getUnitsByWelfareUnit = async (welfareUnitId) => { +var getUnitsByWelfareUnit = async (welfareUnitId) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/unitsByWelfareUnit", {welfareUnitId}) return data } @@ -144,7 +144,7 @@ const getUnitsByWelfareUnit = async (welfareUnitId) => { * 获取协会 * @returns {Promise<*>} */ -const getClubs = async () => { +var getClubs = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/clubs", {}) return data } @@ -153,7 +153,7 @@ const getClubs = async () => { * 获取届次 * @returns {Promise<*>} */ -const getJc = async () => { +var getJc = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getJcByDict") return data } @@ -162,7 +162,7 @@ const getJc = async () => { * 获取当前人所管理的协会 * @returns {Promise<*>} */ -const getClubsByRole = async () => { +var getClubsByRole = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getClubsByRole", {}) return data } @@ -170,7 +170,7 @@ const getClubsByRole = async () => { * 获取当前人所在的协会 * @returns {Promise<*>} */ -const getClubsByUser = async () => { +var getClubsByUser = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getClubsByUser", {}) return data } @@ -179,7 +179,7 @@ const getClubsByUser = async () => { * 获取文件类型 * @returns {Promise<*>} */ -const getFileType = async () => { +var getFileType = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getFileTypeByDict") return data } @@ -188,7 +188,7 @@ const getFileType = async () => { * 获取基层干部的角色 * @returns {Promise<*>} */ -const getJcgbJs = async () => { +var getJcgbJs = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getJcgbJsByDict") return data } @@ -197,7 +197,7 @@ const getJcgbJs = async () => { * 获取审批员的角色 * @returns {Promise<*>} */ -const getSpyJs = async () => { +var getSpyJs = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getSpyJsByDict") return data } @@ -206,7 +206,7 @@ const getSpyJs = async () => { * 获取协会类型 * @returns {Promise<*>} */ -const getClubType = async () => { +var getClubType = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getClubTypeByDict") return data } @@ -215,7 +215,7 @@ const getClubType = async () => { * 获取系统名称 * @returns {Promise<*>} */ -const getSystemName = async () => { +var getSystemName = async () => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getSystemNameByDict") return data } @@ -224,7 +224,7 @@ const getSystemName = async () => { * 获取工代会 * @returns {Promise<*>} */ -const getGdh = async (open = true) => { +var getGdh = async (open = true) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getGdh", {open}) return data } @@ -233,7 +233,7 @@ const getGdh = async (open = true) => { * 获取工代会代表团 * @returns {Promise<*>} */ -const getGdhDbt = async (jdhId) => { +var getGdhDbt = async (jdhId) => { const {data} = await $.get("/platform/gdh/common/getDbt", {jdhId}) return data } @@ -242,7 +242,7 @@ const getGdhDbt = async (jdhId) => { * 根据id查用户 * @returns {Promise<*>} */ -const queryUserByIds = async (ids) => { +var queryUserByIds = async (ids) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/queryUserByIds", {ids: JSON.stringify(ids)}) return data } @@ -251,7 +251,7 @@ const queryUserByIds = async (ids) => { * 根据id查用户 * @returns {Promise<*>} */ -const queryUserById = async (id) => { +var queryUserById = async (id) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/queryUserById", {id: id}) return data } @@ -265,7 +265,7 @@ const queryUserById = async (id) => { * @param member * @returns {Promise<*>} */ -const searchUser = async (query, unionId = null, unitId = null, sex = null, member = null) => { +var searchUser = async (query, unionId = null, unitId = null, sex = null, member = null) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/searchUser", { query, unionId, @@ -280,7 +280,7 @@ const searchUser = async (query, unionId = null, unitId = null, sex = null, memb * 获取代表可以操作的教代会 * @returns {Promise<*>} */ -const getJdhByDb = async () => { +var getJdhByDb = async () => { const {data} = await $.get("/platform/proposal/common/getJdhByDb") return data } @@ -289,7 +289,7 @@ const getJdhByDb = async () => { * 获取代表可以操作的开启的教代会 * @returns {Promise<*>} */ -const getOpenJdhByDb = async () => { +var getOpenJdhByDb = async () => { const {data} = await $.get("/platform/proposal/common/getOpenMeeting") return data } @@ -298,7 +298,7 @@ const getOpenJdhByDb = async () => { * 获取教代会工作资料类型 * @returns {Promise<*>} */ -const getGzzllx = async () => { +var getGzzllx = async () => { const {data} = await $.get("/platform/jdh/Common/getGzzllx") return data } @@ -307,16 +307,16 @@ const getGzzllx = async () => { * 获取疗休养活动 * @returns {Promise<*>} */ -const getLxyHd = async () => { +var getLxyHd = async () => { const {data} = await $.get("/platform/zgfw/lxy/common/getHdList") return data } -const getlxyHdCd = async () => { +var getlxyHdCd = async () => { const {data} = await $.get("/platform/zgfw/lxy/common/getlxyHdCd") return data } -const getNowLxyHd = async () => { +var getNowLxyHd = async () => { const {data} = await $.get("/platform/zgfw/lxy/common/getNowHdList") return data } @@ -325,11 +325,11 @@ const getNowLxyHd = async () => { * 获取基层工会 * @returns {Promise<*>} */ -const getUnionList = async (unionId) => { +var getUnionList = async (unionId) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/unionList", {unionId}) return data } -const threeUnitsByUnionGroupOrUnitId = async (unitId, groupId) => { +var threeUnitsByUnionGroupOrUnitId = async (unitId, groupId) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/threeUnitsByUnionGroupOrUnitId", { unitId, groupId @@ -337,7 +337,7 @@ const threeUnitsByUnionGroupOrUnitId = async (unitId, groupId) => { return data } -const unionGroupsByUnionId = async (unionId) => { +var unionGroupsByUnionId = async (unionId) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/unionGroupsByUnionId", {unionId}) return data } @@ -346,7 +346,7 @@ const unionGroupsByUnionId = async (unionId) => { * 获取活动人员范围 * @returns {Promise<*>} */ -const getActivityGroup = async () => { +var getActivityGroup = async () => { const {data} = await $.get('/platform/activity/basic/scope/getActivityUserScopeGroup') return data } @@ -354,7 +354,7 @@ const getActivityGroup = async () => { * 查看该人员是否在活动范围中 * @returns {Promise<*>} */ -const getScopeUser = async (activityGroupId) => { +var getScopeUser = async (activityGroupId) => { const {data} = await $.get('/platform/activity/basic/scope/getScopeUser', {activityGroupId}) return data } @@ -364,18 +364,18 @@ const getScopeUser = async (activityGroupId) => { * @param id * @returns {Promise<*>} */ -const getActivityTwoLevelType = async (code) => { +var getActivityTwoLevelType = async (code) => { const {data} = await $.get("/platform/activity/basic/basic/settings/getActivityTwoLevelType", {code}) return data } //获取二级教代会(双代会)工作资料类型 -const getJdh2Gzzllx = async () => { +var getJdh2Gzzllx = async () => { const {data} = await $.get("/platform/jdh/Common/getJdh2Gzzllx") return data } -const getLocationVariable = (variable) => { +var getLocationVariable = (variable) => { var query = window.location.search.substring(1); var vars = query.split("&"); for (let i = 0; i < vars.length; i++) { @@ -387,7 +387,7 @@ const getLocationVariable = (variable) => { return ''; } -const getConfigKey = async (key) => { +var getConfigKey = async (key) => { const {data} = await $.get('/platform/inclusiveTherapyV3/common/getValue', {key}) return data } @@ -396,7 +396,7 @@ const getConfigKey = async (key) => { * 根据多个工会获取单位 * @returns {Promise<*>} */ -const getUnitByUnions = async (unionId = null) => { +var getUnitByUnions = async (unionId = null) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getUnitsByUnions", {unionId}) return data } @@ -407,7 +407,7 @@ const getUnitByUnions = async (unionId = null) => { * @param groupId * @returns {Promise<*>} */ -const getThreeUnitsByUnionGroupsOrUnitIds = async (unitId, groupId) => { +var getThreeUnitsByUnionGroupsOrUnitIds = async (unitId, groupId) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getThreeUnitsByUnionGroupsOrUnitIds", { unitId, groupId @@ -420,7 +420,7 @@ const getThreeUnitsByUnionGroupsOrUnitIds = async (unitId, groupId) => { * @param unionId * @returns {Promise<*>} */ -const getUnionGroupsByUnions = async (unionId) => { +var getUnionGroupsByUnions = async (unionId) => { const {data} = await $.get("/platform/inclusiveTherapyV3/common/getUnionGroupsByUnions", {unionId}) return data } diff --git a/src/main/resources/static/components/staffbenefit/therapyRecuperation/Enrollinfo.vue b/src/main/resources/static/components/staffbenefit/therapyRecuperation/Enrollinfo.vue index 0116398..8176192 100644 --- a/src/main/resources/static/components/staffbenefit/therapyRecuperation/Enrollinfo.vue +++ b/src/main/resources/static/components/staffbenefit/therapyRecuperation/Enrollinfo.vue @@ -68,7 +68,23 @@