Merge branch 'all' of ssh://192.168.13.68:2222/skyeye/skyeye_frontend/skyeye-admin into all

src/views/system/role/CreateDrawer.vue

@@ -13,13 +13,15 @@
       label-placement="left"
       :label-width="80"
     >
-      <el-form-item v-if="!formParams.roleId" label="角色编码" prop="roleCode">
-        <el-input
-          placeholder="请输入角色编码"
-          v-model="formParams.roleCode"
-          :disabled="formParams.roleId ? true : false"
-        />
-      </el-form-item>
+      <div v-if="!disableDepartmentEdit">
+        <el-form-item v-if="!formParams.roleId" label="角色编码" prop="roleCode">
+          <el-input
+            placeholder="请输入角色编码"
+            v-model="formParams.roleCode"
+            :disabled="formParams.roleId ? true : false"
+          />
+        </el-form-item>
+      </div>
 
       <el-form-item label="角色名称" prop="roleName">
         <el-input placeholder="请输入角色名称" v-model="formParams.roleName" />
@@ -62,6 +64,13 @@
 
   import { addAdminRole, editAdminRole, roleAdminInfo } from '@/api/system/role';
   import { getTreeValues } from '@/utils/helper/treeHelper';
+  import { useGlobSetting } from '@/hooks/setting';
+  import { uid } from 'uid';
+
+  const globSetting = useGlobSetting();
+  const disableDepartmentEdit = globSetting.disableDepartmentEdit;
+
+  console.log('disableDepartmentEdit', disableDepartmentEdit);
 
   const rules = {
     roleCode: {
@@ -96,7 +105,7 @@
     roleId: null,
     roleType: null,
     roleName: '',
-    roleCode: '',
+    roleCode: disableDepartmentEdit ? uid(16) : '',
     remark: '',
     permissions: [],
     permissionKeys: [],

src/views/system/role/CreateUserDrawer.vue

@@ -13,13 +13,15 @@
       label-placement="left"
       :label-width="80"
     >
-      <el-form-item v-if="!formParams.roleId" label="角色编码" prop="roleCode">
-        <el-input
-          placeholder="请输入角色编码"
-          v-model="formParams.roleCode"
-          :disabled="formParams.roleId ? true : false"
-        />
-      </el-form-item>
+      <div v-if="!disableDepartmentEdit">
+        <el-form-item v-if="!formParams.roleId" label="角色编码" prop="roleCode">
+          <el-input
+            placeholder="请输入角色编码"
+            v-model="formParams.roleCode"
+            :disabled="formParams.roleId ? true : false"
+          />
+        </el-form-item>
+      </div>
 
       <el-form-item label="角色名称" prop="roleName">
         <el-input placeholder="请输入角色名称" v-model="formParams.roleName" />
@@ -90,6 +92,11 @@
   import { addRole, getFeaturePermissions, roleUserInfo, updateRole } from '@/api/system/role';
   import useScene from '@/views/system-config/scene-manage/use-scene';
   import { storeToRefs } from 'pinia';
+  import { useGlobSetting } from '@/hooks/setting';
+  import { uid } from 'uid';
+
+  const globSetting = useGlobSetting();
+  const disableDepartmentEdit = globSetting.disableDepartmentEdit;
 
   const sceneInfos = useScene();
   const { tableData } = storeToRefs(sceneInfos);
@@ -189,7 +196,7 @@
   const defaultValueRef = () => ({
     roleId: null,
     roleName: '',
-    roleCode: '',
+    roleCode: disableDepartmentEdit ? uid(16) : '',
     remark: '',
     permissions: [],
     permissionKeys: [],
@@ -198,7 +205,7 @@
   const defaultTreeValueRef = () => ({
     roleId: null,
     roleName: '',
-    roleCode: '',
+    roleCode: disableDepartmentEdit ? uid(16) : '',
     remark: '',
     permissionList: [],
     permissionKeys: [],