diff --git a/src/api/device/equTeam.js b/src/api/device/equTeam.js
index 3f7c0b9..058fde2 100644
--- a/src/api/device/equTeam.js
+++ b/src/api/device/equTeam.js
@@ -60,11 +60,27 @@ export function listTeamMembers(query) {
   });
 }
 
-// 查询班组列表
-export function getRightList(query) {
+// 查询班组人员列表
+export function getTeamUserList(query) {
   return request({
-    url: '/device/equTeam/getRightList',
+    url: '/device/equTeam/getTeamUserList',
     method: 'get',
     params: query
   });
 }
+
+// 新增设备班组维护
+export function addTeamUser(data) {
+	return request({
+		url: '/device/equTeam/addTeamUser',
+		method: 'post',
+		data: data
+	});
+}
+
+export function delTeamUser(id) {
+	return request({
+		url: '/device/equTeam/delTeamUser/' + id,
+		method: 'post'
+	});
+}
\ No newline at end of file
diff --git a/src/views/device/equTeam/index.vue b/src/views/device/equTeam/index.vue
index d4c1717..f7f98d0 100644
--- a/src/views/device/equTeam/index.vue
+++ b/src/views/device/equTeam/index.vue
@@ -117,12 +117,12 @@
       <el-table-column label="班组编号" align="center" prop="teamCode" />
       <el-table-column label="班组名称" align="center" prop="teamName" />
       <el-table-column label="班组类型" align="center" prop="teamType" />
-      <el-table-column
+      <!--<el-table-column
         label="班组人员"
         align="center"
         prop="teamPerson"
         width="250"
-      />
+      />-->
       <el-table-column label="工厂号" align="center" prop="factoryCode" />
       <el-table-column
         label="操作"
@@ -204,7 +204,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <!--<el-col :span="24">
             <el-form-item label="班组人员" prop="teamPerson">
               <el-input
                 v-model="form.teamPerson"
@@ -213,24 +213,11 @@
               >
               </el-input>
             </el-form-item>
-          </el-col>
+          </el-col>-->
         </el-row>
-        <el-divider></el-divider>
-        <el-card>
-          <div class="my-team">
-            <template>
-              <el-transfer
-                filterable
-                filter-placeholder="请输入班组人员名称"
-                :titles="['可选班组人员', '当前班组人员']"
-                :button-texts="['解除添加', '添加']"
-                :data="leftList"
-                v-model="rightList"
-                style="text-align: left"
-              >
-              </el-transfer>
-            </template>
-          </div>
+        <el-card v-if="form.id!=null">
+          <el-tag>班组成员</el-tag>
+          <ItemUser ref="itemConfUser"></ItemUser>
         </el-card>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -253,10 +240,10 @@ import {
   getRightList,
 } from "@/api/device/equTeam";
 import ItemSelectPerson from "./selectSinglePerson.vue";
-
+import ItemUser from "./itemUser.vue";
 export default {
   name: "EquTeam",
-  components: { ItemSelectPerson },
+  components: { ItemSelectPerson,ItemUser },
   data() {
     return {
       //人员表
@@ -322,36 +309,8 @@ export default {
   },
   created() {
     this.getList();
-    this.getTeamMembers();
   },
   methods: {
-    getTeamMembers() {
-      // 调用列表接口
-      this.queryParams.pageNum = 1;
-      this.queryParams.pageSize = 2000;
-      listTeamMembers(this.queryParams).then((response) => {
-        for (let i in response.rows) {
-          // 将返回的列表赋值于穿梭框左边列表
-          this.leftList.push({
-            key: response.rows[i].userId,
-            label: response.rows[i].teamUserName,
-          });
-          this.peopleList.push({
-            key: response.rows[i].userId,
-            nickName: response.rows[i].nickName,
-          });
-        }
-        //for (let i in response.selected) {
-        //this.rightList.push(response.selected[i].key);
-        //this.form.rightData = this.rightList;
-        //}
-        this.loading = false;
-      });
-    },
-    //人员选择
-    handleSelectPerson() {
-      this.$refs.itemSelectPerson.showFlag = true;
-    },
     //人员选择
     onItemSelectedPerson(obj) {
       this.form.workPerson = obj;
@@ -416,13 +375,12 @@ export default {
       const id = row.id || this.ids;
       getEquTeam(id).then((response) => {
         this.form = response.data;
-        for (let i in response.data.selectedData) {
-          // 将返回的列表赋值于穿梭框右边列表
-          this.rightList.push(response.data.selectedData[i].userId);
-        }
-        console.log("response.data.selectedData", response.data.selectedData);
         this.open = true;
         this.title = "修改设备班组维护";
+        this.$nextTick(() => {
+          this.$refs.itemConfUser.initFunc(id);
+        });
+        
       });
     },
     /** 提交按钮 */
diff --git a/src/views/device/equTeam/itemUser.vue b/src/views/device/equTeam/itemUser.vue
new file mode 100644
index 0000000..e105435
--- /dev/null
+++ b/src/views/device/equTeam/itemUser.vue
@@ -0,0 +1,218 @@
+<template>
+   <div>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+          <el-form-item label="员工工号" prop="userName">
+              <el-input
+                      v-model="queryParams.userName"
+                      placeholder="请输入员工工号"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+              />
+          </el-form-item>
+
+          <el-form-item label="员工姓名" prop="nickName">
+              <el-input
+                      v-model="queryParams.nickName"
+                      placeholder="请输入远工姓名"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+              />
+          </el-form-item>
+
+          <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+          </el-form-item>
+      </el-form>
+      <el-table v-loading="loading" :data="userList"  ref="myTable" >
+        <el-table-column label="序号" align="center" type="index" width="50" />
+        <el-table-column label="员工工号" align="center" prop="userName" width="220"/>
+        <el-table-column label="员工姓名" align="center" prop="nickName" width="220"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    <!-- 添加成员对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+        <SelectUser ref="selectUserRef"  @onSelected="closeAfterSelected"></SelectUser>
+    </el-dialog>
+  </div>  
+</template>
+<script>
+
+import {listTeamMembers,delTeamUser,getTeamUserList} from "@/api/device/equTeam";
+import SelectUser from "./selectUser.vue";
+export default {
+  name: "itemUser",
+  dicts: ["order_type_ll"],
+   components: { SelectUser },
+  data() {
+    return {
+      open: false,
+      showFlag:false,
+      // 选中数组
+      selectedRows: {},
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // BOM产品表格数据
+      userList: null,
+      deptOptions: undefined,
+      //树名称
+      teamId: null,
+      defaultProps: {
+        id: "id",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        teamId: this.teamId,
+      },
+      // 表单校验
+      rules: {
+        fileNo: [{ required: true, message: "受控文件编码不能为空", trigger: "blur" }],
+				startTime: [{ required: true, message: "有效起始时间不能为空", trigger: "blur" }],
+				endTime: [{ required: true, message: "有效结束时间不能为空", trigger: "blur" }]
+      },
+      form:{teamId:this.teamId}
+
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    initFunc(_teamId){
+      this.teamId = _teamId;
+      this.queryParams.teamId = _teamId;
+      this.getList();
+    },
+    /** 查询表格列表*/
+    getList() {
+      this.loading = true;
+      getTeamUserList(this.queryParams).then(response => {
+          this.userList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        //checkType: null,
+        startTime: null,
+        endTime: null,
+        fileNo: null,
+        attr1: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        factoryCode: null,
+        delFlag: null,
+        remark: null,
+        bz: null,
+        fileVersion: null
+      }
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    cancel() {
+      this.showFlag = false;
+      this.userList = [];
+    },
+
+    // 多选框选中数据
+		handleBomSelectionChange(selection) {
+      this.selectedRows = selection;
+		},
+    submitBomForm() {
+      this.$emit('onSelected', this.selectedRows);
+      this.userList = [];
+      this.showFlag = false;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加班组人员";
+
+        this.$nextTick(() => {
+          this.$refs.selectUserRef.initFunc(this.teamId);
+        });
+    },
+
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+          this.form.checkType = this.checkType;
+					if (this.form.id != null) {
+						updateFile(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addFile(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const ids = row.id;
+			this.$modal.confirm('是否确认删除数据？').then(function() {
+				return delTeamUser(ids);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+
+    closeAfterSelected(){
+      this.open = false;
+      this.getList();
+    }
+  }
+};
+</script>
+<style scoped>
+.labelClassName {
+  width: 100%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>