diff --git a/src/pages/authority/organizationedit.vue b/src/pages/authority/organizationedit.vue
index c6bbe377951153f551f1f65618402cf16acbe2a9..7f6815f82c978a0e884169f398246c735186e4c1 100644
--- a/src/pages/authority/organizationedit.vue
+++ b/src/pages/authority/organizationedit.vue
@@ -2,7 +2,7 @@
权限管理 / 组织管理 /
- 组织{{$route.params.id?'编辑':'新增'}}
+ 组织{{$route.path.indexOf('edit')!==-1?'编辑':'新增'}}
@@ -148,7 +148,7 @@ export default {
this.$store.commit('rolefun',data)
this.getOriginArr()
});
- console.log(this.$route.params.id);
+ console.log(this.$route);
},
mounted() {},
methods: {
diff --git a/src/pages/authority/organizationuser.vue b/src/pages/authority/organizationuser.vue
index 1031e08b5d77d3812a6d053a521642276f9cc9ca..d702b81a925acede473816a52811c4ee4a3689c2 100644
--- a/src/pages/authority/organizationuser.vue
+++ b/src/pages/authority/organizationuser.vue
@@ -1,8 +1,8 @@
- 权限管理 / 组织管理 / 组织详情 /
- 用户管理
+ {{$route.name =='organizationuser'?'权限管理 / 组织管理 / 组织详情 /':'权限管理 / 用户管理 /' }}
+ {{$route.name =='organizationuser'?'用户管理':$route.name =='usersadd'?'新增用户':'用户详情'}}
@@ -38,7 +38,7 @@
- IP地址:
+ IP白名单:
@@ -92,13 +92,15 @@
+ 重置
保存
取消
-
+
+
@@ -108,7 +110,7 @@ import { getRole } from "@/utils/common";
export default {
props: {},
components: {
- uploadFile
+ uploadFile,
},
data() {
return {
@@ -200,6 +202,7 @@ export default {
this.$store.commit('rolefun',data)
this.getOriginArr()
});
+ console.log(this.$route);
},
mounted() {},
methods: {
@@ -235,6 +238,9 @@ export default {
return v.url
}).join(';')
console.log(this.form.fileList)
+ },
+ resetForm(formName) {
+ this.$refs[formName].resetFields();
}
}
};
@@ -292,6 +298,9 @@ export default {
float: right;
margin-left: 20px;
}
+.left{
+ float: left;
+}
.removepic{
display: inline-block;
margin-top: -40px;
diff --git a/src/pages/authority/useradd.vue b/src/pages/authority/useradd.vue
new file mode 100644
index 0000000000000000000000000000000000000000..42bcb0319f7667ae9ecf2ab4a3dea45883ccb381
--- /dev/null
+++ b/src/pages/authority/useradd.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/router/index.js b/src/router/index.js
index 32914e6c62ba9145b65a062c7b28ff628e128b49..5152a71154c97ae962f3c0f4a05e6694c713debf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -239,22 +239,22 @@ export default new Router({
component: () => import("@/pages/authority/organization"),
},
{
- path: "/authority/organizationdetail/:id", // 组织管理详情
+ path: "/authority/organization/detail/:id", // 组织管理详情
name: "organizationdetail",
component: () => import("@/pages/authority/organizationdetail"),
},
{
- path: "/authority/organizationedit", // 组织管理组织新增
- name: "organizationedit",
+ path: "/authority/organization/add", // 组织管理组织新增
+ name: "organizationadd",
component: () => import("@/pages/authority/organizationedit"),
},
{
- path: "/authority/organizationedit/:id", // 组织管理组织编辑
+ path: "/authority/organization/edit/:id", // 组织管理组织编辑
name: "organizationedit",
component: () => import("@/pages/authority/organizationedit"),
},
{
- path: "/authority/organizationuser", // 组织管理组织用户
+ path: "/authority/organization/user/:id", // 组织管理组织用户
name: "organizationuser",
component: () => import("@/pages/authority/organizationuser"),
},
@@ -263,6 +263,16 @@ export default new Router({
name: "users",
component: () => import("@/pages/authority/users"),
},
+ {
+ path: "/authority/users/add", // 用户管理-新增
+ name: "usersadd",
+ component: () => import("@/pages/authority/organizationuser"),
+ },
+ {
+ path: "/authority/users/detail/:id", // 用户管理-详情
+ name: "usersdetail",
+ component: () => import("@/pages/authority/organizationuser"),
+ },
{
path: "/authority/menu", // 菜单管理页
name: "menu",