【修改】nacos启动类名称修改,Banner修改
【修改】字典多选组件回显Bug修改,调整用户模块的edit方法,确保数据逻辑
This commit is contained in:
@@ -84,7 +84,6 @@
|
||||
:disabled="disableSubmit"
|
||||
v-model="model.departIds"
|
||||
:options="nextDepartOptions"
|
||||
@change="nextDepartChange"
|
||||
placeholder="请选择负责部门">
|
||||
</j-multi-select-tag>
|
||||
</a-form-model-item>
|
||||
@@ -108,11 +107,9 @@
|
||||
<a-input placeholder="请输入手机号码" :disabled="isDisabledAuth('user:form:phone')" v-model="model.phone" />
|
||||
</a-form-model-item>
|
||||
|
||||
<!--
|
||||
<a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<j-dict-select-tag v-model="model.activitiSync" placeholder="请选择是否同步工作流引擎" :type="'radio'" dictCode="activiti_sync"/>
|
||||
</a-form-model-item>
|
||||
-->
|
||||
<!-- <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
|
||||
<!-- <j-dict-select-tag v-model="model.activitiSync" placeholder="请选择是否同步工作流引擎" :type="'radio'" dictCode="activiti_sync"/>-->
|
||||
<!-- </a-form-model-item>-->
|
||||
|
||||
</a-form-model>
|
||||
</a-spin>
|
||||
@@ -216,7 +213,6 @@ import { JSEncrypt } from 'jsencrypt'
|
||||
that.visible = true;
|
||||
//根据屏幕宽度自适应抽屉宽度
|
||||
this.resetScreenSize();
|
||||
that.userId = record.id;
|
||||
that.model = Object.assign({},{selectedroles:'',selecteddeparts:''}, record);
|
||||
//身份为上级显示负责部门,否则不显示
|
||||
if(this.model.userIdentity==2){
|
||||
@@ -226,6 +222,7 @@ import { JSEncrypt } from 'jsencrypt'
|
||||
}
|
||||
|
||||
if(record.hasOwnProperty("id")){
|
||||
that.userId = record.id;
|
||||
that.getUserRoles(record.id);
|
||||
that.getUserDeparts(record.id);
|
||||
}
|
||||
@@ -504,11 +501,7 @@ import { JSEncrypt } from 'jsencrypt'
|
||||
}else{
|
||||
this.departIdShow=true;
|
||||
}
|
||||
},
|
||||
nextDepartChange(e){
|
||||
console.log("11", e)
|
||||
console.log("22", this.model.departIds)
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user