Skip to content

W
web-purchase
Commit 489d79c0 authored by 张冬's avatar 张冬
Browse files
Options

权限信息修改和详情

parent f54f3d34
Show whitespace changes
Inline Side-by-side
Showing with 275 additions and 168 deletions
src/api/purchaser/bid.js
View file @ 489d79c0
......@@ -329,22 +329,22 @@ export function bidFailed(data) {
})
}
编辑评标页面接口（专家）
export function bidFailed(data) {
return request({
url: "tender-evaluate/editEvaluate", 三
method: 'post',
data:data
})
}
// 保存编辑(专家)
export function bidFailed(data) {
return request({
url: "tender-evaluate/saveEvaluate",
method: 'post',
data:data
})
}
// 编辑评标页面接口（专家）
// export function bidFailed(data) {
// return request({
// url: "tender-evaluate/editEvaluate", 三
// method: 'post',
// data:data
// })
// }
// // 保存编辑(专家)
// export function bidFailed(data) {
// return request({
// url: "tender-evaluate/saveEvaluate",
// method: 'post',
// data:data
// })
// }
//项目经理中的评标结算按钮
......
src/api/purchaser/organization.js
View file @ 489d79c0
import request from '@/utils/request'
// 添加角色
export function roleadd(data) {
return request({
url:"sys/role/add",
method: 'post',
data:data
})
}
// 角色列表删除
// 成员列表删除
export function userdelete(userId) {
return request({
url:`sys/user/delete/${userId}`,
......@@ -15,14 +8,8 @@ export function userdelete(userId) {
})
}
// 角色列表
export function roleList(companyType) {
return request({
url:`sys/role/roleList?companyType=${companyType}`,
method: 'get',
})
}
// 角色编辑
// 成员编辑
export function useredit(data) {
return request({
url:"sys/user/edit",
......@@ -39,6 +26,36 @@ export function useradd(data) {
data:data
})
}
// 添加角色
export function roleadd(data) {
return request({
url:"sys/role/add",
method: 'post',
data:data
})
}
// 角色列表
export function roleList(companyType) {
return request({
url:`sys/role/roleList?companyType=${companyType}`,
method: 'get',
})
}
// 角色删除
export function roledelete(roleId) {
return request({
url:`sys/role/delete/${roleId}`,
method: 'delete',
})
}
// 角色详情
export function roledetail(roleId) {
return request({
url:`sys/role/detail/${roleId}`,
method: 'get',
})
}
// 验证手机唯一性
export function checkAccount(account) {
return request({
......
src/pages/purchaser/organization/jurisdictionList.vue
View file @ 489d79c0
<template>
<div >
<div>
<div class="content">
<dataBreadcrumb :breads="breads"></dataBreadcrumb>
<el-button type="primary" @click="add">创建新的角色</el-button>
<dataTable :table-data="tableData" :columns="columns" :is-pageobj="false" :tableTop="30">
<el-table-column slot="operate" label="操作" align="center" fixed="right" >
<el-table-column slot="operate" label="操作" align="center" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click="see(scope.row)">查看</el-button>
<el-button type="text" size="small" @click="handdelete(scope.row)" v-if="scope.row.roleId!==1">删除</el-button>
</template>
</el-table-column>
</dataTable>
......@@ -15,9 +16,9 @@
</template>
<script>
import {roleList} from '@api/purchaser/organization'
import dataTable from '@components/nopageTable.vue'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
import { roleList,roledelete } from '@api/purchaser/organization';
import dataTable from '@components/nopageTable.vue';
import dataBreadcrumb from '@components/dataBreadcrumb.vue';
export default {
components: {
dataTable,
......@@ -27,7 +28,8 @@ export default {
return {
breads: ['系统管理', '角色管理'],
tableData: [],
columns: [{
columns: [
{
label: '角色名称',
prop: 'roleName',
width: 400
......@@ -48,38 +50,51 @@ export default {
currentPage: 1,
sizes: [100, 200, 300],
func: (currentPage) => {
this.pageTurning(currentPage)
}
this.pageTurning(currentPage);
}
}
};
},
methods: {
see() {
this.$router.push('/purchaser/organization/jurisdictionSee')
// 删除
async handdelete(row) {
try {
await this.$confirm('确定要删除么？', '提示', {
type: 'warning'
});
const { msg, code } = await roledelete(row.roleId);
if (code == 200) {
this.$message.success(msg);
this.getroleList();
} else {
this.$message.error(msg);
}
} catch (e) {
console.log(e);
}
},
see(row) {
this.$router.push(`/purchaser/organization/jurisdictionSee?id=${row.roleId}`);
},
add(){
this.$router.push("/purchaser/organization/jurisdictionSee")
add() {
this.$router.push('/purchaser/organization/jurisdictionSee');
},
async getroleList() {
let type=JSON.parse(localStorage.getItem("userInfo")).type
const {
data,
code
} = await roleList(type)
for(let item of data){
if(!item.remark){
item.remark="空"
let type = JSON.parse(localStorage.getItem('userInfo')).type;
const { data, code } = await roleList(type);
for (let item of data) {
if (!item.remark) {
item.remark = '空';
}
}
this.tableData=data
this.tableData = data;
}
},
created() {
this.getroleList()
this.getroleList();
}
}
};
</script>
<style scoped>
</style>
src/pages/purchaser/organization/jurisdictionSee.vue
View file @ 489d79c0
......@@ -9,10 +9,19 @@
<div class="message">
<el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm">
<el-form-item label="角色名称" prop="roleName">
<el-input v-model.trim="form.roleName"></el-input>
<el-input v-model.trim="form.roleName" :disabled="state"></el-input>
</el-form-item>
<el-form-item label="权限" prop="menuPOList">
<el-tree :data="data" :default-checked-keys="[1]" :default-expanded-keys="[1]" :props="defaultProps" show-checkbox @check-change="handleCheckChange" node-key="id" ref="tree">
<el-tree
:data="data"
:default-checked-keys="list"
:default-expanded-keys="list"
:props="defaultProps"
show-checkbox
@check-change="handleCheckChange"
node-key="id"
ref="tree"
>
</el-tree>
</el-form-item>
</el-form>
......@@ -20,32 +29,32 @@
</div>
<div class="centerButton">
<el-button @click="back">返回</el-button>
<el-button @click="add">添加</el-button>
<el-button @click="add" v-if="!state">添加</el-button>
</div>
</div>
</template>
<script>
import {
roleMenus,roleadd
} from '@api/purchaser/organization'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
export default {
import { roleMenus, roleadd, roledetail } from '@api/purchaser/organization';
import dataBreadcrumb from '@components/dataBreadcrumb.vue';
export default {
components: {
dataBreadcrumb
},
data() {
let check = async (rule, value, callback) => {
console.log("1")
console.log(this.form.menuPOList.length)
console.log(this.form.menuPOList.length);
if (this.form.menuPOList.length == 0) {
console.log("空")
console.log('空');
return callback(new Error('请选择权限'));
} else {
callback();
}
};
return {
state:false,
list:[1],
detail: '',
breads: ['系统管理', '权限管理'],
data: [],
defaultProps: {
......@@ -53,81 +62,102 @@
label: 'label'
},
form: {
roleName: "",
roleName: '',
menuPOList: []
},
rules: {
roleName: [{
roleName: [
{
required: true,
message: '请填写',
trigger: 'blur'
}],
menuPOList: [{
}
],
menuPOList: [
{
required: true,
validator: check,
trigger: 'change'
}],
}
]
}
};
},
methods: {
back() {
this.$router.go(-1)
this.$router.go(-1);
},
async getroleMenus() {
const {
data,
code
} = await roleMenus(1)
data[0].disabled=true
this.data = data
const { data, code } = await roleMenus(1);
data[0].disabled = true;
this.data = data;
},
handleCheckChange() {
this.form.menuPOList = this.$refs.tree.getCheckedKeys()
this.form.menuPOList = this.$refs.tree.getCheckedKeys();
},
// 详情
async getroledetail(id) {
var { data, code } = await roleMenus(1);
for (let item of data) {
item.disabled = true;
if(item.children){
for(let childrens of item.children){
childrens.disabled = true
}
}
}
this.data = data;
var { data, code } = await roledetail(id);
this.form.roleName=data.roleName
this.list = data.menuIdList;
this.state=true
},
// 添加
async add() {
try {
const valid = await this.$refs['form'].validate()
const valid = await this.$refs['form'].validate();
if (valid) {
let form = this.form
const {
code,
msg
} = await roleadd(form)
let form = this.form;
const { code, msg } = await roleadd(form);
if (code === 200) {
this.$message({
message: msg,
type: 'success',
duration: 1500
})
});
setTimeout(() => {
this.$router.go(-1)
}, 1500)
}else{
this.$message.error(msg)
this.$router.go(-1);
}, 1500);
} else {
this.$message.error(msg);
}
}
} catch (e) {
console.log(e)
console.log(e);
}
}
},
created() {
this.getroleMenus()
this.form.menuPOList=this.list
let id = this.$route.query.id;
if (id) {
this.getroledetail(id);
} else {
this.getroleMenus();
}
}
};
</script>
<style scoped>
.message {
.message {
width: 60%;
margin-left: 50px;
margin-top: 20px;
}
}
.message>div {
.message > div {
margin-bottom: 30px;
}
}
</style>
src/pages/supply/organization/jurisdictionList.vue
View file @ 489d79c0
<template>
<div >
<div>
<div class="content">
<dataBreadcrumb :breads="breads"></dataBreadcrumb>
<el-button type="primary" @click="add">创建新的角色</el-button>
<dataTable :table-data="tableData" :columns="columns" :is-pageobj="false" :tableTop="30">
<el-table-column slot="operate" label="操作" align="center" fixed="right" >
<el-table-column slot="operate" label="操作" align="center" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click="see(scope.row)">查看</el-button>
<el-button type="text" size="small" @click="handdelete(scope.row)" v-if="scope.row.roleId !== 1">删除</el-button>
</template>
</el-table-column>
</dataTable>
......@@ -15,9 +16,9 @@
</template>
<script>
import {roleList} from '@api/purchaser/organization'
import dataTable from '@components/nopageTable.vue'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
import { roleList, roledelete } from '@api/purchaser/organization';
import dataTable from '@components/nopageTable.vue';
import dataBreadcrumb from '@components/dataBreadcrumb.vue';
export default {
components: {
dataTable,
......@@ -27,7 +28,8 @@ export default {
return {
breads: ['系统管理', '角色管理'],
tableData: [],
columns: [{
columns: [
{
label: '角色名称',
prop: 'roleName',
width: 400
......@@ -48,38 +50,51 @@ export default {
currentPage: 1,
sizes: [100, 200, 300],
func: (currentPage) => {
this.pageTurning(currentPage)
}
this.pageTurning(currentPage);
}
}
};
},
methods: {
see() {
this.$router.push('/supply/organization/jurisdictionSee')
// 删除
async handdelete(row) {
try {
await this.$confirm('确定要删除么？', '提示', {
type: 'warning'
});
const { msg, code } = await roledelete(row.roleId);
if (code == 200) {
this.$message.success(msg);
this.getroleList();
} else {
this.$message.error(msg);
}
} catch (e) {
console.log(e);
}
},
see(row) {
this.$router.push(`/supply/organization/jurisdictionSee?id=${row.roleId}`);
},
add(){
this.$router.push("/supply/organization/jurisdictionSee")
add() {
this.$router.push('/supply/organization/jurisdictionSee');
},
async getroleList() {
let type=JSON.parse(localStorage.getItem("userInfo")).type
const {
data,
code
} = await roleList(type)
for(let item of data){
if(!item.remark){
item.remark="空"
let type = JSON.parse(localStorage.getItem('userInfo')).type;
const { data, code } = await roleList(type);
for (let item of data) {
if (!item.remark) {
item.remark = '空';
}
}
this.tableData=data
this.tableData = data;
}
},
created() {
this.getroleList()
this.getroleList();
}
}
};
</script>
<style scoped>
</style>
src/pages/supply/organization/jurisdictionSee.vue
View file @ 489d79c0
......@@ -9,10 +9,19 @@
<div class="message">
<el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm">
<el-form-item label="角色名称" prop="roleName">
<el-input v-model.trim="form.roleName"></el-input>
<el-input v-model.trim="form.roleName" :disabled="state"></el-input>
</el-form-item>
<el-form-item label="权限" prop="menuPOList">
<el-tree :data="data" :default-checked-keys="[7]" :default-expanded-keys="[7]" :props="defaultProps" show-checkbox @check-change="handleCheckChange" node-key="id" ref="tree">
<el-tree
:data="data"
:default-checked-keys="list"
:default-expanded-keys="list"
:props="defaultProps"
show-checkbox
@check-change="handleCheckChange"
node-key="id"
ref="tree"
>
</el-tree>
</el-form-item>
</el-form>
......@@ -20,32 +29,32 @@
</div>
<div class="centerButton">
<el-button @click="back">返回</el-button>
<el-button @click="add">添加</el-button>
<el-button @click="add" v-if="!state">添加</el-button>
</div>
</div>
</template>
<script>
import {
roleMenus,roleadd
} from '@api/purchaser/organization'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
export default {
import { roleMenus, roleadd, roledetail } from '@api/purchaser/organization';
import dataBreadcrumb from '@components/dataBreadcrumb.vue';
export default {
components: {
dataBreadcrumb
},
data() {
let check = async (rule, value, callback) => {
console.log("1")
console.log(this.form.menuPOList.length)
console.log(this.form.menuPOList.length);
if (this.form.menuPOList.length == 0) {
console.log("空")
console.log('空');
return callback(new Error('请选择权限'));
} else {
callback();
}
};
return {
state:false,
list:[7],
detail: '',
breads: ['系统管理', '权限管理'],
data: [],
defaultProps: {
......@@ -53,81 +62,102 @@
label: 'label'
},
form: {
roleName: "",
roleName: '',
menuPOList: []
},
rules: {
roleName: [{
roleName: [
{
required: true,
message: '请填写',
trigger: 'blur'
}],
menuPOList: [{
}
],
menuPOList: [
{
required: true,
validator: check,
trigger: 'change'
}],
}
]
}
};
},
methods: {
back() {
this.$router.go(-1)
this.$router.go(-1);
},
async getroleMenus() {
const {
data,
code
} = await roleMenus(2)
data[0].disabled=true
this.data = data
const { data, code } = await roleMenus(2);
data[0].disabled = true;
this.data = data;
},
handleCheckChange(data, checked, indeterminate) {
console.log(data, checked, indeterminate);
handleCheckChange() {
this.form.menuPOList = this.$refs.tree.getCheckedKeys();
},
// 详情
async getroledetail(id) {
var { data, code } = await roleMenus(2);
for (let item of data) {
item.disabled = true;
if(item.children){
for(let childrens of item.children){
childrens.disabled = true
}
}
}
this.data = data;
var { data, code } = await roledetail(id);
this.form.roleName=data.roleName
this.list = data.menuIdList;
this.state=true
},
// 添加
async add() {
try {
const valid = await this.$refs['form'].validate()
const valid = await this.$refs['form'].validate();
if (valid) {
let form = this.form
const {
code,
msg
} = await roleadd(form)
let form = this.form;
const { code, msg } = await roleadd(form);
if (code === 200) {
this.$message({
message: msg,
type: 'success',
duration: 1500
})
});
setTimeout(() => {
this.$router.go(-1)
}, 1500)
}else{
this.$message.error(msg)
this.$router.go(-1);
}, 1500);
} else {
this.$message.error(msg);
}
}
} catch (e) {
console.log(e)
console.log(e);
}
}
},
created() {
this.getroleMenus()
this.form.menuPOList=this.list
let id = this.$route.query.id;
if (id) {
this.getroledetail(id);
} else {
this.getroleMenus();
}
}
};
</script>
<style scoped>
.message {
.message {
width: 60%;
margin-left: 50px;
margin-top: 20px;
}
}
.message>div {
.message > div {
margin-bottom: 30px;
}
}
</style>
src/utils/common.js
View file @ 489d79c0
......@@ -15,8 +15,8 @@
}
return obj[key];
}
// export let requestUrl = 'http://192.168.3.35:8085';
export let requestUrl = 'http://60.205.251.80:8082';
export let requestUrl = 'http://192.168.3.35:8085';
// export let requestUrl = 'http://60.205.251.80:8082';
// export let homeUrl = 'http://localhost:3000';
......
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