Merge branch 'hotfix-v2.4.0-linqian' into 'release/v2.4.0'

bug修复

See merge request dcuc-tjdsj/auth-web!34

src/pages/permission-selfhelp-manage/component/app-func-form.vue

@@ -36,7 +36,8 @@ export default {
     needFilter: {
       type: Boolean,
       default: false
-    }
+    },
+    type: String
   },
   components: { transferTree },
   data() {
@@ -170,7 +171,7 @@ export default {
 
   async created() {
     this.data = await this.getAllTree();
-    if (this.type == 'edit') {
+    if (this.type == 'add') {
       // 已有资源，包含了父节点
       this.havefunIds = await this.getSetFunIdsByUser();
       // 已有资源，只是子节点

src/pages/permission-selfhelp-manage/component/basic-form.vue

@@ -484,7 +484,8 @@ export default {
         shadow: [0.4, '#fff'],
         props: {
           selectKeys: this.applySelectKeys,
-          needFilter: this.needFilter
+          needFilter: this.needFilter,
+          type: this.type
         },
         content: this.applyContentCom,
         area: ['1200px', '700px'],

src/pages/permission-selfhelp-manage/index.vue

@@ -46,7 +46,7 @@
             <el-tooltip content="详情" effect="dark" placement="top-end">
               <i class="el-icon-document" @click="handleViewDetail(row)"></i>
             </el-tooltip>
-            <el-tooltip content="编辑" effect="dark" placement="top-end" v-if="!row.showEdit">
+            <el-tooltip content="编辑" effect="dark" placement="top-end" v-if="row.showEdit">
               <i class="el-icon-edit" @click="handleApplyPermission(row.applyOrdNo)"></i>
             </el-tooltip>
             <el-tooltip content="撤回" effect="dark" placement="top-end" v-if="row.showRecall">