gemercheung hace 9 meses
padre
commit
0e3a943e6f

+ 1 - 0
src/request/type.ts

@@ -20,6 +20,7 @@ export type UserInfo = {
   orgId: string;
   orgName?: string;
   userId?: number;
+  type?: number
 };
 
 export type Relics = {

+ 14 - 10
src/view/layout/slide/index.vue

@@ -28,29 +28,33 @@ const isSuper = computed(
   () =>
     user.value.roles.filter((item) => item.roleKey === "super_admin").length > 0
 );
-const normal_name = [
+const isOrgUser = computed(() => user.value.type === 1);
+
+const org_name = [
   "scene",
   // "relics",
   // "device",
-  "organization",
-  "users",
+  // "organization",
   "no-persession",
+  // "users",
   "org-users",
 ];
-const super_names = [
+const no_org_names = [
   "scene",
   // "relics",
   // "device",
   "organization",
-  "users",
   "no-persession",
-  "org-users",
+  "users",
+  // "org-users",
 ];
-console.log("isSuper", isSuper.value);
 
-const routes = isSuper.value
-  ? super_names.map((name) => findRoute(name)!)
-  : normal_name.map((name) => findRoute(name)!);
+
+console.log("isOrgUser", isOrgUser.value);
+
+const routes = isOrgUser.value
+  ? org_name.map((name) => findRoute(name)!)
+  : no_org_names.map((name) => findRoute(name)!);
 </script>
 
 <style lang="scss" scoped>

+ 1 - 1
src/view/org-users/users-password-edit.vue

@@ -184,7 +184,7 @@ defineExpose<QuiskExpose>({
       const res = await unref(baseFormRef)?.validate();
       if (res) {
         await props.submit(data.value as any as UserType);
-        ElMessage.success('编辑成功!');
+        // ElMessage.success('编辑成功!');
       }
     } else {
       throw "";

+ 5 - 4
src/view/organization-edit.vue

@@ -4,12 +4,12 @@
     <el-form-item label="单位名称" prop="orgName" required>
       <el-input v-model.trim="data.orgName" style="width: 300px" :maxlength="50" placeholder="请输入" />
     </el-form-item>
-    <el-form-item label="类型" prop="type" required>
-      <!-- <el-input v-model="data.type" style="width: 300px" :maxlength="500" placeholder="请输入" /> -->
+    <!-- <el-form-item label="类型" prop="type" required>
+
       <el-select style="width: 300px" v-model="data.type">
         <el-option :value="Number(key)" :label="type" v-for="(type, key) in OrganizationTypeDesc" />
       </el-select>
-    </el-form-item>
+    </el-form-item> -->
 
   </el-form>
 </template>
@@ -55,7 +55,7 @@ const data = ref<OrganizationType & {}>({
   orgName: "",
   parentId: 0,
   password: "",
-  type: null,
+  // type: null,
   userName: ""
 });
 
@@ -79,6 +79,7 @@ defineExpose<QuiskExpose>({
       setParentId();
       const res = await unref(baseFormRef)?.validate();
       if (res) {
+        delete data.value.type
         await props.submit(data.value as any as OrganizationType);
       }
     } else {

+ 1 - 6
src/view/users-edit.vue

@@ -81,12 +81,7 @@ onMounted(async () => {
   allOrgs.value = data as any as SelectType[];
 });
 
-// const setParentId = () => {
-//   if (user.value) {
-//     const isSuper = user.value.roles.filter(item => item.roleKey === "super_admin").length > 0;
-//     data.value.parentId = isSuper ? 0 : Number(user.value.orgId)
-//   }
-// }
+
 watchEffect(() => {
   if (props.user) {
     data.value = { ...props.user };

+ 1 - 1
src/view/users-password-edit.vue

@@ -208,7 +208,7 @@ defineExpose<QuiskExpose>({
       const res = await unref(baseFormRef)?.validate();
       if (res) {
         await props.submit(data.value as any as UserType);
-        ElMessage.success('编辑成功!');
+        // ElMessage.success('编辑成功!');
       }
     } else {
       throw "";