From 766faf222d1db53c14cb696f60313a76b6ed8792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=89=E5=AE=89=E5=90=9B?= <2746727141@qq.com>
Date: Fri, 29 Mar 2024 20:24:44 +0800
Subject: [PATCH] =?UTF-8?q?fix=20commit=20=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BC=81=E4=B8=9A=E7=9A=84=E5=B7=B2=E7=9F=A5?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/index.vue | 52 ++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index b0dc6d1..eeac3a3 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" size="small">
-<!--      <el-form-item label="企业名称" prop="companySign">-->
-<!--        <treeselect-->
-<!--          v-model="queryParams.companySign"-->
-<!--          :options="deptOptions"-->
-<!--          :show-count="true"-->
-<!--          placeholder="请选择上级部门"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="企业名称" prop="companySign">-->
+      <!--        <treeselect-->
+      <!--          v-model="queryParams.companySign"-->
+      <!--          :options="deptOptions"-->
+      <!--          :show-count="true"-->
+      <!--          placeholder="请选择上级部门"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="名称" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
@@ -77,7 +77,7 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       row-key="deptId"
     >
-      <el-table-column label="部门名称" prop="deptName" width="260"></el-table-column>
+      <el-table-column label="企业/部门名称" prop="deptName" width="260"></el-table-column>
       <el-table-column label="企业标识" prop="companySign" width="200"></el-table-column>
       <el-table-column label="状态" prop="status" width="100">
         <template slot-scope="scope">
@@ -108,7 +108,7 @@
           >新增
           </el-button>
           <el-button
-            v-if="scope.row.parentId != 0"
+            v-show="scope.row.parentId !== 0"
             v-hasPermi="['system:dept:remove']"
             icon="el-icon-delete"
             size="mini"
@@ -116,10 +116,29 @@
             @click="handleDelete(scope.row)"
           >删除
           </el-button>
+<!--          删除入驻企业-->
+          <el-button
+          v-show="scope.row.parentId === 0 && scope.row.companySign !== 'ZL'"
+          v-hasPermi="['system:dept:remove']"
+          icon="el-icon-delete"
+          size="mini"
+          type="text"
+          @click="handleDelete(scope.row)"
+          >删除
+          </el-button>
+<!--          <el-button-->
+<!--            v-show="scope.row.parentId != 0"-->
+<!--            v-hasPermi="['system:dept:remove']"-->
+<!--            icon="el-icon-delete"-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--          >删除-->
+<!--          </el-button>-->
         </template>
       </el-table-column>
     </el-table>
-
+    <!--    {{deptList}}-->
 
     <!-- 企业入驻对话框 -->
     <el-dialog :title="title" :visible.sync="openCompany" append-to-body width="600px">
@@ -271,7 +290,7 @@ export default {
       // 是否显示弹出层
       open: false,
       // 是否显示企业入驻对话框
-      openCompany:false,
+      openCompany: false,
       // 是否展开，默认全部展开
       isExpandAll: true,
       // 重新渲染表格状态
@@ -309,7 +328,8 @@ export default {
             trigger: "blur"
           }
         ]
-      }
+      },
+      myCompanySign: "ZL"
     };
   },
   created() {
@@ -436,7 +456,11 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {
       });
-    }
+    },
+    // isZLParent(data) {
+    //   console.dir("删除的结果" + data + (data.companySign !== this.myCompanySign))
+    //   return data.parentId !== 0 || data.companySign === this.companySign
+    // }
   }
 };
 </script>