|
@@ -107,7 +107,7 @@
|
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
|
<el-form-item label="树权限" prop="showLevel">
|
|
<el-form-item label="树权限" prop="showLevel">
|
|
|
<el-select size="small" clearable v-model="dataForm.showLevel" placeholder="请选择">
|
|
<el-select size="small" clearable v-model="dataForm.showLevel" placeholder="请选择">
|
|
|
- <el-option v-for="(val, index) in treeOptions" :label="val.dictTag" :value="val.dictValue"
|
|
|
|
|
|
|
+ <el-option v-for="(val, index) in treeOptions" :label="val.dictTag" :value="val.dictValue"
|
|
|
:key="index"></el-option>
|
|
:key="index"></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -115,11 +115,21 @@
|
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
|
<el-form-item label="拨号权限" prop="isDial">
|
|
<el-form-item label="拨号权限" prop="isDial">
|
|
|
<el-select size="small" clearable v-model="dataForm.isDial" placeholder="请选择" @change="refreshData">
|
|
<el-select size="small" clearable v-model="dataForm.isDial" placeholder="请选择" @change="refreshData">
|
|
|
- <el-option v-for="(val, index) in isDialOptions" :label="val.label" :value="val.value"
|
|
|
|
|
|
|
+ <el-option v-for="(val, index) in isDialOptions" :label="val.label" :value="val.value"
|
|
|
:key="index"></el-option>
|
|
:key="index"></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
|
|
+ <el-col :span="12">
|
|
|
|
|
+ <el-form-item label="拨号权限账号" prop="dialUserName">
|
|
|
|
|
+ <el-input v-model="dataForm.dialUserName"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="12">
|
|
|
|
|
+ <el-form-item label="拨号权限密码" prop="dialPassWord">
|
|
|
|
|
+ <el-input v-model="dataForm.dialPassWord"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
</el-tabs>
|
|
</el-tabs>
|
|
|
</el-form>
|
|
</el-form>
|
|
@@ -231,7 +241,10 @@ export default {
|
|
|
dialogVisible: false, // 新增编辑界面是否显示
|
|
dialogVisible: false, // 新增编辑界面是否显示
|
|
|
dataForm: { // 人员个人信息
|
|
dataForm: { // 人员个人信息
|
|
|
remark: "",
|
|
remark: "",
|
|
|
- roleId: ""
|
|
|
|
|
|
|
+ roleId: "",
|
|
|
|
|
+ dialUserName:"",
|
|
|
|
|
+ dialPassWord:"",
|
|
|
|
|
+ isDial:"0",
|
|
|
},
|
|
},
|
|
|
// 新增或修改的弹出框End
|
|
// 新增或修改的弹出框End
|
|
|
roleoptions: [],
|
|
roleoptions: [],
|
|
@@ -259,7 +272,7 @@ export default {
|
|
|
//获取所有下拉框数据(字典)
|
|
//获取所有下拉框数据(字典)
|
|
|
this.getRoles();
|
|
this.getRoles();
|
|
|
this.dictList()
|
|
this.dictList()
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
},
|
|
},
|
|
|
mounted() {
|
|
mounted() {
|
|
|
this.findLeftTreeData();// 获取机构树的数据
|
|
this.findLeftTreeData();// 获取机构树的数据
|
|
@@ -297,7 +310,7 @@ export default {
|
|
|
changeRole(roleid) {
|
|
changeRole(roleid) {
|
|
|
this.dataForm.roleId = roleid;
|
|
this.dataForm.roleId = roleid;
|
|
|
},
|
|
},
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**Split 开始 */
|
|
/**Split 开始 */
|
|
|
changeTreeWidth(widthVal) {
|
|
changeTreeWidth(widthVal) {
|
|
|
// 初始化树的宽度
|
|
// 初始化树的宽度
|
|
@@ -355,15 +368,13 @@ export default {
|
|
|
else{
|
|
else{
|
|
|
this.$message.error(res.msg)
|
|
this.$message.error(res.msg)
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}).then(data != null ? data.callback : '')
|
|
}).then(data != null ? data.callback : '')
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
handleTableEdit(params) {
|
|
handleTableEdit(params) {
|
|
|
- // 编辑后线人员
|
|
|
|
|
- // Object.assign(this.dataForm, params.row);
|
|
|
|
|
this.dataForm = Object.assign({}, params.row)
|
|
this.dataForm = Object.assign({}, params.row)
|
|
|
- this.dataForm.isDial='0'
|
|
|
|
|
|
|
+ this.dataForm.isDial=this.dataForm.isDial==null?'0':'1';
|
|
|
this.dataForm.showLevel=this.dataForm.showLevel=='null' || this.dataForm.showLevel==null?'subordinate':this.dataForm.showLevel
|
|
this.dataForm.showLevel=this.dataForm.showLevel=='null' || this.dataForm.showLevel==null?'subordinate':this.dataForm.showLevel
|
|
|
this.dialogVisible = true
|
|
this.dialogVisible = true
|
|
|
},
|
|
},
|
|
@@ -398,13 +409,14 @@ export default {
|
|
|
// 提交
|
|
// 提交
|
|
|
submitForm() {
|
|
submitForm() {
|
|
|
this.$confirm('确认提交吗?', '提示', {}).then(() => {
|
|
this.$confirm('确认提交吗?', '提示', {}).then(() => {
|
|
|
- let params = {
|
|
|
|
|
|
|
+ this.$api.user.saveUserRole({
|
|
|
roleId: this.dataForm.roleId,
|
|
roleId: this.dataForm.roleId,
|
|
|
userId: this.dataForm.id,
|
|
userId: this.dataForm.id,
|
|
|
showLevel: this.dataForm.showLevel,
|
|
showLevel: this.dataForm.showLevel,
|
|
|
isDial: this.dataForm.isDial,
|
|
isDial: this.dataForm.isDial,
|
|
|
- }
|
|
|
|
|
- this.$api.user.saveUserRole(params).then((res) => {
|
|
|
|
|
|
|
+ dialUserName:this.dataForm.dialUserName,
|
|
|
|
|
+ dialPassWord:this.dataForm.dialPassWord,
|
|
|
|
|
+ }).then((res) => {
|
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
|
this.$message({
|
|
this.$message({
|
|
|
message: '操作成功',
|
|
message: '操作成功',
|