From 98ffe7a9d94dc5c2a5c805cb71986a91a4211f74 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 20 Aug 2024 16:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/team/index.vue | 64 +++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/views/base/team/index.vue b/src/views/base/team/index.vue
index 06ee054..51d1023 100644
--- a/src/views/base/team/index.vue
+++ b/src/views/base/team/index.vue
@@ -1,21 +1,21 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <!-- <el-form-item label="关键字" prop="postName">
+        <el-form-item label="关键字" prop="keyWord">
           <el-input
-            v-model="queryParams.postName"
+            v-model="queryParams.keyWord" 
             placeholder="请输入关键字"
-            clearable
+            clearable maxlength="20"
             @keyup.enter.native="handleQuery"
           />
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="班组名称" prop="teamName">
           <el-input
             v-model="queryParams.teamName"
             placeholder="请输入班组名称"
             clearable
             @keyup.enter.native="handleQuery"
-            maxlength="30"
+            maxlength="20"
           />
         </el-form-item>
         <el-form-item label="班组长" prop="teamLeader">
@@ -24,17 +24,18 @@
             placeholder="请输入班组长"
             clearable
             @keyup.enter.native="handleQuery"
-            maxlength="30"
+            maxlength="20"
           />
         </el-form-item>
-        <!-- <el-form-item label="项目部" prop="roleCode">
+        <el-form-item label="工程名称" prop="proName">
           <el-input
-            v-model="queryParams.roleCode"
-            placeholder="请输入项目部"
+            v-model="queryParams.proName"
+            placeholder="请输入工程名称"
             clearable
             @keyup.enter.native="handleQuery"
+            maxlength="20"
           />
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -193,24 +194,28 @@
             </el-form-item>
             </el-form>
             <!-- 表格 -->
-            <el-table :data="memberList">
+            <el-table :data="memberList" border="1">
                 <el-table-column label="序号" align="center" type="index" />
-                <el-table-column label="姓名" align="center" prop="name" />
-                <el-table-column label="性别" align="center" prop="sex" width="60">
-                <template slot-scope="scope">
+                <el-table-column label="姓名" align="left" prop="name">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.name }}</span> <span class="teamLeaderBox" v-if="scope.row.isTeamLeader==1">班组长</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="性别" align="left" prop="sex" width="60">
+                    <template slot-scope="scope">
                         <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
                     </template>
                 </el-table-column>
-                <el-table-column label="身份证号" align="center" prop="idCard" width="180"/>
-                <el-table-column label="电话" align="center" prop="phone" />
+                <el-table-column label="身份证号" align="left" prop="idCard" width="180"/>
+                <el-table-column label="电话" align="left" prop="phone" />
             
-                <el-table-column label="状态" align="center" prop="workStatus">
+                <el-table-column label="状态" align="left" prop="workStatus">
                     <template slot-scope="scope">
-                        <div v-if="scope.row.workStatus==0" style="color: green;">{{ workStateList[Number(scope.row.workStatus)] }}</div>
+                        <div v-if="scope.row.workStatus==0" style="color: #19BE6B;">{{ workStateList[Number(scope.row.workStatus)] }}</div>
                         <div v-if="scope.row.workStatus==1" style="color: grey;">{{ workStateList[Number(scope.row.workStatus)] }}</div>
                     </template>
                 </el-table-column>
-                <el-table-column label="手环编码" align="center" prop="braceletCode">
+                <el-table-column label="手环编码" align="left" prop="braceletCode">
                     <template slot-scope="scope">
                         <div>{{ scope.row.braceletCode || '- -'}}</div>
                         
@@ -384,9 +389,11 @@
           pageSize: 10,
           teamName:'',
           teamLeader:'',
-          roleCode: this.$store.getters.roleCode,
-          departId: this.$store.getters.departId,
-          teamId: this.$store.getters.teamId,
+          proName:'',
+          keyWord:'',
+        //   roleCode: this.$store.getters.roleCode,
+        //   departId: this.$store.getters.departId,
+        //   teamId: this.$store.getters.teamId,
         },
         stateList:['正常','已解散'],
         workStateList:['在施工','未施工'],
@@ -724,4 +731,17 @@
     .dialog-header{
         width: 100%;height: 60px;background-color: #F2F2F2;display: flex;align-items: center;justify-content: center;
     }
+    .teamLeaderBox{
+        width: 40px;
+        height: 20px;
+        line-height: 20px;
+        text-align: center;
+        display: inline-block;
+        font-size: 10px;
+        background: #E7F4EE;
+        border: 1px solid #19BE6B;
+        border-radius: 20px;
+        margin-left: 5px;
+        color: #19BE6B;
+    }
 </style>
\ No newline at end of file