diff --git a/src/api/mes/cal/shift.js b/src/api/mes/cal/shift.js
new file mode 100644
index 0000000..612894c
--- /dev/null
+++ b/src/api/mes/cal/shift.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询计划班次列表
+export function listShift(query) {
+  return request({
+    url: '/mes/cal/shift/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询计划班次详细
+export function getShift(shiftId) {
+  return request({
+    url: '/mes/cal/shift/' + shiftId,
+    method: 'get'
+  })
+}
+
+// 新增计划班次
+export function addShift(data) {
+  return request({
+    url: '/mes/cal/shift',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改计划班次
+export function updateShift(data) {
+  return request({
+    url: '/mes/cal/shift',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除计划班次
+export function delShift(shiftId) {
+  return request({
+    url: '/mes/cal/shift/' + shiftId,
+    method: 'delete'
+  })
+}
diff --git a/src/views/mes/cal/plan/index.vue b/src/views/mes/cal/plan/index.vue
index 1ba1866..23820db 100644
--- a/src/views/mes/cal/plan/index.vue
+++ b/src/views/mes/cal/plan/index.vue
@@ -231,6 +231,14 @@
           </el-col>
         </el-row>
       </el-form>
+      <el-tabs type="border-card" v-if="form.planId != null">
+        <el-tab-pane label="班次">
+          <Shift ref="shiftTab" :planId="form.planId" :optType="optType"></Shift>
+        </el-tab-pane>
+        <el-tab-pane label="班组">
+          
+        </el-tab-pane>
+      </el-tabs>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
         <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
@@ -242,10 +250,12 @@
 
 <script>
 import { listCalplan, getCalplan, delCalplan, addCalplan, updateCalplan } from "@/api/mes/cal/calplan";
+import Shift from "./shift";
 import {genCode} from "@/api/system/autocode/rule"
 export default {
   name: "Calplan",
   dicts: ['mes_shift_method','mes_shift_type'],
+  components: {Shift},
   data() {
     return {
       //自动生成编码
diff --git a/src/views/mes/cal/plan/shift.vue b/src/views/mes/cal/plan/shift.vue
new file mode 100644
index 0000000..cd215f3
--- /dev/null
+++ b/src/views/mes/cal/plan/shift.vue
@@ -0,0 +1,284 @@
+<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:shift: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:shift: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:shift:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="shiftList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="orderNum" />
+      <el-table-column label="班次名称" align="center" prop="shiftName" />
+      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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:shift:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['cal:shift: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="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+            <el-col :span="12">
+                <el-form-item label="序号" prop="orderNum">
+                    <el-input-number :min="1" v-model="form.orderNum" placeholder="请输入序号" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="12">
+                <el-form-item label="班次名称" prop="shiftName">
+                    <el-input v-model="form.shiftName" placeholder="请输入班次名称" />
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="12">
+                <el-form-item label="开始时间" prop="startTime">
+                <el-time-select
+                v-model="form.startTime"
+                placeholder="请选择开始时间"
+                >
+                </el-time-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12">
+                <el-form-item label="结束时间" prop="endTime">
+                <el-time-select
+                v-model="form.endTime"
+                placeholder="请选择结束时间"
+                >                    
+                </el-time-select>
+                </el-form-item>
+            </el-col>
+        </el-row>
+      </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 { listShift, getShift, delShift, addShift, updateShift } from "@/api/mes/cal/shift";
+
+export default {
+  name: "Shift",
+  props: {
+      planId: null,
+      optType: null,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 计划班次表格数据
+      shiftList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        planId: this.planId,
+        orderNum: null,
+        shiftName: null,
+        startTime: null,
+        endTime: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        shiftName: [
+          { required: true, message: "班次名称不能为空", trigger: "blur" }
+        ],
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" }
+        ],
+        endTime: [
+          { required: true, message: "结束时间不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询计划班次列表 */
+    getList() {
+      this.loading = true;
+      listShift(this.queryParams).then(response => {
+        this.shiftList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        shiftId: null,
+        planId: null,
+        orderNum: null,
+        shiftName: null,
+        startTime: null,
+        endTime: 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.shiftId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加班次";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const shiftId = row.shiftId || this.ids
+      getShift(shiftId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改计划班次";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.shiftId != null) {
+            updateShift(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addShift(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const shiftIds = row.shiftId || this.ids;
+      this.$modal.confirm('是否确认删除班次？').then(function() {
+        return delShift(shiftIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+  }
+};
+</script>