diff --git a/README.md b/README.md index 2010a87..4e8520b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -JeecgBoot 企业级低代码开发平台 +JeecgBoot 机构级低代码开发平台 =============== 当前最新版本: 3.7.2(发布时间:2024-12-12) diff --git a/src/components/OrgCard/OrgCardCom.vue b/src/components/OrgCard/OrgCardCom.vue index 1dd9de7..9bec75d 100644 --- a/src/components/OrgCard/OrgCardCom.vue +++ b/src/components/OrgCard/OrgCardCom.vue @@ -24,7 +24,7 @@ style="color: #909399; font-size: 12px; font-weight: bold; white-space: nowrap;"> 标准标签库 --> -
机构编码:{{ orgInfo.orgCode }} +
机构编码:{{ orgInfo.orgCode }}
@@ -48,11 +48,11 @@ 查看详情 + @click.stop="handleDetail">机构详情 护理单元 + @click.stop="handleHldy">区域信息 查看详情 + @click.stop="handleInfo">机构详情 diff --git a/src/components/jeecg/thirdApp/JThirdAppDropdown.vue b/src/components/jeecg/thirdApp/JThirdAppDropdown.vue index bb4230c..676c4f4 100644 --- a/src/components/jeecg/thirdApp/JThirdAppDropdown.vue +++ b/src/components/jeecg/thirdApp/JThirdAppDropdown.vue @@ -28,7 +28,7 @@ const emit = defineEmits(['to-app', 'to-local']); const getSyncToLocal = computed(() => { - // 由于企业微信接口变更,将不再支持同步到本地 + // 由于机构微信接口变更,将不再支持同步到本地 if (props.type === 'wechatEnterprise') { return false; } diff --git a/src/components/jeecg/thirdApp/jThirdApp.api.ts b/src/components/jeecg/thirdApp/jThirdApp.api.ts index a3dfc04..c0504fd 100644 --- a/src/components/jeecg/thirdApp/jThirdApp.api.ts +++ b/src/components/jeecg/thirdApp/jThirdApp.api.ts @@ -4,7 +4,7 @@ import { cloneObject } from '/@/utils/index'; export const backEndUrl = { // 获取启用的第三方App getEnabledType: '/sys/thirdApp/getEnabledType', - // 企业微信 + // 机构微信 wechatEnterprise: { user: '/sys/thirdApp/sync/wechatEnterprise/user', depart: '/sys/thirdApp/sync/wechatEnterprise/depart', diff --git a/src/hooks/system/useThirdLogin.ts b/src/hooks/system/useThirdLogin.ts index 5c2ba1b..1d5ca3d 100644 --- a/src/hooks/system/useThirdLogin.ts +++ b/src/hooks/system/useThirdLogin.ts @@ -68,15 +68,15 @@ export function useThirdLogin() { } else { createMessage.warning('不识别的信息传递'); } - // update-begin--author:liaozhiyang---date:20240717---for:【TV360X-1827】mac系统谷歌浏览器企业微信第三方登录成功后没有弹出绑定手机弹窗 + // update-begin--author:liaozhiyang---date:20240717---for:【TV360X-1827】mac系统谷歌浏览器机构微信第三方登录成功后没有弹出绑定手机弹窗 if (openWin?.closed) { window.removeEventListener('message', receiveMessage, false); } - // update-end--author:liaozhiyang---date:20240717---for:【TV360X-1827】mac系统谷歌浏览器企业微信第三方登录成功后没有弹出绑定手机弹窗 + // update-end--author:liaozhiyang---date:20240717---for:【TV360X-1827】mac系统谷歌浏览器机构微信第三方登录成功后没有弹出绑定手机弹窗 }; - // update-begin--author:liaozhiyang---date:20240717---for:【TV360X-1827】mac系统谷歌浏览器企业微信第三方登录成功后没有弹出绑定手机弹窗 + // update-begin--author:liaozhiyang---date:20240717---for:【TV360X-1827】mac系统谷歌浏览器机构微信第三方登录成功后没有弹出绑定手机弹窗 window.removeEventListener('message', receiveMessage, false); - // update-end--author:liaozhiyang---date:20240717---for:【TV360X-1827】mac系统谷歌浏览器企业微信第三方登录成功后没有弹出绑定手机弹窗 + // update-end--author:liaozhiyang---date:20240717---for:【TV360X-1827】mac系统谷歌浏览器机构微信第三方登录成功后没有弹出绑定手机弹窗 window.addEventListener('message', receiveMessage, false); } // 根据token执行登录 diff --git a/src/locales/lang/zh-CN/sys.ts b/src/locales/lang/zh-CN/sys.ts index b0c1dc6..1e13aae 100644 --- a/src/locales/lang/zh-CN/sys.ts +++ b/src/locales/lang/zh-CN/sys.ts @@ -68,7 +68,7 @@ export default { forgetFormTitle: '重置密码', signInTitle: 'Jeecg Boot', - signInDesc: '是中国最具影响力的 企业级低代码平台!在线开发,可视化拖拽设计,零代码实现80%的基础功能~', + signInDesc: '是中国最具影响力的 机构级低代码平台!在线开发,可视化拖拽设计,零代码实现80%的基础功能~', policy: '我同意敲敲云隐私政策', scanSign: `扫码后,即可完成登录`, scanSuccess: `扫码成功,登录中`, diff --git a/src/router/guard/permissionGuard.ts b/src/router/guard/permissionGuard.ts index bfd532b..3e9dbf1 100644 --- a/src/router/guard/permissionGuard.ts +++ b/src/router/guard/permissionGuard.ts @@ -79,12 +79,12 @@ export function createPermissionGuard(router: Router) { } else if (to.path === LOGIN_PATH && isOAuth2AppEnv() && !token) { //退出登录进入此逻辑 //如果进入的页面是login页面并且当前是OAuth2app环境,并且token为空,就进入OAuth2登录页面 - //update-begin---author:wangshuai ---date:20230224 for:[QQYUN-3440]新建企业微信和钉钉配置表,通过租户模式隔离------------ + //update-begin---author:wangshuai ---date:20230224 for:[QQYUN-3440]新建机构微信和钉钉配置表,通过租户模式隔离------------ if(to.query.tenantId){ setAuthCache(OAUTH2_THIRD_LOGIN_TENANT_ID,to.query.tenantId) } next({ path: OAUTH2_LOGIN_PAGE_PATH }); - //update-end---author:wangshuai ---date:20230224 for:[QQYUN-3440]新建企业微信和钉钉配置表,通过租户模式隔离------------ + //update-end---author:wangshuai ---date:20230224 for:[QQYUN-3440]新建机构微信和钉钉配置表,通过租户模式隔离------------ return; //update-end---author:wangshuai ---date:20220629 for:[issues/I5BG1I]vue3不支持auth2登录------------ } @@ -111,11 +111,11 @@ export function createPermissionGuard(router: Router) { next(); } } else { - //update-begin---author:wangshuai ---date:20230302 for:只有首次登陆并且是企业微信或者钉钉的情况下才会调用------------ - //----------【首次登陆并且是企业微信或者钉钉的情况下才会调用】----------------------------------------------- - //只有首次登陆并且是企业微信或者钉钉的情况下才会调用 + //update-begin---author:wangshuai ---date:20230302 for:只有首次登陆并且是机构微信或者钉钉的情况下才会调用------------ + //----------【首次登陆并且是机构微信或者钉钉的情况下才会调用】----------------------------------------------- + //只有首次登陆并且是机构微信或者钉钉的情况下才会调用 let href = window.location.href; - //判断当前是auth2页面,并且是钉钉/企业微信,并且包含tenantId参数 + //判断当前是auth2页面,并且是钉钉/机构微信,并且包含tenantId参数 if(isOAuth2AppEnv() && href.indexOf("/tenantId/")!= -1){ let params = to.params; if(params && params.path && params.path.length>0){ @@ -123,8 +123,8 @@ export function createPermissionGuard(router: Router) { setAuthCache(OAUTH2_THIRD_LOGIN_TENANT_ID,params.path[params.path.length-1]) } } - //---------【首次登陆并且是企业微信或者钉钉的情况下才会调用】------------------------------------------------ - //update-end---author:wangshuai ---date:20230302 for:只有首次登陆并且是企业微信或者钉钉的情况下才会调用------------ + //---------【首次登陆并且是机构微信或者钉钉的情况下才会调用】------------------------------------------------ + //update-end---author:wangshuai ---date:20230302 for:只有首次登陆并且是机构微信或者钉钉的情况下才会调用------------ // 如果当前是在OAuth2APP环境,就跳转到OAuth2登录页面,否则跳转到登录页面 path = isOAuth2AppEnv() ? OAUTH2_LOGIN_PAGE_PATH : LOGIN_PATH; } @@ -160,7 +160,7 @@ export function createPermissionGuard(router: Router) { return; } - //==============================【首次登录并且是企业微信或者钉钉的情况下才会调用】================== + //==============================【首次登录并且是机构微信或者钉钉的情况下才会调用】================== //判断是免登录页面,如果页面包含/tenantId/,那么就直接前往主页 if(isOAuth2AppEnv() && to.path.indexOf("/tenantId/") != -1){ //update-begin---author:wangshuai---date:2024-11-08---for:【TV360X-2958】钉钉登录后打开了敲敲云,换其他账号登录后,再打开敲敲云显示的是原来账号的应用--- @@ -172,7 +172,7 @@ export function createPermissionGuard(router: Router) { //update-end---author:wangshuai---date:2024-11-08---for:【TV360X-2958】钉钉登录后打开了敲敲云,换其他账号登录后,再打开敲敲云显示的是原来账号的应用--- return; } - //==============================【首次登录并且是企业微信或者钉钉的情况下才会调用】================== + //==============================【首次登录并且是机构微信或者钉钉的情况下才会调用】================== // update-begin--author:liaozhiyang---date:202401127---for:【issues/7500】vue-router4.5.0版本路由name:PageNotFound同名导致登录进不去 // Jump to the 404 page after processing the login if (from.path === LOGIN_PATH && to.name === PAGE_NOT_FOUND_NAME_404 && to.fullPath !== (userStore.getUserInfo.homePath || PageEnum.BASE_HOME)) { diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 08044c8..2cde650 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -328,7 +328,7 @@ export const useUserStore = defineStore({ if (openSso == 'true') { await useSso().ssoLoginOut(); } - //update-begin---author:wangshuai ---date:20230224 for:[QQYUN-3440]新建企业微信和钉钉配置表,通过租户模式隔离------------ + //update-begin---author:wangshuai ---date:20230224 for:[QQYUN-3440]新建机构微信和钉钉配置表,通过租户模式隔离------------ //退出登录的时候需要用的应用id if(isOAuth2AppEnv()){ let tenantId = getAuthCache(OAUTH2_THIRD_LOGIN_TENANT_ID); @@ -346,7 +346,7 @@ export const useUserStore = defineStore({ // update-end-author:sunjianlei date:20230306 for: 修复登录成功后,没有正确重定向的问题 } - //update-end---author:wangshuai ---date:20230224 for:[QQYUN-3440]新建企业微信和钉钉配置表,通过租户模式隔离------------ + //update-end---author:wangshuai ---date:20230224 for:[QQYUN-3440]新建机构微信和钉钉配置表,通过租户模式隔离------------ }, /** * 登录事件 diff --git a/src/views/admin/IssueInfo/components/IssueInfoDetailForm.vue b/src/views/admin/IssueInfo/components/IssueInfoDetailForm.vue index 036f2fc..0c99b7b 100644 --- a/src/views/admin/IssueInfo/components/IssueInfoDetailForm.vue +++ b/src/views/admin/IssueInfo/components/IssueInfoDetailForm.vue @@ -7,11 +7,13 @@

- 发版类型: - {{ formData.issueType_dictText }} + 机构名称: + {{ formData.orgName }}

- 发版日期: + 发版类型: + {{ formData.issueType_dictText }} + 发版日期: {{ formData.createTime }}

@@ -48,6 +50,7 @@ const formData = reactive>({ id: '', createTime:'', issueType: '', + orgName:'', issueType_dictText: '', content: '', }); diff --git a/src/views/admin/IssueInfo/components/IssueInfoDetailModal.vue b/src/views/admin/IssueInfo/components/IssueInfoDetailModal.vue index a4536a4..cf1e57a 100644 --- a/src/views/admin/IssueInfo/components/IssueInfoDetailModal.vue +++ b/src/views/admin/IssueInfo/components/IssueInfoDetailModal.vue @@ -15,7 +15,7 @@ import JModal from '/@/components/Modal/src/JModal/JModal.vue'; const title = ref(''); - const width = ref('80%'); + const width = ref('1000'); const visible = ref(false); const disableSubmit = ref(false); const registerForm = ref(); diff --git a/src/views/admin/orgInfo/OrgInfoList.vue b/src/views/admin/orgInfo/OrgInfoList.vue index 2c0b2bc..421fe58 100644 --- a/src/views/admin/orgInfo/OrgInfoList.vue +++ b/src/views/admin/orgInfo/OrgInfoList.vue @@ -7,7 +7,7 @@ - + diff --git a/src/views/admin/orgInfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgInfo/components/OrgApplyInfoForm.vue index 8a00f81..847fe7a 100644 --- a/src/views/admin/orgInfo/components/OrgApplyInfoForm.vue +++ b/src/views/admin/orgInfo/components/OrgApplyInfoForm.vue @@ -6,13 +6,13 @@ name="OrgApplyInfoForm"> - - - + + + - @@ -27,15 +27,15 @@ - - + + - - @@ -53,6 +53,9 @@ + + + @@ -105,12 +108,12 @@ - + - @@ -138,7 +141,9 @@ + value-format="YYYY-MM-DD" style="width: 100%" suffix-icon="" /> + @@ -161,7 +166,7 @@ - @@ -170,7 +175,7 @@ + value-format="YYYY-MM-DD" style="width: 100%" suffix-icon="" /> @@ -178,9 +183,9 @@ + :value="'长期'" suffix-icon="" > + suffix-icon="" /> diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfoListBK.vue b/src/views/admin/orgapplyinfo/OrgApplyInfoListBK.vue index a85b687..d9ce7aa 100644 --- a/src/views/admin/orgapplyinfo/OrgApplyInfoListBK.vue +++ b/src/views/admin/orgapplyinfo/OrgApplyInfoListBK.vue @@ -7,7 +7,7 @@ - + @@ -62,11 +62,11 @@ - + -
+

账号初始化成功!

{{ zhcshMessage }}

diff --git a/src/views/admin/orgapplyinfo/OrgInfoAuditList.vue b/src/views/admin/orgapplyinfo/OrgInfoAuditList.vue index e859a41..676b555 100644 --- a/src/views/admin/orgapplyinfo/OrgInfoAuditList.vue +++ b/src/views/admin/orgapplyinfo/OrgInfoAuditList.vue @@ -7,7 +7,7 @@ - + @@ -63,11 +63,11 @@ - + -
+

账号初始化成功!

{{ zhcshMessage }}

@@ -233,6 +233,7 @@ function handleBuildPlat(record) { * @param record */ function handleInitAccount(record) { + var userInfo = { userName: record.tel, realname: record.name, orgCode: record.id, orgId: record.pkId } console.log("🚀 ~ handleInitAccount ~ userInfo:", userInfo) defHttp.post({ url: '/sys/user/initialization', params: userInfo }).then(res => { diff --git a/src/views/admin/orgapplyinfo/OrgModifyInfo.data.ts b/src/views/admin/orgapplyinfo/OrgModifyInfo.data.ts index d3d88b4..48c971c 100644 --- a/src/views/admin/orgapplyinfo/OrgModifyInfo.data.ts +++ b/src/views/admin/orgapplyinfo/OrgModifyInfo.data.ts @@ -6,7 +6,7 @@ import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '企业名称', + title: '机构名称', align: 'center', dataIndex: 'comName', }, @@ -78,13 +78,13 @@ export const applyObj = { issuingAuthority: '签发机关', startTime: '有效开始日期', endTime: '有效结束日期', - cardZmPath: '身份证正面照片', - cardFmPath: '身份证反面照片', - comBusinessLicense: '营业执照照片', - comName: '企业名称', - comRegisterAddress: '企业注册地址', - comCreditCode: '企业信用代码', - comLegalPerson: '企业法人', + cardZmPath: '人像面', + cardFmPath: '国徽面', + comBusinessLicense: '营业执照', + comName: '机构名称', + comRegisterAddress: '机构注册地址', + comCreditCode: '机构信用代码', + comLegalPerson: '机构法人', orgAddress: '机构地址', orgLeader: '机构负责人', orgLeaderPhone: '机构负责人电话', diff --git a/src/views/admin/orgapplyinfo/OrgModifyInfoListBK.vue b/src/views/admin/orgapplyinfo/OrgModifyInfoListBK.vue index ac5d609..562c12c 100644 --- a/src/views/admin/orgapplyinfo/OrgModifyInfoListBK.vue +++ b/src/views/admin/orgapplyinfo/OrgModifyInfoListBK.vue @@ -7,7 +7,7 @@ - + diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue index 6041b74..a274565 100644 --- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue +++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue @@ -27,15 +27,15 @@ - - + + - - @@ -111,7 +111,7 @@ - @@ -162,7 +162,7 @@ - diff --git a/src/views/admin/orgapplyinfo/components/OrgModifyInfoForm.vue b/src/views/admin/orgapplyinfo/components/OrgModifyInfoForm.vue index 767098a..2d2f20a 100644 --- a/src/views/admin/orgapplyinfo/components/OrgModifyInfoForm.vue +++ b/src/views/admin/orgapplyinfo/components/OrgModifyInfoForm.vue @@ -110,19 +110,19 @@ - - - + - - + + - - - - + - - + diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts index 6ccadd4..2a81dba 100644 --- a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts +++ b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts @@ -137,8 +137,8 @@ export const superQuerySchema = { issuingAuthority: {title: '签发机关',order: 10,view: 'text', type: 'string',}, startTime: {title: '有效开始日期',order: 11,view: 'date', type: 'string',}, endTime: {title: '有效结束日期',order: 12,view: 'date', type: 'string',}, - cardZmPath: {title: '身份证正面',order: 13,view: 'image', type: 'string',}, - cardFmPath: {title: '身份证反面',order: 14,view: 'image', type: 'string',}, + cardZmPath: {title: '人像面',order: 13,view: 'image', type: 'string',}, + cardFmPath: {title: '国徽面',order: 14,view: 'image', type: 'string',}, maritalStatus: {title: '婚否',order: 15,view: 'text', type: 'string',}, height: {title: '身高',order: 16,view: 'text', type: 'string',}, weight: {title: '体重',order: 17,view: 'text', type: 'string',}, diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue b/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue index 13116eb..c31789c 100644 --- a/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue +++ b/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue @@ -147,7 +147,7 @@ - @@ -155,7 +155,7 @@ - diff --git a/src/views/demo/page/account/center/data.tsx b/src/views/demo/page/account/center/data.tsx index e8251b3..5bfb137 100644 --- a/src/views/demo/page/account/center/data.tsx +++ b/src/views/demo/page/account/center/data.tsx @@ -90,7 +90,7 @@ export const articleList = (() => { result.push({ title: 'Jeecg Admin', description: ['Jeecg', '设计语言', 'Typescript'], - content: '基于Vue Next, TypeScript, Ant Design实现的一套完整的企业级后台管理系统。', + content: '基于Vue Next, TypeScript, Ant Design实现的一套完整的机构级后台管理系统。', time: '2020-11-14 11:20', }); } @@ -117,7 +117,7 @@ export const projectList = (() => { for (let i = 0; i < 8; i++) { result.push({ title: 'Jeecg Admin', - content: '基于Vue Next, TypeScript, Ant Design实现的一套完整的企业级后台管理系统。', + content: '基于Vue Next, TypeScript, Ant Design实现的一套完整的机构级后台管理系统。', }); } return result; diff --git a/src/views/demo/page/list/basic/data.tsx b/src/views/demo/page/list/basic/data.tsx index 193328d..33b571d 100644 --- a/src/views/demo/page/list/basic/data.tsx +++ b/src/views/demo/page/list/basic/data.tsx @@ -4,7 +4,7 @@ export const cardList = (() => { result.push({ id: i, title: 'Jeecg Admin', - description: '基于Vue Next, TypeScript, Ant Design Vue实现的一套完整的企业级后台管理系统', + description: '基于Vue Next, TypeScript, Ant Design Vue实现的一套完整的机构级后台管理系统', datetime: '2020-11-26 17:39', extra: '编辑', icon: 'logos:vue', diff --git a/src/views/demo/page/list/card/index.vue b/src/views/demo/page/list/card/index.vue index f868653..26ebe95 100644 --- a/src/views/demo/page/list/card/index.vue +++ b/src/views/demo/page/list/card/index.vue @@ -1,7 +1,7 @@