Explorar o código

修复向根部门添加成员后,组织接口显示错误

imndx hai 5 meses
pai
achega
0b6fac5113

+ 30 - 30
organization-web/package-lock.json

@@ -10,7 +10,7 @@
       "dependencies": {
         "axios": "1.8.2",
         "core-js": "^3.6.5",
-        "element-ui": "^2.15.8",
+        "element-ui": "^2.15.14",
         "pinia": "^2.3.1",
         "vue": "^2.7.14",
         "vue-i18n": "^8.23.0",
@@ -2614,29 +2614,6 @@
         "eslint": ">= 1.6.0 < 7.0.0"
       }
     },
-    "node_modules/@vue/cli-plugin-router": {
-      "version": "4.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.5.17.tgz",
-      "integrity": "sha512-9r9CSwqv2+39XHQPDZJ0uaTtTP7oe0Gx17m7kBhHG3FA7R7AOSk2aVzhHZmDRhzlOxjx9kQSvrOSMfUG0kV4dQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@vue/cli-shared-utils": "^4.5.17"
-      },
-      "peerDependencies": {
-        "@vue/cli-service": "^3.0.0 || ^4.0.0-0"
-      }
-    },
-    "node_modules/@vue/cli-plugin-vuex": {
-      "version": "4.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.17.tgz",
-      "integrity": "sha512-ck/ju2T2dmPKLWK/5QctNJs9SCb+eSZbbmr8neFkMc7GlbXw6qLWw5v3Vpd4KevdQA8QuQOA1pjUmzpCiU/mYQ==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "@vue/cli-service": "^3.0.0 || ^4.0.0-0"
-      }
-    },
     "node_modules/@vue/cli-service": {
       "version": "4.5.17",
       "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.5.17.tgz",
@@ -2737,6 +2714,29 @@
         }
       }
     },
+    "node_modules/@vue/cli-service/node_modules/@vue/cli-plugin-router": {
+      "version": "4.5.19",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/@vue/cli-plugin-router/-/cli-plugin-router-4.5.19.tgz",
+      "integrity": "sha512-3icGzH1IbVYmMMsOwYa0lal/gtvZLebFXdE5hcQJo2mnTwngXGMTyYAzL56EgHBPjbMmRpyj6Iw9k4aVInVX6A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/cli-shared-utils": "^4.5.19"
+      },
+      "peerDependencies": {
+        "@vue/cli-service": "^3.0.0 || ^4.0.0-0"
+      }
+    },
+    "node_modules/@vue/cli-service/node_modules/@vue/cli-plugin-vuex": {
+      "version": "4.5.19",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.19.tgz",
+      "integrity": "sha512-DUmfdkG3pCdkP7Iznd87RfE9Qm42mgp2hcrNcYQYSru1W1gX2dG/JcW8bxmeGSa06lsxi9LEIc/QD1yPajSCZw==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@vue/cli-service": "^3.0.0 || ^4.0.0-0"
+      }
+    },
     "node_modules/@vue/cli-service/node_modules/acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -2764,9 +2764,9 @@
       }
     },
     "node_modules/@vue/cli-shared-utils": {
-      "version": "4.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.17.tgz",
-      "integrity": "sha512-VoFNdxvTW4vZu3ne+j1Mf7mU99J2SAoRVn9XPrsouTUUJablglM8DASk7Ixhsh6ymyL/W9EADQFR6Pgj8Ujjuw==",
+      "version": "4.5.19",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/@vue/cli-shared-utils/-/cli-shared-utils-4.5.19.tgz",
+      "integrity": "sha512-JYpdsrC/d9elerKxbEUtmSSU6QRM60rirVubOewECHkBHj+tLNznWq/EhCjswywtePyLaMUK25eTqnTSZlEE+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7193,9 +7193,9 @@
       "license": "ISC"
     },
     "node_modules/element-ui": {
-      "version": "2.15.8",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.8.tgz",
-      "integrity": "sha512-N54zxosRFqpYax3APY3GeRmtOZwIls6Z756WM0kdPZ5Q92PIeKHnZgF1StlamIg9bLxP1k+qdhTZvIeQlim09A==",
+      "version": "2.15.14",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/element-ui/-/element-ui-2.15.14.tgz",
+      "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==",
       "license": "MIT",
       "dependencies": {
         "async-validator": "~1.8.1",

+ 1 - 1
organization-web/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "axios": "1.8.2",
     "core-js": "^3.6.5",
-    "element-ui": "^2.15.8",
+    "element-ui": "^2.15.14",
     "pinia": "^2.3.1",
     "vue": "^2.7.14",
     "vue-i18n": "^8.23.0",

+ 1 - 1
organization-web/src/components/page/organization/Member.vue

@@ -1,7 +1,7 @@
 <template>
     <el-container style="height: 100%">
         <el-aside style="border-right: 1px solid #e6e6e6; padding-right: 20px">
-            <el-input v-model="input" placeholder="请输入姓名、邮箱或手机号"></el-input>
+            <el-input v-if="false" v-model="input" placeholder="请输入姓名、邮箱或手机号"></el-input>
             <el-tree v-if="!input" :data="rootOrganizations" ref="tree" :expand-on-click-node="true"
                      :props="defaultProps" :render-after-expand='false' lazy :load="loadNode" @node-click="handleNodeClick"
                      @node-expand="handleNodeExpand">

+ 1 - 1
organization-web/src/components/page/organization/dialog/AddDepartmentMember.vue

@@ -126,7 +126,7 @@ export default {
                 this.$message.error('请选择至少一个部门');
                 return;
             }
-            
+
             this.checkedDepartments.forEach(department => {
                 this.orgStore.createEmployee({
                     employee: this.employee,

+ 4 - 0
organization-web/src/store/stores/orgStore.js

@@ -41,6 +41,10 @@ export const useOrgStore = defineStore('org', {
     },
 
     async queryOrganizationWithChildren(org) {
+      if(!org.parentId){
+        this.getRootOrganizationsWithChildren()
+        return
+      }
       let result = await Api.queryOrganizationWithChildren(org.id);
       let orgWC = Object.assign(new OrganizationWithChildren(), result);
       org._orgWithChildren = orgWC;