Merge branch 'dev' of http://192.168.0.115:3000/bill/4pc into dev

src/view/organization-edit.vue

@@ -62,6 +62,7 @@ const data = ref<OrganizationType & {}>({
 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)
   }
 }

src/view/users.vue

@@ -45,7 +45,7 @@
             <el-button link type="primary" @click="editHandler(row)" size="small">
               编辑
             </el-button>
-            <el-button link type="danger" @click="delHandler(row)" size="small">
+            <el-button link type="danger" @click="delHandler(row)" size="small" v-if="isSuper">
               删除
             </el-button>
           </template>
@@ -61,7 +61,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onActivated, ref, watch } from "vue";
+import { onActivated, ref, watch, computed } from "vue";
 import {
   getUserpageFetch,
   addUserFetch,
@@ -75,7 +75,10 @@ import { usersAdd, usersEdit } from "./quisk";
 import { openLoading, closeLoading } from "@/helper/loading";
 import { ElMessageBox } from "element-plus";
 import { debounce } from "@/util";
+import { user } from "@/store/user";
 
+const isSuper = computed(() => user.value.roles.filter(item => item.roleKey === "super_admin").length > 0)
+console.log('isSuper', isSuper)
 const initProps: PageProps<Partial<Pick<UserType, "userName" | "orgName">>> = {
   pageNum: 1,
   pageSize: 10,
@@ -97,7 +100,7 @@ const addHandler = async () => {
   await usersAdd({ submit: addUserFetch });
   await refresh();
 }
-const editHandler = async(row: UserType) => {
+const editHandler = async (row: UserType) => {
   await usersEdit({ user: row, submit: editUserFetch });
   await refresh();
 }