From 2f4f530c2aa7c965916408db9b6fe96c82176e67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=89=E5=A4=B4=E5=BC=BA?=
 <5661595+jxjzh@user.noreply.gitee.com>
Date: Thu, 2 May 2024 19:36:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personModule/administration.vue           | 43 ++++++++++---------
 .../personModule/laborComponent.vue           | 10 ++---
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index 8b7213b4..91ab9b4d 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -38,7 +38,7 @@
           </el-input>
         </div>
         <div class="list_content">
-          <div
+          <!-- <div
             v-if="enterpriseListData.length > 0"
             class="flex content_data"
             :class="checkedId == item.id && 'checkedName'"
@@ -53,8 +53,7 @@
             >
               {{ item.enterpriseName }}
             </div>
-            <!-- 编辑和删除企业 -->
-          <div class="flex2" v-if="checkedId == item.id">
+            <div class="flex2" v-if="checkedId == item.id">
               <img
                 v-permission="{key: 'rygl_editCompany', menuPath: '/project/labor/personManage'}"
                 src="@/assets/images/icon-edit.png"
@@ -69,7 +68,7 @@
                 @click="deleteEnterpriseInfo(item)"
               />
             </div>
-          </div>
+          </div> -->
           <el-tree
             :data="enterpriseTreeData"
             node-key="id"
@@ -81,19 +80,21 @@
           >
             <span class="custom-tree-node" slot-scope="{ node, data }">
               <span>{{ data.enterpriseName }}</span>
-              <!--              <div class="flex2" v-if="checkedId == data.id">-->
-              <!--                <img-->
-              <!--                  src="@/assets/images/icon-edit.png"-->
-              <!--                  style="margin-right: 16px"-->
-              <!--                  class="icon"-->
-              <!--                  @click="editEnterpriseInfo(data)"-->
-              <!--                />-->
-              <!--                <img-->
-              <!--                  src="@/assets/images/icon-delete.png"-->
-              <!--                  class="icon"-->
-              <!--                  @click="deleteEnterpriseInfo(data)"-->
-              <!--                />-->
-              <!--              </div>-->
+                           <div class="flex2" v-if="checkedId == data.id">
+                             <img
+                              v-permission="{key: 'rygl_editCompany', menuPath: '/project/labor/personManage'}"
+                               src="@/assets/images/icon-edit.png"
+                               style="margin-right: 16px"
+                               class="icon"
+                               @click="editEnterpriseInfo(data)"
+                             />
+                             <img
+                              v-permission="{key: 'rygl_deleteCompany', menuPath: '/project/labor/personManage'}"
+                               src="@/assets/images/icon-delete.png"
+                               class="icon"
+                               @click="deleteEnterpriseInfo(data)"
+                             />
+                           </div>
             </span>
           </el-tree>
           <!-- <div v-if="enterpriseTreeData.length == 0" style="margin-top: 50%">
@@ -275,10 +276,10 @@
             size="medium"
             @click="passEquipment()"
             type="primary"
-            style="margin-left: 5px"
+            style="margin-left: 5px;margin-right:10px"
             >下发通行设备</el-button
           >
-          <br />
+          <!-- <br /> -->
           <el-form
             :inline="true"
             :model="tableParameter"
@@ -288,7 +289,7 @@
             <el-form-item :label="$t('message.laborMange.workingState')">
               <el-select
                 v-model="tableParameter.inserviceType"
-                style="width: 120px"
+                style="width: 80px"
               >
                 <el-option
                   :label="$t('message.laborMange.all')"
@@ -333,7 +334,7 @@
             </el-form-item>
             <el-form-item :label="$t('message.laborMange.compellation')">
               <el-input
-                style="width: 120px"
+                style="width: 100px"
                 v-model="tableParameter.workerName"
                 :placeholder="$t('message.laborMange.placeholder2')"
               ></el-input>
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index b28cfb33..c7fbf244 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -228,10 +228,10 @@
             size="medium"
             @click="passEquipment()"
             type="primary"
-            style="margin-left: 5px"
+            style="margin-left: 5px;margin-right:10px"
             >下发通行设备</el-button
           >
-          <br />
+          <!-- <br /> -->
           <el-form
             :inline="true"
             :model="tableParameter"
@@ -242,7 +242,7 @@
             <el-form-item :label="$t('message.laborMange.workingState')">
               <el-select
                 v-model="tableParameter.inserviceType"
-                style="width: 120px"
+                style="width: 80px"
               >
                 <el-option
                   :label="$t('message.laborMange.all')"
@@ -264,7 +264,7 @@
             >
               <el-select
                 v-model="tableParameter.codeState"
-                style="width: 120px"
+                style="width: 80px"
               >
                 <el-option
                   :label="$t('message.laborMange.all')"
@@ -290,7 +290,7 @@
             </el-form-item>
             <el-form-item :label="$t('message.laborMange.compellation')">
               <el-input
-                style="width: 120px"
+                style="width: 100px"
                 v-model="tableParameter.workerName"
                 :placeholder="$t('message.laborMange.placeholder2')"
               ></el-input>