diff --git a/src/api/mes/cal/teammember.js b/src/api/mes/cal/teammember.js
new file mode 100644
index 0000000..7070f6f
--- /dev/null
+++ b/src/api/mes/cal/teammember.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询班组成员列表
+export function listTeammember(query) {
+  return request({
+    url: '/mes/cal/teammember/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询班组成员详细
+export function getTeammember(memberId) {
+  return request({
+    url: '/mes/cal/teammember/' + memberId,
+    method: 'get'
+  })
+}
+
+// 新增班组成员
+export function addTeammember(data) {
+  return request({
+    url: '/mes/cal/teammember',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改班组成员
+export function updateTeammember(data) {
+  return request({
+    url: '/mes/cal/teammember',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除班组成员
+export function delTeammember(memberId) {
+  return request({
+    url: '/mes/cal/teammember/' + memberId,
+    method: 'delete'
+  })
+}
diff --git a/src/views/mes/cal/team/index.vue b/src/views/mes/cal/team/index.vue
index fc162fe..46d00ba 100644
--- a/src/views/mes/cal/team/index.vue
+++ b/src/views/mes/cal/team/index.vue
@@ -71,7 +71,6 @@
 
     <el-table v-loading="loading" :data="teamList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="班组ID" align="center" prop="teamId" />
       <el-table-column label="班组编号" align="center" prop="teamCode" />
       <el-table-column label="班组名称" align="center" prop="teamName" />
       <el-table-column label="备注" align="center" prop="remark" />
@@ -104,20 +103,41 @@
     />
 
     <!-- 添加或修改班组对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="班组编号" prop="teamCode">
-          <el-input v-model="form.teamCode" placeholder="请输入班组编号" />
-        </el-form-item>
-        <el-form-item label="班组名称" prop="teamName">
-          <el-input v-model="form.teamName" placeholder="请输入班组名称" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="班组编号" prop="teamCode">
+              <el-input v-model="form.teamCode" placeholder="请输入班组编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item  label-width="80">
+              <el-switch v-model="autoGenFlag"
+                  active-color="#13ce66"
+                  active-text="自动生成"
+                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'" >               
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="班组名称" prop="teamName">
+              <el-input v-model="form.teamName" placeholder="请输入班组名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>          
+        </el-row>
       </el-form>
+      <el-divider v-if="form.teamId !=null" content-position="center">项目组成员</el-divider>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+        <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -126,11 +146,14 @@
 
 <script>
 import { listTeam, getTeam, delTeam, addTeam, updateTeam } from "@/api/mes/cal/team";
-
+import {genCode} from "@/api/system/autocode/rule"
 export default {
   name: "Team",
   data() {
     return {
+      //自动生成编码
+      autoGenFlag:false,
+      optType: undefined,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -272,7 +295,17 @@ export default {
       this.download('cal/team/export', {
         ...this.queryParams
       }, `team_${new Date().getTime()}.xlsx`)
-    }
+    },
+    //自动生成编码
+    handleAutoGenChange(autoGenFlag){
+      if(autoGenFlag){
+        genCode('CAL_TEAM_CODE').then(response =>{
+          this.form.teamCode = response;
+        });
+      }else{
+        this.form.teamCode = null;
+      }
+    },
   }
 };
 </script>
diff --git a/src/views/mes/cal/team/member.vue b/src/views/mes/cal/team/member.vue
new file mode 100644
index 0000000..a038615
--- /dev/null
+++ b/src/views/mes/cal/team/member.vue
@@ -0,0 +1,266 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['mes:cal:team:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['mes:cal:team:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['mes:cal:team:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['mes:cal:team:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="teammemberList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户名" align="center" prop="userName" />
+      <el-table-column label="用户昵称" align="center" prop="nickName" />
+      <el-table-column label="电话" align="center" prop="tel" />
+      <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-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['cal:teammember:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['cal:teammember:remove']"
+          >删除</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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户名" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入用户名" />
+        </el-form-item>
+        <el-form-item label="用户昵称" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入用户昵称" />
+        </el-form-item>
+        <el-form-item label="电话" prop="tel">
+          <el-input v-model="form.tel" placeholder="请输入电话" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listTeammember, getTeammember, delTeammember, addTeammember, updateTeammember } from "@/api/mes/cal/teammember";
+
+export default {
+  name: "Teammember",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 班组成员表格数据
+      teammemberList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        teamId: null,
+        userId: null,
+        userName: null,
+        nickName: null,
+        tel: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        teamId: [
+          { required: true, message: "班组ID不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "用户ID不能为空", trigger: "blur" }
+        ],
+        userName: [
+          { required: true, message: "用户名不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询班组成员列表 */
+    getList() {
+      this.loading = true;
+      listTeammember(this.queryParams).then(response => {
+        this.teammemberList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        memberId: null,
+        teamId: null,
+        userId: null,
+        userName: null,
+        nickName: null,
+        tel: null,
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.memberId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加班组成员";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const memberId = row.memberId || this.ids
+      getTeammember(memberId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改班组成员";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.memberId != null) {
+            updateTeammember(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTeammember(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const memberIds = row.memberId || this.ids;
+      this.$modal.confirm('是否确认删除班组成员编号为"' + memberIds + '"的数据项？').then(function() {
+        return delTeammember(memberIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('cal/teammember/export', {
+        ...this.queryParams
+      }, `teammember_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>