diff --git a/src/api/mes/cal/planteam.js b/src/api/mes/cal/planteam.js
new file mode 100644
index 0000000..66ed8dd
--- /dev/null
+++ b/src/api/mes/cal/planteam.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 查询计划班组列表
+export function listPlanteam(query) {
+  return request({
+    url: '/mes/cal/planteam/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增计划班组
+export function addPlanteam(data) {
+  return request({
+    url: '/mes/cal/planteam',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除计划班组
+export function delPlanteam(recordId) {
+  return request({
+    url: '/mes/cal/planteam/' + recordId,
+    method: 'delete'
+  })
+}
diff --git a/src/components/calTeamSelect/multi.vue b/src/components/calTeamSelect/multi.vue
new file mode 100644
index 0000000..7209110
--- /dev/null
+++ b/src/components/calTeamSelect/multi.vue
@@ -0,0 +1,132 @@
+<template>
+  <el-dialog title="班组选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="80%"
+    center
+  >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="班组编号" prop="teamCode">
+        <el-input
+          v-model="queryParams.teamCode"
+          placeholder="请输入班组编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="班组名称" prop="teamName">
+        <el-input
+          v-model="queryParams.teamName"
+          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 icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="teamList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="班组编号" align="center" prop="teamCode" >
+      </el-table-column>
+      <el-table-column label="班组名称" align="center" prop="teamName" />
+      <el-table-column label="备注" align="center" prop="remark" />
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确 定</el-button>
+        <el-button @click="showFlag=false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { listTeam} from "@/api/mes/cal/team";
+export default {
+  name: "TeamSelect",
+  data() {
+    return {
+      showFlag:false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      selectedRows:[],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 班组表格数据
+      teamList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        teamCode: null,
+        teamName: null,
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询班组列表 */
+    getList() {
+      this.loading = true;
+      listTeam(this.queryParams).then(response => {
+        this.teamList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.teamId)
+      this.selectedRows = selection;
+    },
+    //确定选中
+    confirmSelect(){
+        if(this.selectedRows == null || this.selectedRows.size == 0){
+            this.$notify({
+                title:'提示',
+                type:'warning',
+                message: '请至少选择一条数据!'
+            });
+            return;
+        }
+        this.$emit('onSelected',this.selectedRows);
+        this.showFlag = false;
+    }
+  }
+};
+</script>
diff --git a/src/views/mes/cal/plan/index.vue b/src/views/mes/cal/plan/index.vue
index 23820db..ec4e695 100644
--- a/src/views/mes/cal/plan/index.vue
+++ b/src/views/mes/cal/plan/index.vue
@@ -236,7 +236,7 @@
           <Shift ref="shiftTab" :planId="form.planId" :optType="optType"></Shift>
         </el-tab-pane>
         <el-tab-pane label="班组">
-          
+          <Team  ref="teamTab" :planId="form.planId" :optType="optType"></Team>
         </el-tab-pane>
       </el-tabs>
       <div slot="footer" class="dialog-footer">
@@ -251,11 +251,12 @@
 <script>
 import { listCalplan, getCalplan, delCalplan, addCalplan, updateCalplan } from "@/api/mes/cal/calplan";
 import Shift from "./shift";
+import Team  from "./team";
 import {genCode} from "@/api/system/autocode/rule"
 export default {
   name: "Calplan",
   dicts: ['mes_shift_method','mes_shift_type'],
-  components: {Shift},
+  components: {Shift,Team},
   data() {
     return {
       //自动生成编码
diff --git a/src/views/mes/cal/plan/team.vue b/src/views/mes/cal/plan/team.vue
new file mode 100644
index 0000000..cd47552
--- /dev/null
+++ b/src/views/mes/cal/plan/team.vue
@@ -0,0 +1,132 @@
+<template>
+  <div class="app-container">
+    <el-row>
+        <el-col :span="12">
+            <el-card class="box-card">
+                <div slot="header" class="clearfix">
+                    <span>班组</span>
+                    <el-button style="float: right; padding: 3px 0" v-if="optType !='view'" @click="handleAdd" type="text">添加</el-button>
+                </div>
+                <el-table v-loading="loading" :data="teamList" @row-click="onRowClick">
+                    <el-table-column label="班组编号" align="center" prop="teamCode" >
+                    </el-table-column>
+                    <el-table-column label="班组名称" align="center" prop="teamName" />
+                    <el-table-column label="操作" align="center" v-if="optType !='view'" class-name="small-padding fixed-width">
+                        <template slot-scope="scope">
+                        <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-delete"
+                            @click="handleDelete(scope.row)"
+                            v-hasPermi="['mes:cal:plan:edit']"
+                        >删除</el-button>
+                        </template>
+                    </el-table-column>                    
+                </el-table>           
+                <TeamSelect ref="teamSelect" @onSelected="onTeamSelected"></TeamSelect>    
+            </el-card>
+        </el-col>
+        <el-col :span="12">
+            <el-card class="box-card">
+                <div slot="header" class="clearfix">
+                    <span>成员</span>                    
+                </div>
+                <el-table v-loading="loading" :data="teammemberList">
+                    <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>
+            </el-card>
+        </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { listPlanteam,  delPlanteam, addPlanteam } from "@/api/mes/cal/planteam";
+import { listTeammember } from "@/api/mes/cal/teammember";
+import TeamSelect from "@/components/calTeamSelect/multi.vue"
+export default {
+    name:"PlanTeam",
+    components:{TeamSelect},
+    props:{
+        planId:null,
+        optType:null
+    },
+    data(){
+        return {
+            // 遮罩层
+            loading: true,
+            //班组表格数据
+            teamList:[],
+            // 班组成员表格数据
+            teammemberList: [],
+            form:{},
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                planId: this.planId,
+                teamId: null,
+                teamCode: null,
+                teamName: null,
+            },
+        }
+    },
+    created() {
+        this.getTeamList();     
+        this.getMemberList(null);   
+    },
+    methods:{
+        getTeamList(){
+            this.loading = true;
+            listPlanteam(this.queryParams).then(response => {
+                this.teamList = response.rows;                
+                this.loading = false;
+            });
+        },
+        getMemberList(id){
+            var param = {
+                teamId:id
+            }
+            this.loading = true;
+            listTeammember(param).then(response => {
+                this.teammemberList = response.rows;
+                this.loading = false;
+            });
+        },
+        onRowClick(row){
+            this.getMemberList(row.teamId);
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.$refs.teamSelect.showFlag = true;
+        },
+        onTeamSelected(rows){
+            rows.forEach(team => {
+                this.form.teamId = team.teamId;
+                this.form.teamCode = team.teamCode;
+                this.form.teamName = team.teamName;
+                this.form.planId = this.planId;
+                addPlanteam(this.form).then(response => {
+                    this.getTeamList();
+                    this.getMemberList(null);
+                });
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const recordIds = row.recordId
+            this.$modal.confirm('是否确认删除班组？').then(function() {
+                return delPlanteam(recordIds);
+            }).then(() => {
+                this.getTeamList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+        },
+    }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file