Commit e9a66061 authored by 张俊's avatar 张俊

合并

parents 8755cec3 9a141dbb
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="detail_contain"> <div class="detail_contain">
<p class="now_page_title"> <p class="now_page_title">
权限管理 / 组织管理 / 权限管理 / 组织管理 /
<span>组织{{$route.params.id?'编辑':'新增'}}</span> <span>组织{{$route.path.indexOf('edit')!==-1?'编辑':'新增'}}</span>
</p> </p>
<div class="info_contain"> <div class="info_contain">
<el-form ref="form" :rules="rules" :model="form" label-width="0px"> <el-form ref="form" :rules="rules" :model="form" label-width="0px">
...@@ -148,7 +148,7 @@ export default { ...@@ -148,7 +148,7 @@ export default {
this.$store.commit('rolefun',data) this.$store.commit('rolefun',data)
this.getOriginArr() this.getOriginArr()
}); });
console.log(this.$route.params.id); console.log(this.$route);
}, },
mounted() {}, mounted() {},
methods: { methods: {
......
<template> <template>
<div class="detail_contain"> <div class="detail_contain">
<p class="now_page_title"> <p class="now_page_title">
权限管理 / 组织管理 / 组织详情 / {{$route.name =='organizationuser'?'权限管理 / 组织管理 / 组织详情 /':'权限管理 / 用户管理 /' }}
<span>用户管理</span> <span>{{$route.name =='organizationuser'?'用户管理':$route.name =='usersadd'?'新增用户':'用户详情'}}</span>
</p> </p>
<div class="info_contain"> <div class="info_contain">
<el-form ref="form" :rules="rules" :model="form" label-width="0px"> <el-form ref="form" :rules="rules" :model="form" label-width="0px">
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<el-input v-model="form.domain"></el-input> <el-input v-model="form.domain"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="ip" v-if="now_user==0"> <el-form-item prop="ip" v-if="now_user==0">
<p class="formname">IP地址</p> <p class="formname">IP白名单</p>
<el-input v-model="form.ip"></el-input> <el-input v-model="form.ip"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="contact"> <el-form-item prop="contact">
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="resetForm('form')" class="left" v-if="$route.name =='usersadd'">重置</el-button>
<el-button type="primary" @click="onSubmit('form')" class="right">保存</el-button> <el-button type="primary" @click="onSubmit('form')" class="right">保存</el-button>
<el-button class="right">取消</el-button> <el-button class="right">取消</el-button>
</el-form-item> </el-form-item>
...@@ -99,6 +100,7 @@ ...@@ -99,6 +100,7 @@
</div> </div>
</div> </div>
</template> </template>
...@@ -108,7 +110,7 @@ import { getRole } from "@/utils/common"; ...@@ -108,7 +110,7 @@ import { getRole } from "@/utils/common";
export default { export default {
props: {}, props: {},
components: { components: {
uploadFile uploadFile,
}, },
data() { data() {
return { return {
...@@ -200,6 +202,7 @@ export default { ...@@ -200,6 +202,7 @@ export default {
this.$store.commit('rolefun',data) this.$store.commit('rolefun',data)
this.getOriginArr() this.getOriginArr()
}); });
console.log(this.$route);
}, },
mounted() {}, mounted() {},
methods: { methods: {
...@@ -235,6 +238,9 @@ export default { ...@@ -235,6 +238,9 @@ export default {
return v.url return v.url
}).join(';') }).join(';')
console.log(this.form.fileList) console.log(this.form.fileList)
},
resetForm(formName) {
this.$refs[formName].resetFields();
} }
} }
}; };
...@@ -292,6 +298,9 @@ export default { ...@@ -292,6 +298,9 @@ export default {
float: right; float: right;
margin-left: 20px; margin-left: 20px;
} }
.left{
float: left;
}
.removepic{ .removepic{
display: inline-block; display: inline-block;
margin-top: -40px; margin-top: -40px;
......
<template>
<div>
</div>
</template>
<script>
export default {
props: [],
components: {
},
data() {
return {
};
},
watch: {
},
computed: {
},
created() {
},
mounted() {
},
methods: {
},
};
</script>
<style scoped>
</style>
...@@ -239,22 +239,22 @@ export default new Router({ ...@@ -239,22 +239,22 @@ export default new Router({
component: () => import("@/pages/authority/organization"), component: () => import("@/pages/authority/organization"),
}, },
{ {
path: "/authority/organizationdetail/:id", // 组织管理详情 path: "/authority/organization/detail/:id", // 组织管理详情
name: "organizationdetail", name: "organizationdetail",
component: () => import("@/pages/authority/organizationdetail"), component: () => import("@/pages/authority/organizationdetail"),
}, },
{ {
path: "/authority/organizationedit", // 组织管理组织新增 path: "/authority/organization/add", // 组织管理组织新增
name: "organizationedit", name: "organizationadd",
component: () => import("@/pages/authority/organizationedit"), component: () => import("@/pages/authority/organizationedit"),
}, },
{ {
path: "/authority/organizationedit/:id", // 组织管理组织编辑 path: "/authority/organization/edit/:id", // 组织管理组织编辑
name: "organizationedit", name: "organizationedit",
component: () => import("@/pages/authority/organizationedit"), component: () => import("@/pages/authority/organizationedit"),
}, },
{ {
path: "/authority/organizationuser", // 组织管理组织用户 path: "/authority/organization/user/:id", // 组织管理组织用户
name: "organizationuser", name: "organizationuser",
component: () => import("@/pages/authority/organizationuser"), component: () => import("@/pages/authority/organizationuser"),
}, },
...@@ -263,6 +263,16 @@ export default new Router({ ...@@ -263,6 +263,16 @@ export default new Router({
name: "users", name: "users",
component: () => import("@/pages/authority/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", // 菜单管理页 path: "/authority/menu", // 菜单管理页
name: "menu", name: "menu",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment