Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

.env.development

@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 开发环境
 #测试地址
-VUE_APP_BASE_API = 'http://47.92.229.224:8080'
+#VUE_APP_BASE_API = 'http://47.92.229.224:8080'
 #罗俊
 #VUE_APP_BASE_API = 'http://10.87.21.60:8080'
 #罗伟
@@ -20,7 +20,7 @@ VUE_APP_BASE_API = 'http://47.92.229.224:8080'
 # VUE_APP_BASE_API = 'http://10.87.23.62:8080'
 # VUE_APP_BASE_API = 'http://localhost:8080'
 # 开发环境
-# VUE_APP_BASE_API = 'http://10.87.21.103:8080'
+VUE_APP_BASE_API = 'http://10.87.21.103:8080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

src/views/core/accessPlan/index.vue

@@ -218,7 +218,7 @@
                 />
               </template>
             </el-table-column>
-            <!-- <el-table-column label="备注" align="center" prop="description"/> -->
+          
             <el-table-column
               label="操作"
               fixed="right"
@@ -261,7 +261,7 @@
                   icon="el-icon-edit-outline"
                   @click="handleUpdate(scope.row)"
                   v-if="scope.row.orgId == isEdit"
-                  v-hasPermi="['core:accessPlan:edit', 'core:accessPlan:query']"
+                  v-hasPermi="['core:accessPlan:edit']"
                   >编辑
                 </el-button>
 

src/views/system/dept/index.vue

@@ -836,6 +836,10 @@ this.isEdit=response.isEdit;
           this.getList();
           this.$modal.msgSuccess("删除成功");
           this.getDeptTree();
+          this.$store.dispatch("getOrgTree");
+          this.$store.dispatch("getDepTree");
+          this.$store.dispatch("getBusinessTree");
+          this.$store.dispatch("getWholeTree");
         })
         .catch(() => {});
     },