From 9b45ba17009f0e2d6cda493078f9a30a5997bfdd Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 8 Aug 2024 09:16:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=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                  | 15 ++++++++-------
 src/views/construction/deviceReceive/index.vue |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/base/team/index.vue b/src/views/base/team/index.vue
index ab793c2..f88d518 100644
--- a/src/views/base/team/index.vue
+++ b/src/views/base/team/index.vue
@@ -233,13 +233,13 @@
                 </el-col>
 
                 <el-col :span="12">
-                    <el-form-item label="班组长" prop="leaderPhone">
-                        <el-select v-model="form.leaderPhone" placeholder="请选择班组长" clearable filterable style="width: 100%;" @change="changeLeader">
+                    <el-form-item label="班组长" prop="teamLeaderId">
+                        <el-select v-model="form.teamLeaderId" placeholder="请选择班组长" clearable filterable style="width: 100%;" @change="changeLeader">
                             <el-option
                             v-for="item in personList"
-                            :key="item.phone"
+                            :key="item.id"
                             :label="item.name+'-'+item.phone"
-                            :value="item.phone"
+                            :value="item.id"
                             />
                         </el-select>
                     </el-form-item>
@@ -396,7 +396,7 @@
             teamName: [
                 { required: true, message: "班组名称不能为空", trigger: "blur" }
             ],
-            leaderPhone: [
+            teamLeaderId: [
                 { required: true, message: "班组长不能为空", trigger: "change" }
             ],
             // userIdArrIds: [
@@ -437,8 +437,9 @@
         changeLeader(val){
             console.log(val)
             this.personList.forEach(item=>{
-                if(item.phone==val){
+                if(item.id==val){
                     this.form.teamLeader = item.name;
+                    this.form.leaderPhone = item.phone;
                 }
             })
         },
@@ -462,7 +463,7 @@
             this.form = {
                 teamName: undefined,
                 teamLeader: undefined,
-                leaderPhone: undefined,
+                teamLeaderId: undefined,
                 proId: undefined,
                 userIdArr: undefined,
                 userIdArrIds: undefined,
diff --git a/src/views/construction/deviceReceive/index.vue b/src/views/construction/deviceReceive/index.vue
index a316a55..51455b5 100644
--- a/src/views/construction/deviceReceive/index.vue
+++ b/src/views/construction/deviceReceive/index.vue
@@ -98,7 +98,7 @@
         <el-table-column label="项目部名称" align="center" prop="departName" />
         <el-table-column label="作业杆塔名称" align="center" prop="powerName" />
         <el-table-column label="领用班组" align="center" prop="teamName" />
-        <el-table-column label="领用设备类型" align="center" prop="devType" />
+        <el-table-column label="领用设备类型" align="center" prop="deviceTypeName" />
         <el-table-column label="设备名称" align="center" prop="devName" />
         <el-table-column label="领用设备编码" align="center" prop="devCode" />
         <!-- <el-table-column label="班组负责人" align="center" prop="bindNum"></el-table-column> -->