diff --git a/src/const/maintenance/basics.js b/src/const/maintenance/basics.js index 4ce56d0..7ad77bb 100644 --- a/src/const/maintenance/basics.js +++ b/src/const/maintenance/basics.js @@ -148,6 +148,7 @@ export const tableOption = { label: website.adminDept, prop: "deptName", align: "left", + span: 8, overHidden: true, addDisplay: false, editDisplay: false, diff --git a/src/permission.js b/src/permission.js index fdf7cf4..4f1cd7d 100644 --- a/src/permission.js +++ b/src/permission.js @@ -27,7 +27,7 @@ router.beforeEach((to, from, next) => { next({ path: '/newlogin' }) }) } else { - console.log('登录重新刷新======',to,from) + // console.log('登录重新刷新======',to,from) const value = to.query.src || to.fullPath; const label = to.query.name || to.name; const meta = to.meta || router.$avueRouter.meta || {}; diff --git a/src/views/maintenance/system.vue b/src/views/maintenance/system.vue index c6e51cd..251c19f 100644 --- a/src/views/maintenance/system.vue +++ b/src/views/maintenance/system.vue @@ -327,6 +327,7 @@ export default { dataBaseIp, dataBasePort, deptId, + deptName, systemName, type } = tmp @@ -353,6 +354,19 @@ export default { this.form.company = company; this.form.companyName = companyName; } + //判断部门名称是否存在 + const _idx2 = this.findObject(this.option.column,"deptId").dicData.findIndex(item => item.id == deptId); + console.log('_idx2',_idx2,this.findObject(this.option.column,"deptId").dicData,deptId,deptName) + if(_idx2 > -1){ + this.findObject(this.option.column,"deptId").display = true; + this.findObject(this.option.column,"deptName").addDisplay = false; + } + else{ + this.findObject(this.option.column,"deptId").display = false; + this.findObject(this.option.column,"deptName").addDisplay = true; + this.findObject(this.option.column,"deptName").disabled = true; + this.form.deptName = deptName; + } this.form.dataBaseIp = dataBaseIp; this.form.dataBasePort = dataBasePort; this.form.deptId = deptId; diff --git a/src/views/plugin/workflow/process/components/detail.vue b/src/views/plugin/workflow/process/components/detail.vue index 4e9ef85..1ef9a72 100644 --- a/src/views/plugin/workflow/process/components/detail.vue +++ b/src/views/plugin/workflow/process/components/detail.vue @@ -572,7 +572,8 @@ export default { const deptDate = await getDepts({ id: yunweigongsi }); const guanlibumen = this.findObject(option.column, "guanlibumen"); guanlibumen.dicData = deptDate.data.data; - + //管理部门无论是否删除-回显部门名称文本 + variables.guanlibumen = variables.$guanlibumen; // 数据库