Commit 8b7a7983 authored by 冷冷's avatar 冷冷

🐛 Fixing a bug. some bugs

parent 7eeeabad
...@@ -64,6 +64,7 @@ export const tableOption = { ...@@ -64,6 +64,7 @@ export const tableOption = {
}, { }, {
label: '排序', label: '排序',
prop: 'sort', prop: 'sort',
type: 'number',
rules: [{ rules: [{
required: true, required: true,
message: '请输入排序', message: '请输入排序',
......
...@@ -41,10 +41,11 @@ export const tableOption = { ...@@ -41,10 +41,11 @@ export const tableOption = {
label: 'id', label: 'id',
prop: 'userId', prop: 'userId',
span: 24, span: 24,
hide: true,
editDisabled: true, editDisabled: true,
addVisdiplay: false, addVisdiplay: false,
}, { }, {
width: 150, width: 120,
fixed: true, fixed: true,
label: '用户名', label: '用户名',
prop: 'username', prop: 'username',
...@@ -83,13 +84,27 @@ export const tableOption = { ...@@ -83,13 +84,27 @@ export const tableOption = {
formsolt: true, formsolt: true,
solt: true, solt: true,
span: 24, span: 24,
hide: true,
rules: [{ rules: [{
required: true, required: true,
message: "请选择部门", message: "请选择部门",
trigger: "blur" trigger: "blur"
}] }]
}, { }, {
width: 150, width: 120,
label: '手机号',
prop: 'phone',
type: 'phone',
value: '',
span: 24,
rules: [{
min: 6,
max: 20,
message: "长度在 11 个字符",
trigger: "blur"
}]
},{
width: 120,
label: '角色', label: '角色',
prop: 'role', prop: 'role',
formsolt: true, formsolt: true,
...@@ -117,7 +132,7 @@ export const tableOption = { ...@@ -117,7 +132,7 @@ export const tableOption = {
value: "0" value: "0"
}, { }, {
label: '锁定', label: '锁定',
value: "1" value: "9"
}] }]
}, { }, {
width: 180, width: 180,
...@@ -131,4 +146,4 @@ export const tableOption = { ...@@ -131,4 +146,4 @@ export const tableOption = {
addVisdiplay: false, addVisdiplay: false,
span: 24, span: 24,
}] }]
} }
\ No newline at end of file
...@@ -60,12 +60,6 @@ ...@@ -60,12 +60,6 @@
@click="handleScreen"></i> @click="handleScreen"></i>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark"
content="用户头像"
placement="bottom">
<img class="top-bar__img"
:src="userInfo.avatar">
</el-tooltip>
<el-dropdown> <el-dropdown>
<span class="el-dropdown-link"> <span class="el-dropdown-link">
{{userInfo.username}} {{userInfo.username}}
......
...@@ -115,6 +115,7 @@ export default { ...@@ -115,6 +115,7 @@ export default {
message: '删除成功', message: '删除成功',
type: 'success' type: 'success'
}) })
this.refreshChange()
}) })
.catch(function(err) { }) .catch(function(err) { })
}, },
...@@ -133,6 +134,7 @@ export default { ...@@ -133,6 +134,7 @@ export default {
message: '修改成功', message: '修改成功',
type: 'success' type: 'success'
}) })
this.refreshChange()
done() done()
}) })
}, },
...@@ -150,6 +152,7 @@ export default { ...@@ -150,6 +152,7 @@ export default {
message: '添加成功', message: '添加成功',
type: 'success' type: 'success'
}) })
this.refreshChange()
done() done()
}) })
}, },
......
This diff is collapsed.
...@@ -133,6 +133,7 @@ export default { ...@@ -133,6 +133,7 @@ export default {
message: '修改成功', message: '修改成功',
type: 'success' type: 'success'
}) })
this.getList(this.page)
done() done()
}) })
}, },
...@@ -150,6 +151,7 @@ export default { ...@@ -150,6 +151,7 @@ export default {
message: '添加成功', message: '添加成功',
type: 'success' type: 'success'
}) })
this.getList(this.page)
done() done()
}) })
}, },
......
...@@ -101,7 +101,8 @@ ...@@ -101,7 +101,8 @@
</el-form-item> </el-form-item>
<el-form-item label="排序" <el-form-item label="排序"
prop="sort"> prop="sort">
<el-input v-model="form.sort" <el-input type="number"
v-model="form.sort"
:disabled="formEdit" :disabled="formEdit"
placeholder="请输入排序"></el-input> placeholder="请输入排序"></el-input>
</el-form-item> </el-form-item>
......
...@@ -114,7 +114,7 @@ export default { ...@@ -114,7 +114,7 @@ export default {
type: 'warning' type: 'warning'
}) })
.then(function () { .then(function () {
return delObj(row.clientId) return delObj(row.id)
}) })
.then(data => { .then(data => {
_this.tableData.splice(index, 1) _this.tableData.splice(index, 1)
...@@ -123,6 +123,7 @@ export default { ...@@ -123,6 +123,7 @@ export default {
message: '删除成功', message: '删除成功',
type: 'success' type: 'success'
}) })
this.refreshChange()
}) })
.catch(function (err) { }) .catch(function (err) { })
}, },
...@@ -141,7 +142,8 @@ export default { ...@@ -141,7 +142,8 @@ export default {
message: '修改成功', message: '修改成功',
type: 'success' type: 'success'
}) })
done() this.refreshChange()
done()
}) })
}, },
/** /**
...@@ -158,6 +160,7 @@ export default { ...@@ -158,6 +160,7 @@ export default {
message: '添加成功', message: '添加成功',
type: 'success' type: 'success'
}) })
this.refreshChange()
done() done()
}) })
}, },
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
slot-scope="scope"> slot-scope="scope">
<span v-for="(role,index) in scope.row.roleList" <span v-for="(role,index) in scope.row.roleList"
:key="index"> :key="index">
<el-tag>{{role.roleDesc}} </el-tag>&nbsp;&nbsp; <el-tag>{{role.roleName}} </el-tag>&nbsp;&nbsp;
</span> </span>
</template> </template>
<template slot="deptId" <template slot="deptId"
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
slot-scope="scope"> slot-scope="scope">
<avue-crud-select v-model="role" <avue-crud-select v-model="role"
multiple multiple
placeholder="请选择角色,要先选择部门" placeholder="请选择角色"
:dic="rolesOptions" :dic="rolesOptions"
:props="roleProps"></avue-crud-select> :props="roleProps"></avue-crud-select>
</template> </template>
...@@ -135,7 +135,7 @@ export default { ...@@ -135,7 +135,7 @@ export default {
treeDeptData: [], treeDeptData: [],
checkedKeys: [], checkedKeys: [],
roleProps: { roleProps: {
label: "roleDesc", label: "roleName",
value: 'roleId' value: 'roleId'
}, },
defaultProps: { defaultProps: {
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<el-form-item label="用户名" <el-form-item label="用户名"
prop="username"> prop="username">
<el-input type="text" <el-input type="text"
:value="userInfo.username" v-model="ruleForm2.username"
disabled></el-input> disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="原密码" <el-form-item label="原密码"
...@@ -102,6 +102,7 @@ export default { ...@@ -102,6 +102,7 @@ export default {
Authorization: 'Bearer ' + getToken() Authorization: 'Bearer ' + getToken()
}, },
ruleForm2: { ruleForm2: {
username: '',
password: '', password: '',
newpassword1: '', newpassword1: '',
newpassword2: '' newpassword2: ''
...@@ -114,11 +115,12 @@ export default { ...@@ -114,11 +115,12 @@ export default {
} }
}, },
created () { created () {
this.ruleForm2.username = this.userInfo.username
}, },
computed: { computed: {
...mapState({ ...mapState({
userInfo: state => state.user.userInfo userInfo: state => state.user.userInfo
}) }),
}, },
methods: { methods: {
submitForm (formName) { submitForm (formName) {
......
const url = 'http://zn.huaxiadaowei.com' const url = 'http://localhost:9999'
module.exports = { module.exports = {
lintOnSave: true, lintOnSave: true,
productionSourceMap: false, productionSourceMap: false,
...@@ -66,4 +66,4 @@ module.exports = { ...@@ -66,4 +66,4 @@ module.exports = {
}, },
} }
} }
} }
\ No newline at end of file
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