bug fix

package.json

@@ -9,7 +9,6 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
-    "@vue/composition-api": "^1.6.2",
     "axios": "^0.18.0",
     "core-js": "^3.6.5",
     "crypto-js": "^4.0.0",
@@ -18,13 +17,14 @@
     "element-ui": "^2.14.1",
     "js-md5": "^0.7.3",
     "jsbarcode": "^3.11.3",
-    "vue": "^2.6.11",
+    "vue": "~2.6.11",
     "vue-echarts": "^6.0.3",
     "vue-ls": "^3.2.2",
     "vue-router": "^3.2.0",
     "vuex": "^3.4.0"
   },
   "devDependencies": {
+    "@vue/composition-api": "^1.6.2",
     "@vue/cli-plugin-babel": "~4.5.0",
     "@vue/cli-plugin-eslint": "~4.5.0",
     "@vue/cli-plugin-router": "~4.5.0",
@@ -40,7 +40,7 @@
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
     "terser-webpack-plugin": "^1.2.3",
-    "vue-template-compiler": "^2.6.11"
+    "vue-template-compiler": "~2.6.11"
   },
   "gitHooks": {
     "pre-commit": "lint-staged"

src/modules/base/views/OrganizationManage.vue

@@ -82,15 +82,8 @@ export default {
   methods: {
     async getList() {
       const orgs = await organizationList();
-      this.orgs = [
-        {
-          id: this.$ls.get("schoolId") + "_" + this.$randomCode(),
-          name: this.$ls.get("schoolName"),
-          isRoot: true,
-          parentId: null,
-          children: orgs
-        }
-      ];
+      if (orgs[0]) orgs[0].isRoot = true;
+      this.orgs = orgs;
     },
     toAdd() {
       this.curOrg = {};

src/modules/base/views/RoleManage.vue

@@ -72,6 +72,7 @@
         >
           <template slot-scope="scope">
             <el-button
+              v-if="!scope.row.defaultRole"
               class="btn-table-icon"
               type="text"
               icon="icon icon-edit"
@@ -79,6 +80,7 @@
               title="编辑"
             ></el-button>
             <el-button
+              v-if="!scope.row.defaultRole"
               class="btn-table-icon"
               type="text"
               icon="icon icon-delete"
@@ -86,6 +88,7 @@
               title="删除"
             ></el-button>
             <el-button
+              v-if="!scope.row.defaultRole"
               class="btn-table-icon"
               type="text"
               :icon="

yarn.lock

@@ -8998,7 +8998,7 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.6.11:
+vue-template-compiler@~2.6.11:
   version "2.6.14"
   resolved "https://registry.npmmirror.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763"
   integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==
@@ -9011,7 +9011,7 @@ vue-template-es2015-compiler@^1.9.0:
   resolved "https://registry.npmmirror.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
-vue@^2.6.11:
+vue@~2.6.11:
   version "2.6.14"
   resolved "https://registry.npmmirror.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
   integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==