zhc077
/
hnjd_comp
forked from wangjiadong/comp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

专家管理06

Browse Source
dev
喻忠伟 5 months ago
parent b461304230
commit 2cb2898afe
11 changed files with 18683 additions and 16900 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      jeecgboot-vue3-master/index.html
  2. 35473
      jeecgboot-vue3-master/pnpm-lock.yaml
  3. 2
      jeecgboot-vue3-master/src/assets/loginmini/style/home.less
  4. 10
      jeecgboot-vue3-master/src/views/system/user/UserDrawerZJ.vue
  5. 1
      jeecgboot-vue3-master/src/views/system/user/index.vue
  6. 10
      jeecgboot-vue3-master/src/views/system/user/user.api.ts
  7. 59
      jeecgboot-vue3-master/src/views/system/user/user.data.ts
  8. 4
      jeecgboot-vue3-master/src/views/system/usersetting/BaseSetting.vue
  9. 6
      jeecgboot-vue3-master/src/views/system/usersetting/UserSetting.data.js
  10. 12
      jeecgboot-vue3-master/src/views/system/usersetting/UserSetting.data.ts
  11. 4
      jeecgboot-vue3-master/src/views/system/usersetting/UserSetting.vue

2
jeecgboot-vue3-master/index.html
Unescape View File

@ -15,7 +15,7 @@
<script> <script>
window._CONFIG = {}; window._CONFIG = {};
</script> </script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/js-base64@3.6.0/base64.min.js"></script> <script type="text/javascript" src="/resource/js/base64.min.js"></script>
</head> </head>
<body> <body>
<script> <script>

35473
jeecgboot-vue3-master/pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

2
jeecgboot-vue3-master/src/assets/loginmini/style/home.less
Unescape View File

@ -35,7 +35,7 @@
-webkit-flex-basis: 60%; -webkit-flex-basis: 60%;
background-color: #0198cd; background-color: #0198cd;
//background-image: url(../icon/jeecg_ad.png); //background-image: url(../icon/jeecg_ad.png);
background-image: url(../../../../public/resource/img/comp/comp_ad.png); background-image: url(/resource/img/comp/comp_ad.png);
background-size: cover; background-size: cover;
} }

10
jeecgboot-vue3-master/src/views/system/user/UserDrawerZJ.vue
Unescape View File

@ -14,9 +14,9 @@
<script lang="ts" setup> <script lang="ts" setup>
import { defineComponent, ref, computed, unref, useAttrs } from 'vue'; import { defineComponent, ref, computed, unref, useAttrs } from 'vue';
import { BasicForm, useForm } from '/@/components/Form/index'; import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchemaZJ } from './user.data'; import { formSchemaZJ } from './userZJ.data';
import { BasicDrawerZJ, useDrawerInner } from '/@/components/DrawerZJ'; import { BasicDrawerZJ, useDrawerInner } from '/@/components/DrawerZJ';
import { saveOrUpdateUserZJ, getUserRoles, getUserDepartList, getAllRolesListNoByTenant, getAllRolesList,queryExpertById } from './user.api'; import { saveOrUpdateUserZJ, getUserRoles, getUserDepartList, getAllRolesList,queryExpertById,getAllRolesListNoByExcludeTenant } from './userZJ.api';
import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth'; import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
import { getTenantId } from "/@/utils/auth"; import { getTenantId } from "/@/utils/auth";
@ -117,9 +117,9 @@
show: !data?.departDisabled ?? false, show: !data?.departDisabled ?? false,
//update-begin---author:wangshuai ---date:20230424 for：【issues/4844】多租户模式下，新增或编辑用户，选择角色一栏，角色选项没有做租户隔离------------ //update-begin---author:wangshuai ---date:20230424 for：【issues/4844】多租户模式下，新增或编辑用户，选择角色一栏，角色选项没有做租户隔离------------
//判断是否为多租户模式 //判断是否为多租户模式
componentProps:{ /* componentProps:{
api: data.tenantSaas?getAllRolesList:getAllRolesListNoByTenant api: data.tenantSaas?getAllRolesList:getAllRolesListNoByExcludeTenant
} }*/
//update-end---author:wangshuai ---date:20230424 for：【issues/4844】多租户模式下，新增或编辑用户，选择角色一栏，角色选项没有做租户隔离------------ //update-end---author:wangshuai ---date:20230424 for：【issues/4844】多租户模式下，新增或编辑用户，选择角色一栏，角色选项没有做租户隔离------------
}, },
//update-begin---author:wangshuai ---date:20230522 for：【issues/4935】租户用户编辑界面中租户下拉框未过滤，显示当前系统所有的租户------------ //update-begin---author:wangshuai ---date:20230522 for：【issues/4935】租户用户编辑界面中租户下拉框未过滤，显示当前系统所有的租户------------

1
jeecgboot-vue3-master/src/views/system/user/index.vue
Unescape View File

@ -9,7 +9,6 @@
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button> <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls" >导入</j-upload-button> <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls" >导入</j-upload-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXlsMb"> 导出模板</a-button> <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXlsMb"> 导出模板</a-button>
<a-button type="primary" @click="handleSyncUser" preIcon="ant-design:sync-outlined"> 同步流程</a-button>
<a-button type="primary" @click="openModal(true, {})" preIcon="ant-design:hdd-outlined"> 回收站</a-button> <a-button type="primary" @click="openModal(true, {})" preIcon="ant-design:hdd-outlined"> 回收站</a-button>
<JThirdAppButton biz-type="user" :selected-row-keys="selectedRowKeys" syncToApp syncToLocal @sync-finally="onSyncFinally" /> <JThirdAppButton biz-type="user" :selected-row-keys="selectedRowKeys" syncToApp syncToLocal @sync-finally="onSyncFinally" />
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">

10
jeecgboot-vue3-master/src/views/system/user/user.api.ts
Unescape View File

@ -23,6 +23,7 @@ enum Api {
deleteRecycleBin = '/sys/user/deleteRecycleBin', deleteRecycleBin = '/sys/user/deleteRecycleBin',
allRolesList = '/sys/role/queryall', allRolesList = '/sys/role/queryall',
allRolesListNoByTenant = '/sys/role/queryallNoByTenant', allRolesListNoByTenant = '/sys/role/queryallNoByTenant',
allRolesListExcludeByTenant = '/sys/role/queryallExcludeByTenant',
allTenantList = '/sys/tenant/queryList', allTenantList = '/sys/tenant/queryList',
allPostList = '/sys/position/list', allPostList = '/sys/position/list',
userDepartList = '/sys/user/userDepartList', userDepartList = '/sys/user/userDepartList',
@ -143,6 +144,15 @@ export const getAllRolesList = (params) => defHttp.get({ url: Api.allRolesList,
* @param params * @param params
*/ */
export const getAllRolesListNoByTenant = (params) => defHttp.get({ url: Api.allRolesListNoByTenant, params }); export const getAllRolesListNoByTenant = (params) => defHttp.get({ url: Api.allRolesListNoByTenant, params });
/**
* 获取角色（排除：总管理）
* @param params
*/
export const getAllRolesListNoByExcludeTenant = (params) => defHttp.get({ url: Api.allRolesListExcludeByTenant, params });
/** /**
* 获取全部租户 * 获取全部租户
*/ */

59
jeecgboot-vue3-master/src/views/system/user/user.data.ts
Unescape View File

@ -1,6 +1,6 @@
import { BasicColumn } from '/@/components/Table'; import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table'; import { FormSchema } from '/@/components/Table';
import { getAllRolesListNoByTenant, getAllTenantList } from './user.api'; import { getAllRolesListNoByTenant,getAllRolesListNoByExcludeTenant, getAllTenantList } from './user.api';
import { rules } from '/@/utils/helper/validator'; import { rules } from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils'; import { render } from '/@/utils/common/renderUtils';
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
@ -172,7 +172,7 @@ export const formSchemaZJ: FormSchema[] = [
component: 'Input', component: 'Input',
dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_user', 'work_no', model, schema, true), dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_user', 'work_no', model, schema, true),
}, },
{ /*{
label: '职务', label: '职务',
field: 'post', field: 'post',
required: false, required: false,
@ -181,14 +181,13 @@ export const formSchemaZJ: FormSchema[] = [
rowKey: 'code', rowKey: 'code',
labelKey: 'name', labelKey: 'name',
}, },
}, },*/
{ {
label: '角色', label: '角色',
field: 'selectedroles', field: 'selectedroles',
component: 'ApiSelect', component: 'ApiSelect',
componentProps: { componentProps: {
mode: 'multiple', api: getAllRolesListNoByExcludeTenant,
api: getAllRolesListNoByTenant,
labelField: 'roleName', labelField: 'roleName',
valueField: 'id', valueField: 'id',
}, },
@ -218,7 +217,7 @@ export const formSchemaZJ: FormSchema[] = [
}; };
}, },
}, },
{ /*{
label: '租户', label: '租户',
field: 'relTenantIds', field: 'relTenantIds',
component: 'ApiSelect', component: 'ApiSelect',
@ -229,8 +228,8 @@ export const formSchemaZJ: FormSchema[] = [
labelField: 'name', labelField: 'name',
valueField: 'id', valueField: 'id',
}, },
}, },*/
{ /*{
label: '身份', label: '身份',
field: 'userIdentity', field: 'userIdentity',
component: 'RadioGroup', component: 'RadioGroup',
@ -246,8 +245,8 @@ export const formSchemaZJ: FormSchema[] = [
}, },
}; };
}, },
}, },*/
{ /* {
label: '负责部门', label: '负责部门',
field: 'departIds', field: 'departIds',
component: 'Select', component: 'Select',
@ -255,7 +254,7 @@ export const formSchemaZJ: FormSchema[] = [
mode: 'multiple', mode: 'multiple',
}, },
ifShow: ({ values }) => values.userIdentity == 2, ifShow: ({ values }) => values.userIdentity == 2,
}, },*/
{ {
label: '头像', label: '头像',
field: 'avatar', field: 'avatar',
@ -283,25 +282,13 @@ export const formSchemaZJ: FormSchema[] = [
label: '邮箱', label: '邮箱',
field: 'email', field: 'email',
component: 'Input', component: 'Input',
dynamicRules: ({ model, schema }) => {
return [
{ ...rules.duplicateCheckRule('sys_user', 'email', model, schema, true)[0] },
{ ...rules.rule('email', false)[0] },
];
},
}, },
{ {
label: '手机号码', label: '手机号码',
field: 'phone', field: 'phone',
component: 'Input', component: 'Input',
dynamicRules: ({ model, schema }) => {
return [
{ ...rules.duplicateCheckRule('sys_user', 'phone', model, schema, true)[0] },
{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' },
];
},
}, },
{ /*{
label: '座机', label: '座机',
field: 'telephone', field: 'telephone',
component: 'Input', component: 'Input',
@ -317,7 +304,7 @@ export const formSchemaZJ: FormSchema[] = [
type: 'radio', type: 'radio',
stringToNumber: true, stringToNumber: true,
}, },
}, },*/
{ {
label: '专家毕业院校', label: '专家毕业院校',
field: 'expSc', field: 'expSc',
@ -546,17 +533,17 @@ export const formSchema: FormSchema[] = [
component: 'Input', component: 'Input',
rules: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' }], rules: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' }],
}, },
{ // {
label: '工作流引擎', // label: '工作流引擎',
field: 'activitiSync', // field: 'activitiSync',
defaultValue: 1, // defaultValue: 1,
component: 'JDictSelectTag', // component: 'JDictSelectTag',
componentProps: { // componentProps: {
dictCode: 'activiti_sync', // dictCode: 'activiti_sync',
type: 'radio', // type: 'radio',
stringToNumber: true, // stringToNumber: true,
}, // },
}, // },
]; ];
export const formPasswordSchema: FormSchema[] = [ export const formPasswordSchema: FormSchema[] = [

4
jeecgboot-vue3-master/src/views/system/usersetting/BaseSetting.vue
Unescape View File

@ -39,10 +39,10 @@
<span class="gray-75 item-label">性别</span> <span class="gray-75 item-label">性别</span>
<span class="gray-3">{{ userInfo.sexText }}</span> <span class="gray-3">{{ userInfo.sexText }}</span>
</div> </div>
<div class="margin-bottom-10 nowarp font-size-13"> <!-- <div class="margin-bottom-10 nowarp font-size-13">
<span class="gray-75 item-label">职位</span> <span class="gray-75 item-label">职位</span>
<span class="gray-3">{{ userInfo.postText ? userInfo.postText : "未填写" }}</span> <span class="gray-3">{{ userInfo.postText ? userInfo.postText : "未填写" }}</span>
</div> </div>-->
<div class="font-size-13"> <div class="font-size-13">
<span class="item-label"></span> <span class="item-label"></span>
<span class="item-label pointer" style="color:#1e88e5" @click="openEditModal">编辑</span> <span class="item-label pointer" style="color:#1e88e5" @click="openEditModal">编辑</span>

6
jeecgboot-vue3-master/src/views/system/usersetting/UserSetting.data.js
Unescape View File

@ -7,12 +7,12 @@ export const settingList = [
component: 'BaseSetting', component: 'BaseSetting',
icon: 'ant-design:user-outlined' icon: 'ant-design:user-outlined'
}, },
{ /* {
key: '2', key: '2',
name: '我的租户', name: '我的租户',
component: 'TenantSetting', component: 'TenantSetting',
icon: 'ant-design:team-outlined' icon: 'ant-design:team-outlined'
}, },*/
{ {
key: '3', key: '3',
name: '账号安全', name: '账号安全',
@ -130,4 +130,4 @@ export const formPasswordSchema = [
dynamicRules: ({ values }) => rules.confirmPassword(values, true), dynamicRules: ({ values }) => rules.confirmPassword(values, true),
}, },
]; ];
//# sourceMappingURL=UserSetting.data.js.map //# sourceMappingURL=UserSetting.data.js.map

12
jeecgboot-vue3-master/src/views/system/usersetting/UserSetting.data.ts
Unescape View File

@ -18,12 +18,12 @@ export const settingList = [
component: 'BaseSetting', component: 'BaseSetting',
icon:'ant-design:user-outlined' icon:'ant-design:user-outlined'
}, },
{ /* {
key: '2', key: '2',
name: '我的租户', name: '我的租户',
component: 'TenantSetting', component: 'TenantSetting',
icon:'ant-design:team-outlined' icon:'ant-design:team-outlined'
}, },*/
{ {
key: '3', key: '3',
name: '账号安全', name: '账号安全',
@ -79,7 +79,7 @@ export const formSchema: FormSchema[] = [
], ],
} }
}, },
{ /*{
field: 'relTenantIds', field: 'relTenantIds',
component: 'JDictSelectTag', component: 'JDictSelectTag',
label: '租户', label: '租户',
@ -89,8 +89,8 @@ export const formSchema: FormSchema[] = [
dictCode:'sys_tenant,name,id', dictCode:'sys_tenant,name,id',
disabled:true disabled:true
} }
}, },*/
{ /*{
field: 'post', field: 'post',
component: 'JDictSelectTag', component: 'JDictSelectTag',
label: '职位', label: '职位',
@ -100,7 +100,7 @@ export const formSchema: FormSchema[] = [
dictCode:'sys_position,name,code', dictCode:'sys_position,name,code',
disabled:true disabled:true
} }
}, },*/
{ {
label: '', label: '',
field: 'id', field: 'id',

4
jeecgboot-vue3-master/src/views/system/usersetting/UserSetting.vue
Unescape View File

@ -25,7 +25,7 @@ import { ScrollContainer } from "/@/components/Container";
import { settingList } from "./UserSetting.data"; import { settingList } from "./UserSetting.data";
import BaseSetting from "./BaseSetting.vue"; import BaseSetting from "./BaseSetting.vue";
import AccountSetting from "./AccountSetting.vue"; import AccountSetting from "./AccountSetting.vue";
import TenantSetting from "./TenantSetting.vue";
import WeChatDingSetting from './WeChatDingSetting.vue'; import WeChatDingSetting from './WeChatDingSetting.vue';
export default defineComponent({ export default defineComponent({
components: { components: {
@ -34,7 +34,7 @@ export default defineComponent({
TabPane: Tabs.TabPane, TabPane: Tabs.TabPane,
BaseSetting, BaseSetting,
AccountSetting, AccountSetting,
TenantSetting,
WeChatDingSetting, WeChatDingSetting,
}, },
setup() { setup() {

Write Preview
Loading…
Cancel
Save