专家管理06

5 months ago · 2cb2898afe
parent b461304230
commit 2cb2898afe
11 changed files with 18683 additions and 16900 deletions
--- a/jeecgboot-vue3-master/index.html
+++ b/jeecgboot-vue3-master/index.html
@ -15,7 +15,7 @@
    <script>
      window._CONFIG = {};
    </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>
  <body>
    <script>
--- a/jeecgboot-vue3-master/pnpm-lock.yaml
+++ b/jeecgboot-vue3-master/pnpm-lock.yaml
--- a/jeecgboot-vue3-master/src/assets/loginmini/style/home.less
+++ b/jeecgboot-vue3-master/src/assets/loginmini/style/home.less
@ -35,7 +35,7 @@
  -webkit-flex-basis: 60%;
  background-color: #0198cd;
  //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;
 }

--- a/jeecgboot-vue3-master/src/views/system/user/UserDrawerZJ.vue
+++ b/jeecgboot-vue3-master/src/views/system/user/UserDrawerZJ.vue
@ -14,9 +14,9 @@
 <script lang="ts" setup>
  import { defineComponent, ref, computed, unref, useAttrs } from 'vue';
  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { formSchemaZJ } from './user.data';
+  import { formSchemaZJ } from './userZJ.data';
  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 { getTenantId } from "/@/utils/auth";

@ -117,9 +117,9 @@
        show: !data?.departDisabled ?? false,
        //update-begin---author:wangshuai ---date:20230424  for：【issues/4844】多租户模式下，新增或编辑用户，选择角色一栏，角色选项没有做租户隔离------------
        //判断是否为多租户模式
-        componentProps:{
-          api: data.tenantSaas?getAllRolesList:getAllRolesListNoByTenant
-        }
+      /*  componentProps:{
+          api: data.tenantSaas?getAllRolesList:getAllRolesListNoByExcludeTenant
+        }*/
        //update-end---author:wangshuai ---date:20230424  for：【issues/4844】多租户模式下，新增或编辑用户，选择角色一栏，角色选项没有做租户隔离------------
      },
      //update-begin---author:wangshuai ---date:20230522  for：【issues/4935】租户用户编辑界面中租户下拉框未过滤，显示当前系统所有的租户------------
--- a/jeecgboot-vue3-master/src/views/system/user/index.vue
+++ b/jeecgboot-vue3-master/src/views/system/user/index.vue
@ -9,7 +9,6 @@
        <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>
        <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>
        <JThirdAppButton biz-type="user" :selected-row-keys="selectedRowKeys" syncToApp syncToLocal @sync-finally="onSyncFinally" />
        <a-dropdown v-if="selectedRowKeys.length > 0">
--- a/jeecgboot-vue3-master/src/views/system/user/user.api.ts
+++ b/jeecgboot-vue3-master/src/views/system/user/user.api.ts
@ -23,6 +23,7 @@ enum Api {
  deleteRecycleBin = '/sys/user/deleteRecycleBin',
  allRolesList = '/sys/role/queryall',
  allRolesListNoByTenant = '/sys/role/queryallNoByTenant',
+  allRolesListExcludeByTenant = '/sys/role/queryallExcludeByTenant',
  allTenantList = '/sys/tenant/queryList',
  allPostList = '/sys/position/list',
  userDepartList = '/sys/user/userDepartList',
@ -143,6 +144,15 @@ export const getAllRolesList = (params) => defHttp.get({ url: Api.allRolesList,
 * @param params
 */
 export const getAllRolesListNoByTenant = (params) => defHttp.get({ url: Api.allRolesListNoByTenant, params });
+
+
+/**
+ * 获取角色（排除：总管理）
+ * @param params
+ */
+export const getAllRolesListNoByExcludeTenant = (params) => defHttp.get({ url: Api.allRolesListExcludeByTenant, params });
+
+
 /**
 * 获取全部租户
 */
--- a/jeecgboot-vue3-master/src/views/system/user/user.data.ts
+++ b/jeecgboot-vue3-master/src/views/system/user/user.data.ts
@ -1,6 +1,6 @@
 import { BasicColumn } 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 { render } from '/@/utils/common/renderUtils';
 export const columns: BasicColumn[] = [
@ -172,7 +172,7 @@ export const formSchemaZJ: FormSchema[] = [
    component: 'Input',
    dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_user', 'work_no', model, schema, true),
  },
-  {
+  /*{
    label: '职务',
    field: 'post',
    required: false,
@ -181,14 +181,13 @@ export const formSchemaZJ: FormSchema[] = [
      rowKey: 'code',
      labelKey: 'name',
    },
-  },
+  },*/
  {
    label: '角色',
    field: 'selectedroles',
    component: 'ApiSelect',
    componentProps: {
-      mode: 'multiple',
-      api: getAllRolesListNoByTenant,
+      api: getAllRolesListNoByExcludeTenant,
      labelField: 'roleName',
      valueField: 'id',
    },
@ -218,7 +217,7 @@ export const formSchemaZJ: FormSchema[] = [
      };
    },
  },
-  {
+  /*{
    label: '租户',
    field: 'relTenantIds',
    component: 'ApiSelect',
@ -229,8 +228,8 @@ export const formSchemaZJ: FormSchema[] = [
      labelField: 'name',
      valueField: 'id',
    },
-  },
-  {
+  },*/
+  /*{
    label: '身份',
    field: 'userIdentity',
    component: 'RadioGroup',
@ -246,8 +245,8 @@ export const formSchemaZJ: FormSchema[] = [
        },
      };
    },
-  },
-  {
+  },*/
+ /* {
    label: '负责部门',
    field: 'departIds',
    component: 'Select',
@ -255,7 +254,7 @@ export const formSchemaZJ: FormSchema[] = [
      mode: 'multiple',
    },
    ifShow: ({ values }) => values.userIdentity == 2,
-  },
+  },*/
  {
    label: '头像',
    field: 'avatar',
@ -283,25 +282,13 @@ export const formSchemaZJ: FormSchema[] = [
    label: '邮箱',
    field: 'email',
    component: 'Input',
-    dynamicRules: ({ model, schema }) => {
-      return [
-        { ...rules.duplicateCheckRule('sys_user', 'email', model, schema, true)[0] },
-        { ...rules.rule('email', false)[0] },
-      ];
-    },
  },
  {
    label: '手机号码',
    field: 'phone',
    component: 'Input',
-    dynamicRules: ({ model, schema }) => {
-      return [
-        { ...rules.duplicateCheckRule('sys_user', 'phone', model, schema, true)[0] },
-        { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' },
-      ];
  },
-  },
-  {
+  /*{
    label: '座机',
    field: 'telephone',
    component: 'Input',
@ -317,7 +304,7 @@ export const formSchemaZJ: FormSchema[] = [
      type: 'radio',
      stringToNumber: true,
    },
-  },
+  },*/
  {
    label: '专家毕业院校',
    field: 'expSc',
@ -546,17 +533,17 @@ export const formSchema: FormSchema[] = [
    component: 'Input',
    rules: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' }],
  },
-  {
-    label: '工作流引擎',
-    field: 'activitiSync',
-    defaultValue: 1,
-    component: 'JDictSelectTag',
-    componentProps: {
-      dictCode: 'activiti_sync',
-      type: 'radio',
-      stringToNumber: true,
-    },
-  },
+  // {
+  //   label: '工作流引擎',
+  //   field: 'activitiSync',
+  //   defaultValue: 1,
+  //   component: 'JDictSelectTag',
+  //   componentProps: {
+  //     dictCode: 'activiti_sync',
+  //     type: 'radio',
+  //     stringToNumber: true,
+  //   },
+  // },
 ];

 export const formPasswordSchema: FormSchema[] = [
--- a/jeecgboot-vue3-master/src/views/system/usersetting/BaseSetting.vue
+++ b/jeecgboot-vue3-master/src/views/system/usersetting/BaseSetting.vue
@ -39,10 +39,10 @@
          <span class="gray-75 item-label">性别</span>
          <span class="gray-3">{{ userInfo.sexText }}</span>
        </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-3">{{ userInfo.postText ? userInfo.postText : "未填写" }}</span>
-        </div>
+        </div>-->
        <div class="font-size-13">
          <span class="item-label"></span>
          <span class="item-label pointer" style="color:#1e88e5" @click="openEditModal">编辑</span>
--- a/jeecgboot-vue3-master/src/views/system/usersetting/UserSetting.data.js
+++ b/jeecgboot-vue3-master/src/views/system/usersetting/UserSetting.data.js
@ -7,12 +7,12 @@ export const settingList = [
        component: 'BaseSetting',
        icon: 'ant-design:user-outlined'
    },
-    {
+/*    {
        key: '2',
        name: '我的租户',
        component: 'TenantSetting',
        icon: 'ant-design:team-outlined'
-    },
+    },*/
    {
        key: '3',
        name: '账号安全',
--- a/jeecgboot-vue3-master/src/views/system/usersetting/UserSetting.data.ts
+++ b/jeecgboot-vue3-master/src/views/system/usersetting/UserSetting.data.ts
@ -18,12 +18,12 @@ export const settingList = [
    component: 'BaseSetting',
    icon:'ant-design:user-outlined'
  },
-  {
+ /* {
    key: '2',
    name: '我的租户',
    component: 'TenantSetting',
    icon:'ant-design:team-outlined'
-  },
+  },*/
   {
    key: '3',
    name: '账号安全',
@ -79,7 +79,7 @@ export const formSchema: FormSchema[] = [
      ],
    }
  },
-  {
+  /*{
    field: 'relTenantIds',
    component: 'JDictSelectTag',
    label: '租户',
@ -89,8 +89,8 @@ export const formSchema: FormSchema[] = [
      dictCode:'sys_tenant,name,id',
      disabled:true
    }
-  },
-  {
+  },*/
+  /*{
    field: 'post',
    component: 'JDictSelectTag',
    label: '职位',
@ -100,7 +100,7 @@ export const formSchema: FormSchema[] = [
      dictCode:'sys_position,name,code',
      disabled:true
    }
-  },
+  },*/
  {
    label: '',
    field: 'id',
--- a/jeecgboot-vue3-master/src/views/system/usersetting/UserSetting.vue
+++ b/jeecgboot-vue3-master/src/views/system/usersetting/UserSetting.vue
@ -25,7 +25,7 @@ import { ScrollContainer } from "/@/components/Container";
 import { settingList } from "./UserSetting.data";
 import BaseSetting from "./BaseSetting.vue";
 import AccountSetting from "./AccountSetting.vue";
-import TenantSetting from "./TenantSetting.vue";
+
 import WeChatDingSetting from './WeChatDingSetting.vue';
 export default defineComponent({
  components: {
@ -34,7 +34,7 @@ export default defineComponent({
    TabPane: Tabs.TabPane,
    BaseSetting,
    AccountSetting,
-    TenantSetting,
+
    WeChatDingSetting,
  }, 
  setup() {