yangjun
/
hldy_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue 

# Conflicts:
#	src/views/admin/orgapplyinfo/OrgInfoAuditList.vue
This commit is contained in:
1378012178@qq.com 2026-02-11 16:05:44 +08:00
parent 619882ff11 d34fd16b34
commit 7e34403df5
42 changed files with 147 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
JeecgBoot 企业级低代码开发平台
JeecgBoot 机构级低代码开发平台
===============
当前最新版本： 3.7.2（发布时间：2024-12-12）

8
src/components/OrgCard/OrgCardCom.vue
View File

@ -24,7 +24,7 @@
style="color: #909399; font-size: 12px; font-weight: bold; white-space: nowrap;">
标准标签库
</span> -->
<div style="min-width: 35px;margin-top:3px;">机构编码:{{ orgInfo.orgCode }}
<div style="min-width: 35px;margin-top:3px;">机构编码：<span style="font-weight: 700;">{{ orgInfo.orgCode }}</span>
</div>
</div>
</a-col>
@ -48,11 +48,11 @@
</a-col>
<a-col :span="12" style="text-align: right;">
<a-button style="font-size: 12px;" v-show="showDetail" type="link" size="small"
@click.stop="handleDetail">查看详情</a-button>
@click.stop="handleDetail">机构详情</a-button>
<a-button style="font-size: 12px;" v-show="showHldy" type="link" size="small"
@click.stop="handleHldy">护理单元</a-button>
@click.stop="handleHldy">区域信息</a-button>
<a-button style="font-size: 12px;" v-show="showInfo" type="link" size="small"
@click.stop="handleInfo">查看详情</a-button>
@click.stop="handleInfo">机构详情</a-button>
</a-col>
</a-row>

2
src/components/jeecg/thirdApp/JThirdAppDropdown.vue
View File

@ -28,7 +28,7 @@
const emit = defineEmits(['to-app', 'to-local']);
const getSyncToLocal = computed(() => {
// 由于企业微信接口变更，将不再支持同步到本地
// 由于机构微信接口变更，将不再支持同步到本地
if (props.type === 'wechatEnterprise') {
return false;
}

2
src/components/jeecg/thirdApp/jThirdApp.api.ts
View File

@ -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',

8
src/hooks/system/useThirdLogin.ts
View File

@ -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执行登录

2
src/locales/lang/zh-CN/sys.ts
View File

@ -68,7 +68,7 @@ export default {
forgetFormTitle: '重置密码',
signInTitle: 'Jeecg Boot',
signInDesc: '是中国最具影响力的 企业级低代码平台！在线开发，可视化拖拽设计，零代码实现80%的基础功能~',
signInDesc: '是中国最具影响力的 机构级低代码平台！在线开发，可视化拖拽设计，零代码实现80%的基础功能~',
policy: '我同意敲敲云隐私政策',
scanSign: `扫码后，即可完成登录`,
scanSuccess: `扫码成功，登录中`,

20
src/router/guard/permissionGuard.ts
View File

@ -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)) {

4
src/store/modules/user.ts
View File

@ -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]新建机构微信和钉钉配置表，通过租户模式隔离------------
},
/**
* 登录事件

9
src/views/admin/IssueInfo/components/IssueInfoDetailForm.vue
View File

@ -7,11 +7,13 @@
<a-row style="padding:14px;">
<a-col :span="24" style="text-align: center;">
<p>
<span>发版类型：</span>
<span>{{ formData.issueType_dictText }}</span>
<span>机构名称：</span>
<span>{{ formData.orgName }}</span>
</p>
<p>
<span>发版日期：</span>
<span>发版类型：</span>
<span>{{ formData.issueType_dictText }}</span>
<span style="margin-left: 40px;">发版日期：</span>
<span>{{ formData.createTime }}</span>
</p>
</a-col>
@ -48,6 +50,7 @@ const formData = reactive<Record<string, any>>({
id: '',
createTime:'',
issueType: '',
orgName:'',
issueType_dictText: '',
content: '',
});

2
src/views/admin/IssueInfo/components/IssueInfoDetailModal.vue
View File

@ -15,7 +15,7 @@
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<string>('80%');
const width = ref<string>('1000');
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();

2
src/views/admin/orgInfo/OrgInfoList.vue
View File

@ -7,7 +7,7 @@
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="title">
<template #label><span title="企业信息">企业信息</span></template>
<template #label><span title="机构信息">机构信息</span></template>
<a-input placeholder="请输入机构名称/负责人/联系电话" v-model:value="queryParam.title" allow-clear></a-input>
</a-form-item>
</a-col>

35
src/views/admin/orgInfo/components/OrgApplyInfoForm.vue
View File

@ -6,13 +6,13 @@
name="OrgApplyInfoForm">
<a-row class="card-class">
<a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
<SectionDivider :title="'机构信息'" />
</a-col>
<a-col :span="12">
<a-row>
<a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
<SectionDivider :title="'营业执照'" />
</a-col>
<a-col :span="24">
<a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense"
<a-form-item label="营业执照" v-bind="validateInfos.comBusinessLicense"
id="OrgApplyInfoForm-comBusinessLicense" name="comBusinessLicense">
<JImageUpload :fileMax="1" v-model:value="formData.comBusinessLicense" :disabled="true">
</JImageUpload>
@ -27,15 +27,15 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
<a-input v-model:value="formData.comName" placeholder="请输入企业名称" disabled allow-clear></a-input>
<a-form-item label="机构名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
<a-input v-model:value="formData.comName" placeholder="请输入机构名称" disabled allow-clear></a-input>
<!-- {{ formData.comName }} -->
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="企业法人" v-bind="validateInfos.comLegalPerson" id="OrgApplyInfoForm-comLegalPerson"
<a-form-item label="机构法人" v-bind="validateInfos.comLegalPerson" id="OrgApplyInfoForm-comLegalPerson"
name="comLegalPerson">
<a-input v-model:value="formData.comLegalPerson" placeholder="请输入企业法人" disabled
<a-input v-model:value="formData.comLegalPerson" placeholder="请输入机构法人" disabled
allow-clear></a-input>
<!-- {{ formData.comLegalPerson }} -->
</a-form-item>
@ -53,6 +53,9 @@
</a-col>
<a-col :span="12">
<a-row>
<a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
<SectionDivider :title="'机构信息'" />
</a-col>
<a-col :span="24">
<a-form-item label="机构所在地" v-bind="validateInfos.cityViewValue" id="OrgApplyInfoForm-cityViewValue"
name="cityViewValue">
@ -105,12 +108,12 @@
<a-row class="card-class">
<a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
<SectionDivider :title="'申请人身份证'" />
<SectionDivider :title="'申请人'" />
</a-col>
<a-col :span="12">
<a-row>
<a-col :span="24">
<a-form-item label="身份证正面" v-bind="validateInfos.cardZmPath" id="OrgApplyInfoForm-cardZmPath"
<a-form-item label="人像面" v-bind="validateInfos.cardZmPath" id="OrgApplyInfoForm-cardZmPath"
name="cardZmPath">
<JImageUpload :fileMax="1" v-model:value="formData.cardZmPath" :disabled="true"></JImageUpload>
</a-form-item>
@ -138,7 +141,9 @@
<a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="OrgApplyInfoForm-birthDate"
name="birthDate">
<a-date-picker placeholder="请选择出生日期" v-model:value="formData.birthDate" disabled
value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
value-format="YYYY-MM-DD" style="width: 100%" suffix-icon="" />
<!-- <a-input placeholder="请选择出生日期" v-model:value="formData.birthDate" disabled
style="width: 100%"></a-input> -->
<!-- {{ formData.birthDate ? formData.birthDate.substring(0, 10) : "" }} -->
</a-form-item>
</a-col>
@ -161,7 +166,7 @@
<a-col :span="12">
<a-row>
<a-col :span="24">
<a-form-item label="身份证反面" v-bind="validateInfos.cardFmPath" id="OrgApplyInfoForm-cardFmPath"
<a-form-item label="国徽面" v-bind="validateInfos.cardFmPath" id="OrgApplyInfoForm-cardFmPath"
name="cardFmPath">
<JImageUpload :fileMax="1" v-model:value="formData.cardFmPath" :disabled="true"></JImageUpload>
</a-form-item>
@ -170,7 +175,7 @@
<a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="OrgApplyInfoForm-startTime"
name="startTime">
<a-date-picker placeholder="请选择有效开始日期" v-model:value="formData.startTime" disabled
value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
value-format="YYYY-MM-DD" style="width: 100%" suffix-icon="" />
<!-- {{ formData.startTime ? formData.startTime.substring(0, 10) : "" }} -->
</a-form-item>
</a-col>
@ -178,9 +183,9 @@
<a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="OrgApplyInfoForm-endTime"
name="endTime">
<a-input v-if="formData.endTime == '9999-12-31' || formData.endTime == '9999-12-31 00:00:00'"
:value="'长期'" allow-clear></a-input>
:value="'长期'" suffix-icon="" ></a-input>
<a-date-picker v-else v-model:value="formData.endTime" value-format="YYYY-MM-DD" style="width: 100%"
allow-clear />
suffix-icon="" />
<!-- {{ formData.endTime
? (formData.endTime.substring(0, 10) == '9999-12-31' ? '长期' : formData.endTime.substring(0, 10))
: "" }} -->

6
src/views/admin/orgapplyinfo/OrgApplyInfoListBK.vue
View File

@ -7,7 +7,7 @@
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="title">
<template #label><span title="企业信息">企业信息</span></template>
<template #label><span title="机构信息">机构信息</span></template>
<JInput v-model:value="queryParam.title" placeholder="请输入机构名称/负责人/联系电话" :type="'default'" />
</a-form-item>
</a-col>
@ -62,11 +62,11 @@
<!-- 表单区域 -->
<OrgApplyInfoModal ref="registerModal" @success="handleSuccess"></OrgApplyInfoModal>
<a-modal v-model:visible="zhcshVisible" title="账号初始化">
<a-modal v-model:visible="zhcshVisible" title="账号初始化" style="overflow: hidden;">
<template #footer> <!-- 自定义底部内容 -->
<a-button @click="handleCshCancel">关闭</a-button>
</template>
<div style="height: 100px;text-align: center;">
<div style="height: 180px;text-align: center;overflow: hidden;">
<p style="margin-top:50px;">账号初始化成功！</p>
<p>{{ zhcshMessage }}</p>
</div>

7
src/views/admin/orgapplyinfo/OrgInfoAuditList.vue
View File

@ -7,7 +7,7 @@
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="title">
<template #label><span title="企业信息">企业信息</span></template>
<template #label><span title="机构信息">机构信息</span></template>
<JInput v-model:value="queryParam.title" placeholder="请输入机构名称/负责人/联系电话" :type="'default'" />
</a-form-item>
</a-col>
@ -63,11 +63,11 @@
<!-- 信息变更表单 -->
<OrgModifyInfoModal ref="updateAuditModal" @success="handleSuccess"></OrgModifyInfoModal>
<a-modal v-model:visible="zhcshVisible" title="账号初始化">
<a-modal v-model:visible="zhcshVisible" title="账号初始化" style="overflow: hidden;">
<template #footer> <!-- 自定义底部内容 -->
<a-button @click="handleCshCancel">关闭</a-button>
</template>
<div style="height: 100px;text-align: center;">
<div style="height: 180px;text-align: center;overflow: hidden;">
<p style="margin-top:50px;">账号初始化成功！</p>
<p>{{ zhcshMessage }}</p>
</div>
@ -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 => {

16
src/views/admin/orgapplyinfo/OrgModifyInfo.data.ts
View File

@ -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: '机构负责人电话',

2
src/views/admin/orgapplyinfo/OrgModifyInfoListBK.vue
View File

@ -7,7 +7,7 @@
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="title">
<template #label><span title="企业信息">企业信息</span></template>
<template #label><span title="机构信息">机构信息</span></template>
<JInput v-model:value="queryParam.title" placeholder="请输入机构名称/负责人/联系电话" :type="'default'" />
</a-form-item>
</a-col>

12
src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
View File

@ -27,15 +27,15 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
<a-input v-model:value="formData.comName" placeholder="请输入企业名称" disabled allow-clear></a-input>
<a-form-item label="机构名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
<a-input v-model:value="formData.comName" placeholder="请输入机构名称" disabled allow-clear></a-input>
<!-- {{ formData.comName }} -->
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="企业法人" v-bind="validateInfos.comLegalPerson" id="OrgApplyInfoForm-comLegalPerson"
<a-form-item label="机构法人" v-bind="validateInfos.comLegalPerson" id="OrgApplyInfoForm-comLegalPerson"
name="comLegalPerson">
<a-input v-model:value="formData.comLegalPerson" placeholder="请输入企业法人" disabled
<a-input v-model:value="formData.comLegalPerson" placeholder="请输入机构法人" disabled
allow-clear></a-input>
<!-- {{ formData.comLegalPerson }} -->
</a-form-item>
@ -111,7 +111,7 @@
<a-col :span="12">
<a-row>
<a-col :span="24">
<a-form-item label="身份证正面" v-bind="validateInfos.cardZmPath" id="OrgApplyInfoForm-cardZmPath"
<a-form-item label="人像面" v-bind="validateInfos.cardZmPath" id="OrgApplyInfoForm-cardZmPath"
name="cardZmPath">
<JImageUpload :fileMax="1" v-model:value="formData.cardZmPath" :disabled="true"></JImageUpload>
</a-form-item>
@ -162,7 +162,7 @@
<a-col :span="12">
<a-row>
<a-col :span="24">
<a-form-item label="身份证反面" v-bind="validateInfos.cardFmPath" id="OrgApplyInfoForm-cardFmPath"
<a-form-item label="国徽面" v-bind="validateInfos.cardFmPath" id="OrgApplyInfoForm-cardFmPath"
name="cardFmPath">
<JImageUpload :fileMax="1" v-model:value="formData.cardFmPath" :disabled="true"></JImageUpload>
</a-form-item>

22
src/views/admin/orgapplyinfo/components/OrgModifyInfoForm.vue
View File

@ -110,19 +110,19 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证正面" v-bind="validateInfos.cardZmPath" id="OrgModifyInfoForm-cardZmPath"
<a-form-item label="人像面" v-bind="validateInfos.cardZmPath" id="OrgModifyInfoForm-cardZmPath"
name="cardZmPath">
<JImageUpload :fileMax="1" v-model:value="formData.cardZmPath"></JImageUpload>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证反面" v-bind="validateInfos.cardFmPath" id="OrgModifyInfoForm-cardFmPath"
<a-form-item label="国徽面" v-bind="validateInfos.cardFmPath" id="OrgModifyInfoForm-cardFmPath"
name="cardFmPath">
<JImageUpload :fileMax="1" v-model:value="formData.cardFmPath"></JImageUpload>
</a-form-item>
</a-col>
<a-col :span="24">
<SectionDivider :title="'企业资质'" />
<SectionDivider :title="'机构资质'" />
</a-col>
<a-col :span="12">
<a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense"
@ -131,27 +131,27 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgModifyInfoForm-comName" name="comName">
<a-input v-model:value="formData.comName" placeholder="请输入企业名称" allow-clear></a-input>
<a-form-item label="机构名称" v-bind="validateInfos.comName" id="OrgModifyInfoForm-comName" name="comName">
<a-input v-model:value="formData.comName" placeholder="请输入机构名称" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="企业注册地址" v-bind="validateInfos.comRegisterAddress"
<a-form-item label="机构注册地址" v-bind="validateInfos.comRegisterAddress"
id="OrgModifyInfoForm-comRegisterAddress" name="comRegisterAddress">
<a-textarea v-model:value="formData.comRegisterAddress" placeholder="请输入企业注册地址"
<a-textarea v-model:value="formData.comRegisterAddress" placeholder="请输入机构注册地址"
allow-clear></a-textarea>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="企业信用代码" v-bind="validateInfos.comCreditCode" id="OrgModifyInfoForm-comCreditCode"
<a-form-item label="机构信用代码" v-bind="validateInfos.comCreditCode" id="OrgModifyInfoForm-comCreditCode"
name="comCreditCode">
<a-input v-model:value="formData.comCreditCode" placeholder="请输入企业信用代码" allow-clear></a-input>
<a-input v-model:value="formData.comCreditCode" placeholder="请输入机构信用代码" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="企业法人" v-bind="validateInfos.comLegalPerson" id="OrgModifyInfoForm-comLegalPerson"
<a-form-item label="机构法人" v-bind="validateInfos.comLegalPerson" id="OrgModifyInfoForm-comLegalPerson"
name="comLegalPerson">
<a-input v-model:value="formData.comLegalPerson" placeholder="请输入企业法人" allow-clear></a-input>
<a-input v-model:value="formData.comLegalPerson" placeholder="请输入机构法人" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">

4
src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts
View File

@ -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',},

4
src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue
View File

@ -147,7 +147,7 @@
<a-tab-pane key="1" tab="身份证">
<a-row>
<a-col :span="12">
<a-form-item label="身份证正面" v-bind="validateInfos.idCardPositive"
<a-form-item label="人像面" v-bind="validateInfos.idCardPositive"
id="BizEmployeesInfoForm-idCardPositive" name="idCardPositive">
<j-image-upload v-if="!!formData.cardZmPath" :fileMax="1" :bizPath="`employeesZzxx`"
v-model:value="formData.cardZmPath" disabled></j-image-upload>
@ -155,7 +155,7 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证反面" v-bind="validateInfos.idCardNegative"
<a-form-item label="国徽面" v-bind="validateInfos.idCardNegative"
id="BizEmployeesInfoForm-idCardNegative" name="idCardNegative">
<j-image-upload v-if="!!formData.cardFmPath" :fileMax="1" :bizPath="`employeesZzxx`"
v-model:value="formData.cardFmPath" disabled></j-image-upload>

4
src/views/demo/page/account/center/data.tsx
View File

@ -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;

2
src/views/demo/page/list/basic/data.tsx
View File

@ -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',

4
src/views/demo/page/list/card/index.vue
View File

@ -1,7 +1,7 @@
<template>
<PageWrapper :class="prefixCls" title="卡片列表">
<template #headerContent>
基于Vue Next, TypeScript, Ant Design Vue实现的一套完整的企业级后台管理系统。
基于Vue Next, TypeScript, Ant Design Vue实现的一套完整的机构级后台管理系统。
<div :class="`${prefixCls}__link`">
<a><Icon icon="bx:bx-paper-plane" color="#1890ff" /><span>开始</span></a>
<a><Icon icon="carbon:warning" color="#1890ff" /><span>简介</span></a>
@ -20,7 +20,7 @@
<Icon class="icon" v-if="item.icon" :icon="item.icon" :color="item.color" />
{{ item.title }}
</div>
<div :class="`${prefixCls}__card-detail`"> 基于Vue Next, TypeScript, Ant Design Vue实现的一套完整的企业级后台管理系统 </div>
<div :class="`${prefixCls}__card-detail`"> 基于Vue Next, TypeScript, Ant Design Vue实现的一套完整的机构级后台管理系统 </div>
</a-card>
</a-list-item>
</a-col>

2
src/views/demo/page/list/search/data.tsx
View File

@ -7,7 +7,7 @@ export const searchList = (() => {
id: i,
title: 'Jeecg Admin',
description: ['Jeecg', '设计语言', 'Typescript'],
content: '基于Vue Next, TypeScript, Ant Design实现的一套完整的企业级后台管理系统。',
content: '基于Vue Next, TypeScript, Ant Design实现的一套完整的机构级后台管理系统。',
time: '2020-11-14 11:20',
});
}

10
src/views/services/directivebk/DirectiveBkItemList.vue
View File

@ -5,7 +5,7 @@
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
:wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :xl="8" :xxl="6">
<a-col :xl="8" :xxl="8">
<a-form-item name="instructionTagId">
<template #label><span title="分类标签">分类标签</span></template>
<j-dict-select-tag v-model:value="queryParam.instructionTagId" :orgCode="bkOrgCode"
@ -15,7 +15,7 @@
</a-form-item>
</a-col>
<a-col :xl="8" :xxl="6">
<a-col :xl="8" :xxl="8">
<a-form-item name="categoryId">
<template #label><span title="服务类别">服务类别</span></template>
<j-dict-select-tag type="list" v-model:value="queryParam.categoryId" :orgCode="bkOrgCode"
@ -24,7 +24,7 @@
</a-form-item>
</a-col>
<a-col :xl="8" :xxl="6">
<a-col :xl="8" :xxl="8">
<a-form-item name="typeId">
<template #label><span title="服务类型">服务类型</span></template>
<j-dict-select-tag type="list" v-model:value="queryParam.typeId" :orgCode="bkOrgCode"
@ -32,13 +32,13 @@
placeholder="请选择服务类型" allowClear :ignoreDisabled="true" />
</a-form-item>
</a-col>
<a-col :xl="8" :xxl="6">
<a-col :xl="8" :xxl="8">
<a-form-item name="directiveName">
<template #label><span title="服务指令">服务指令</span></template>
<JInput v-model:value="queryParam.directiveName" placeholder="请输入服务指令名称" allowClear />
</a-form-item>
</a-col>
<a-col :xl="8" :xxl="6">
<a-col :xl="8" :xxl="8">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>

2
src/views/services/directivebk/DirectiveBkMainList.vue
View File

@ -44,7 +44,7 @@
</template>
</BasicTable>
<!-- 详情 -->
<a-drawer v-model:visible="bkDetailListOpen" title="详情" width="85vw" :footer-style="{ textAlign: 'right' }"
<a-drawer v-model:visible="bkDetailListOpen" title="详情" width="1200" :footer-style="{ textAlign: 'right' }"
:bodyStyle="{ padding: '14px', height: '80vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
wrapClassName="org-list-modal" @cancel="handleBkDetailListClose">
<template #footer>

8
src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue
View File

@ -49,9 +49,9 @@
</a-form-item>
</a-col> -->
<a-col :span="12">
<a-form-item label="服务时长 (分钟)" v-bind="validateInfos.serviceDuration"
<a-form-item label="服务时长" v-bind="validateInfos.serviceDuration"
id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
<a-input v-model:value="formData.serviceDuration" placeholder="服务时长（分钟）" disabled></a-input>
<a-input v-model:value="formData.serviceDuration" placeholder="服务时长（分钟）" addon-after="分钟" disabled></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
@ -61,9 +61,9 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="超时时长 (分钟)" v-bind="validateInfos.timeoutDuration"
<a-form-item label="超时时长" v-bind="validateInfos.timeoutDuration"
id="ConfigServiceDirectiveForm-timeoutDuration" name="timeoutDuration">
<a-input v-model:value="formData.timeoutDuration" placeholder="超时时长（分钟）" disabled></a-input>
<a-input v-model:value="formData.timeoutDuration" placeholder="超时时长（分钟）" addon-after="分钟" disabled></a-input>
</a-form-item>
</a-col>
<a-col :span="12">

4
src/views/synchronization/directive/syncList.vue
View File

@ -7,8 +7,8 @@
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="title">
<template #label><span title="机构名称">机构名称</span></template>
<a-input placeholder="请输入机构名称" v-model:value="queryParam.title" allow-clear></a-input>
<template #label><span title="机构信息">机构信息</span></template>
<a-input placeholder="请输入机构名称/负责人/联系电话" v-model:value="queryParam.title" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">

2
src/views/sys/login/LoginForm.vue
View File

@ -77,7 +77,7 @@
<div class="flex justify-evenly enter-x" :class="`${prefixCls}-sign-in-way`">
<a @click="onThirdLogin('github')" title="github"><GithubFilled /></a>
<a @click="onThirdLogin('wechat_enterprise')" title="企业微信"> <icon-font class="item-icon" type="icon-qiyeweixin3" /></a>
<a @click="onThirdLogin('wechat_enterprise')" title="机构微信"> <icon-font class="item-icon" type="icon-qiyeweixin3" /></a>
<a @click="onThirdLogin('dingtalk')" title="钉钉"><DingtalkCircleFilled /></a>
<a @click="onThirdLogin('wechat_open')" title="微信"><WechatFilled /></a>
</div>

4
src/views/sys/login/OAuth2Login.vue
View File

@ -32,7 +32,7 @@
* 检测当前的环境
*/
function checkEnv() {
// 判断当时是否是企业微信环境
// 判断当时是否是机构微信环境
if (/wxwork/i.test(navigator.userAgent)) {
env.value.thirdApp = true;
env.value.wxWork = true;
@ -93,7 +93,7 @@
* 钉钉登录
*/
function dingdingLogin() {
//先获取钉钉的企业id，如果没有配置 还是走原来的逻辑，走原来的逻辑 需要判断存不存在token，存在token直接去首页
//先获取钉钉的机构id，如果没有配置 还是走原来的逻辑，走原来的逻辑 需要判断存不存在token，存在token直接去首页
let tenantId = getAuthCache(OAUTH2_THIRD_LOGIN_TENANT_ID) || 0;
let url = `/sys/thirdLogin/get/corpId/clientId?tenantId=${tenantId}`;
//update-begin---author:wangshuai---date:2024-12-09---for:不要使用getAction online里面的，要用defHttp---

2
src/views/sys/login/TokenLoginPage.vue
View File

@ -5,7 +5,7 @@
<div class="app-loading-dots">
<span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
</div>
<div class="app-loading-title">JeecgBoot 企业级低代码平台</div>
<div class="app-loading-title">JeecgBoot 机构级低代码平台</div>
</div>
</div>
</template>

4
src/views/sys/login/useLogin.ts
View File

@ -189,12 +189,12 @@ export function isOAuth2DingAppEnv() {
export function sysOAuth2Login(source) {
let url = `${window._CONFIG['domianURL']}/sys/thirdLogin/oauth2/${source}/login`;
url += `?state=${encodeURIComponent(window.location.origin)}`;
//update-begin---author:wangshuai ---date:20230224 for：[QQYUN-3440]新建企业微信和钉钉配置表，通过租户模式隔离------------
//update-begin---author:wangshuai ---date:20230224 for：[QQYUN-3440]新建机构微信和钉钉配置表，通过租户模式隔离------------
let tenantId = getAuthCache(OAUTH2_THIRD_LOGIN_TENANT_ID);
if(tenantId){
url += `&tenantId=${tenantId}`;
}
//update-end---author:wangshuai ---date:20230224 for：[QQYUN-3440]新建企业微信和钉钉配置表，通过租户模式隔离------------
//update-end---author:wangshuai ---date:20230224 for：[QQYUN-3440]新建机构微信和钉钉配置表，通过租户模式隔离------------
window.location.href = url;
}
//update-end---author:wangshuai ---date:20220629 for：[issues/I5BG1I]vue3不支持auth2登录------------

6
src/views/system/appconfig/ThirdApp.api.ts
View File

@ -37,7 +37,7 @@ export const syncDingTalkDepartUserToLocal = () => {
};
/**
* 获取企业微信绑定的用户信息
* 获取机构微信绑定的用户信息
* @param params
*/
export const getThirdUserByWechat = () => {
@ -45,7 +45,7 @@ export const getThirdUserByWechat = () => {
};
/**
* 同步企业微信用户部门到本地
* 同步机构微信用户部门到本地
* @param params
*/
export const wechatEnterpriseToLocal = (params) => {
@ -53,7 +53,7 @@ export const wechatEnterpriseToLocal = (params) => {
};
/**
* 获取绑定企业微信的用户
* 获取绑定机构微信的用户
* @param params
*/
export const getThirdUserBindByWechat = () => {

16
src/views/system/appconfig/ThirdAppBindWeEnterpriseModal.vue
View File

@ -1,4 +1,4 @@
<!--弹窗绑定企业微信页面-->
<!--弹窗绑定机构微信页面-->
<template>
<BasicModal @register="registerModal" :width="800" :title="title" destroyOnClose>
<a-spin :spinning="loading">
@ -8,7 +8,7 @@
<span>组织用户</span>
</a-col>
<a-col :span="12" class="padding-left">
<span>企业微信用户</span>
<span>机构微信用户</span>
</a-col>
</a-row>
<a-row :span="24">
@ -61,8 +61,8 @@
name: 'ThirdAppBindWeEnterpriseModal',
components: { BasicModal },
setup(props, { emit }) {
const title = ref<string>('企业微信绑定');
//企业微信的绑定数据
const title = ref<string>('机构微信绑定');
//机构微信的绑定数据
const bindData = ref<any>({});
const loading = ref<boolean>(false);
const btnLoading = ref<boolean>(false);
@ -97,7 +97,7 @@
/* if (userLists && userLists.length > 0) {
syncText.value = "";
} else {
syncText.value = "企业微信用户均已同步";
syncText.value = "机构微信用户均已同步";
}*/
loading.value = false;
} else {
@ -128,9 +128,9 @@
async function handleSubmit() {
btnLoading.value = true;
let userList = bindData.value.userList;
//重新封装数据，只留用户id和企业微信id即可,还需要把没绑定的用户传给后台
//重新封装数据，只留用户id和机构微信id即可,还需要把没绑定的用户传给后台
let params: any = [];
//查询用户绑定的企业微信用户
//查询用户绑定的机构微信用户
for (const item of bindData.value.jwUserDepartVos) {
if (item.wechatUserId) {
userList = userList.filter((a) => a.wechatUserId != item.wechatUserId);
@ -148,7 +148,7 @@
for (const item of userList) {
params.push({ wechatUserId: item.wechatUserId, wechatDepartId: item.wechatDepartId, wechatRealName: item.wechatRealName });
}
text = '检测到未绑定的企业微信用户 ' + userList.length + ' 位，平台将会为这 ' + userList.length + ' 位用户创建新的账号';
text = '检测到未绑定的机构微信用户 ' + userList.length + ' 位，平台将会为这 ' + userList.length + ' 位用户创建新的账号';
}
Modal.confirm({

2
src/views/system/appconfig/ThirdAppConfigList.vue
View File

@ -3,7 +3,7 @@
<div class="ding-header">
<ul class="ding-menu-tab">
<li :class="activeKey === 'ding' ? 'active' : ''" @click="dingLiClick('ding')"><a>钉钉集成</a></li>
<li :class="activeKey === 'wechat' ? 'active' : ''" @click="dingLiClick('wechat')"><a>企业微信集成</a></li>
<li :class="activeKey === 'wechat' ? 'active' : ''" @click="dingLiClick('wechat')"><a>机构微信集成</a></li>
</ul>
</div>
<div v-show="activeKey === 'ding'" class="base-collapse">

2
src/views/system/appconfig/ThirdAppConfigModal.vue
View File

@ -28,7 +28,7 @@
if (data.thirdType == 'dingtalk') {
title.value = '钉钉配置';
} else {
title.value = '企业微信配置';
title.value = '机构微信配置';
}
//重置表单
await resetFields();

2
src/views/system/appconfig/ThirdAppDingTalkConfigForm.vue
View File

@ -101,7 +101,7 @@
clientSecret: '',
});
//企业微信钉钉配置modal
//机构微信钉钉配置modal
const [registerAppConfigModal, { openModal }] = useModal();
/**

18
src/views/system/appconfig/ThirdAppWeEnterpriseConfigForm.vue
View File

@ -1,12 +1,12 @@
<template>
<div class="base-collapse">
<div class="header"> 企业微信集成 </div>
<div class="header"> 机构微信集成 </div>
<a-collapse expand-icon-position="right" :bordered="false">
<a-collapse-panel key="1">
<template #header>
<div style="font-size: 16px"> 1.获取对接信息</div>
</template>
<div class="base-desc">从企业微信平台获取对接信息，即可开始集成以及同步通讯录</div>
<div class="base-desc">从机构微信平台获取对接信息，即可开始集成以及同步通讯录</div>
<div style="margin-top: 5px">
<a href="https://help.qiaoqiaoyun.com/expand/dingding.html" target="_blank">如何获取对接信息?</a>
</div>
@ -46,8 +46,8 @@
<div class="sync-padding">
<div style="font-size: 16px; width: 100%"> 3.数据同步</div>
<div style="margin-top: 20px" class="base-desc">
从企业微信同步到敲敲云
<a style="margin-left: 10px" @click="seeBindWeChat">查看已绑定的企业微信用户</a>
从机构微信同步到敲敲云
<a style="margin-left: 10px" @click="seeBindWeChat">查看已绑定的机构微信用户</a>
<div style="float: right">
<a-button @loading="btnLoading" @click="thirdUserByWechat">同步</a-button>
</div>
@ -83,7 +83,7 @@
clientId: '',
clientSecret: '',
});
//企业微信钉钉配置modal
//机构微信钉钉配置modal
const [registerAppConfigModal, { openModal }] = useModal();
const [registerBindAppConfigModal, { openModal: openBindModal }] = useModal();
const { createMessage } = useMessage();
@ -101,7 +101,7 @@
}
/**
* 企业微信编辑
* 机构微信编辑
*/
async function weEnterpriseEditClick() {
let tenantId = getTenantId();
@ -112,7 +112,7 @@
}
/**
* 获取企业微信绑定的用户
* 获取机构微信绑定的用户
*/
async function thirdUserByWechat() {
openBindModal(true, { izBind: false });
@ -146,7 +146,7 @@
Modal.warning(options);
} else {
createMessage.warning({
content: '同步失败，请检查对接信息录入中是否填写正确，并确认是否已开启企业微信配置！',
content: '同步失败，请检查对接信息录入中是否填写正确，并确认是否已开启机构微信配置！',
duration: 5,
});
}
@ -154,7 +154,7 @@
}
/**
* 查看已绑定的企业微信
* 查看已绑定的机构微信
*/
function seeBindWeChat() {
openBindModal(true,{ izBind: true })

2
src/views/system/loginmini/MiniCodelogin.vue
View File

@ -38,7 +38,7 @@
</div>
<div class="aui-flex-box">
<div class="aui-third-login">
<a href="" title="企业微信" @click="onThirdLogin('wechat_enterprise')"><icon-font class="item-icon" type="icon-qiyeweixin3" /></a>
<a href="" title="机构微信" @click="onThirdLogin('wechat_enterprise')"><icon-font class="item-icon" type="icon-qiyeweixin3" /></a>
</div>
</div>
<div class="aui-flex-box">

4
src/views/system/loginmini/OAuth2Login.vue
View File

@ -32,7 +32,7 @@
* 检测当前的环境
*/
function checkEnv() {
// 判断当时是否是企业微信环境
// 判断当时是否是机构微信环境
if (/wxwork/i.test(navigator.userAgent)) {
env.value.thirdApp = true;
env.value.wxWork = true;
@ -93,7 +93,7 @@
* 钉钉登录
*/
function dingdingLogin() {
//先获取钉钉的企业id，如果没有配置 还是走原来的逻辑，走原来的逻辑 需要判断存不存在token，存在token直接去首页
//先获取钉钉的机构id，如果没有配置 还是走原来的逻辑，走原来的逻辑 需要判断存不存在token，存在token直接去首页
let tenantId = getAuthCache(OAUTH2_THIRD_LOGIN_TENANT_ID) || 0;
let url = `/sys/thirdLogin/get/corpId/clientId?tenantId=${tenantId}`;
//update-begin---author:wangshuai---date:2024-12-09---for:不要使用getAction online里面的，要用defHttp---

14
src/views/system/usersetting/WeChatDingSetting.vue
View File

@ -2,10 +2,10 @@
<div :class="[`${prefixCls}`]">
<div class="my-account">第三方APP</div>
<!-- <div class="account-row-item">-->
<!-- <div class="account-label gray-75">企业微信绑定</div>-->
<!-- <div class="account-label gray-75">机构微信绑定</div>-->
<!-- <span>-->
<!-- <icon-font :style="!bindEnterpriseData.sysUserId ? { color: '#9e9e9e' } : { color: '#0082EF' }" class="item-icon" type="icon-qiyeweixin3" />-->
<!-- <span class="gray-75" style="margin-left: 12px">企业微信</span>-->
<!-- <span class="gray-75" style="margin-left: 12px">机构微信</span>-->
<!-- <span class="gray-75" style="margin-left: 8px" v-if="bindEnterpriseData.realname">{{ '已绑定：' + bindEnterpriseData.realname }}</span>-->
<!-- <span class="blue-e5 pointer" style="margin-left: 24px" @click="wechatEnterpriseBind">{{-->
<!-- !bindEnterpriseData.sysUserId ? '绑定' : '解绑'-->
@ -55,7 +55,7 @@
const bindWechatData = ref<any>({});
//绑定钉钉的数据
const bindDingData = ref<any>({});
//绑定企业微信的数据
//绑定机构微信的数据
const bindEnterpriseData = ref<any>({});
const glob = useGlobSetting();
@ -72,7 +72,7 @@
const receiveMessage = ref<any>('');
/**
* 初始化钉钉和企业微信数据
* 初始化钉钉和机构微信数据
*/
async function initUserDetail() {
let values = await getThirdAccountByUserId({ thirdType: 'wechat_open,dingtalk,wechat_enterprise' });
@ -88,15 +88,15 @@
}
/**
* 企业微信绑定解绑事件
* 机构微信绑定解绑事件
*/
function wechatEnterpriseBind() {
console.log('企业微信绑定解绑事件');
console.log('机构微信绑定解绑事件');
let data = unref(bindEnterpriseData);
if (!data.sysUserId) {
onThirdLogin('wechat_enterprise');
}else{
deleteAccount({ sysUserId: data.sysUserId, id: data.id }, '企业微信');
deleteAccount({ sysUserId: data.sysUserId, id: data.id }, '机构微信');
}
}

2
src/views/utils/departUtils/DepartUtils.data.ts
View File

@ -52,7 +52,7 @@ export const superQuerySchema = {
address: {title: '地址',order: 16,view: 'text', type: 'string',},
memo: {title: '备注',order: 17,view: 'text', type: 'string',},
status: {title: '状态（1启用，0不启用）',order: 18,view: 'text', type: 'string',},
qywxIdentifier: {title: '对接企业微信的ID',order: 20,view: 'text', type: 'string',},
qywxIdentifier: {title: '对接机构微信的ID',order: 20,view: 'text', type: 'string',},
dingIdentifier: {title: '对接钉钉部门的ID',order: 21,view: 'text', type: 'string',},
tenantId: {title: '租户ID',order: 22,view: 'number', type: 'number',},
izLeaf: {title: '是否有叶子节点: 1是0否',order: 23,view: 'number', type: 'number',},