From 7f06a938e1b06aa67b43e1f11a65f94fafde4c8d Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Wed, 21 Jun 2023 08:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E9=97=A8=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E5=A4=84=E7=90=86=EF=BC=9A1.=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=AF=A6=E6=83=852.=E5=91=A8=E6=9C=9F?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=853.=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=BF=90=E7=BB=B4=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/const/maintenance/basics.js                    |  1 +
 src/permission.js                                  |  2 +-
 src/views/maintenance/system.vue                   | 14 ++++++++++++++
 .../plugin/workflow/process/components/detail.vue  |  3 ++-
 4 files changed, 18 insertions(+), 2 deletions(-)

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;
           
          
           // 数据库