change - add班组信息、人员信息

src/api/mes/base/baseStaffInfo.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询员工信息列表
+export function listBaseStaffInfo(query) {
+  return request({
+    url: '/mes/base/baseStaffInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询员工信息详细
+export function getBaseStaffInfo(objId) {
+  return request({
+    url: '/mes/base/baseStaffInfo/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增员工信息
+export function addBaseStaffInfo(data) {
+  return request({
+    url: '/mes/base/baseStaffInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改员工信息
+export function updateBaseStaffInfo(data) {
+  return request({
+    url: '/mes/base/baseStaffInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除员工信息
+export function delBaseStaffInfo(objId) {
+  return request({
+    url: '/mes/base/baseStaffInfo/' + objId,
+    method: 'delete'
+  })
+}

src/api/mes/base/baseTeamMembers.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询班组信息列表
+export function listBaseTeamMembers(query) {
+  return request({
+    url: '/mes/base/baseTeamMembers/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询班组信息详细
+export function getBaseTeamMembers(objId) {
+  return request({
+    url: '/mes/base/baseTeamMembers/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增班组信息
+export function addBaseTeamMembers(data) {
+  return request({
+    url: '/mes/base/baseTeamMembers',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改班组信息
+export function updateBaseTeamMembers(data) {
+  return request({
+    url: '/mes/base/baseTeamMembers',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除班组信息
+export function delBaseTeamMembers(objId) {
+  return request({
+    url: '/mes/base/baseTeamMembers/' + objId,
+    method: 'delete'
+  })
+}

src/views/mes/base/baseCustomData/index.vue

@@ -89,7 +89,7 @@
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/mes/base/baseDeviceLedger/index.vue

@@ -161,7 +161,7 @@
       <el-table-column label="工厂编号" align="center" prop="factoryCode" v-if="columns[17].visible"/>
       <el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[18].visible"/>
       <el-table-column label="资产编号" align="center" prop="assetCode" v-if="columns[19].visible"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/mes/base/baseDeviceParam/index.vue

@@ -122,7 +122,7 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/mes/base/baseFactory/index.vue

@@ -89,7 +89,7 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/mes/base/baseMaterialInfo/index.vue

@@ -122,7 +122,7 @@
       </el-table-column>
       <el-table-column label="商品编码" align="center" prop="productCode" v-if="columns[17].visible"/>
       <el-table-column label="商品名称" align="center" prop="productName" v-if="columns[18].visible"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/mes/base/baseProductLine/index.vue

@@ -108,7 +108,7 @@
       <el-table-column label="执行顺序" align="center" prop="executionSort" v-if="columns[14].visible"/>
       <el-table-column label="日产能(米)" align="center" prop="capacityDay" v-if="columns[15].visible"/>
       <el-table-column label="月产能(米)" align="center" prop="capacityMonth" v-if="columns[16].visible"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/mes/base/baseStaffInfo/index.vue

@@ -0,0 +1,408 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="员工名称" prop="staffName">
+        <el-input
+          v-model="queryParams.staffName"
+          placeholder="请输入员工名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="员工类型" prop="staffType">
+        <el-select v-model="queryParams.staffType" placeholder="请选择员工类型" clearable>
+          <el-option
+            v-for="dict in dict.type.staff_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="卡号" prop="cardId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cardId"-->
+<!--          placeholder="请输入卡号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <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="sex">-->
+<!--        <el-select v-model="queryParams.sex" placeholder="请选择用户性别" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.sys_user_sex"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </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-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/base:baseStaffInfo: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/base:baseStaffInfo: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/base:baseStaffInfo: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/base:baseStaffInfo:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="baseStaffInfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="员工ID" align="center" prop="staffId" v-if="columns[1].visible"/>
+      <el-table-column label="员工名称" align="center" prop="staffName" v-if="columns[2].visible"/>
+      <el-table-column label="员工类型" align="center" prop="staffType" v-if="columns[3].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.staff_type" :value="scope.row.staffType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="卡号" align="center" prop="cardId" v-if="columns[4].visible"/>
+      <el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[5].visible"/>
+      <el-table-column label="手机号" align="center" prop="phoneNumber" v-if="columns[6].visible"/>
+      <el-table-column label="用户性别" align="center" prop="sex" v-if="columns[7].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="卡密" align="center" prop="passWord" v-if="columns[8].visible"/>
+      <el-table-column label="备注" align="center" prop="remark" v-if="columns[14].visible"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes/base:baseStaffInfo:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes/base:baseStaffInfo: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="100px">
+        <el-form-item label="员工ID" prop="staffId">
+          <el-input v-model="form.staffId" placeholder="请输入员工ID"/>
+        </el-form-item>
+        <el-form-item label="员工名称" prop="staffName">
+          <el-input v-model="form.staffName" placeholder="请输入员工名称"/>
+        </el-form-item>
+        <el-form-item label="员工类型" prop="staffType">
+          <el-radio-group v-model="form.staffType">
+            <el-radio
+              v-for="dict in dict.type.staff_type"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="卡号" prop="cardId">
+          <el-input v-model="form.cardId" placeholder="请输入卡号"/>
+        </el-form-item>
+        <el-form-item label="班组编号" prop="teamCode">
+          <el-input v-model="form.teamCode" placeholder="请输入班组编号"/>
+        </el-form-item>
+        <el-form-item label="手机号" prop="phoneNumber">
+          <el-input v-model="form.phoneNumber" placeholder="请输入手机号"/>
+        </el-form-item>
+        <el-form-item label="用户性别" prop="sex">
+          <el-radio-group v-model="form.sex">
+            <el-radio
+              v-for="dict in dict.type.sys_user_sex"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+<!--        <el-form-item label="卡密" prop="passWord">-->
+<!--          <el-input v-model="form.passWord" placeholder="请输入卡密"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="删除标志" prop="delFlag">-->
+<!--          <el-radio-group v-model="form.delFlag">-->
+<!--            <el-radio-->
+<!--              v-for="dict in dict.type.del_flag"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.value"-->
+<!--            >{{ dict.label }}-->
+<!--            </el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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 {
+  listBaseStaffInfo,
+  getBaseStaffInfo,
+  delBaseStaffInfo,
+  addBaseStaffInfo,
+  updateBaseStaffInfo
+} from '@/api/mes/base/baseStaffInfo'
+
+export default {
+  name: 'BaseStaffInfo',
+  dicts: ['staff_type', 'sys_user_sex', 'del_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 员工信息表格数据
+      baseStaffInfoList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        staffId: null,
+        staffName: null,
+        staffType: null,
+        cardId: null,
+        teamCode: null,
+        phoneNumber: null,
+        sex: null,
+        passWord: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: '主键标识不能为空', trigger: 'blur' }
+        ],
+        staffId: [
+          { required: true, message: '员工ID不能为空', trigger: 'blur' }
+        ],
+        staffName: [
+          { required: true, message: '员工名称不能为空', trigger: 'blur' }
+        ],
+        teamCode: [
+          { required: true, message: '班组编号不能为空', trigger: 'blur' }
+        ]
+      },
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `员工ID`, visible: true },
+        { key: 2, label: `员工名称`, visible: true },
+        { key: 3, label: `员工类型`, visible: true },
+        { key: 4, label: `卡号`, visible: true },
+        { key: 5, label: `班组编号`, visible: true },
+        { key: 6, label: `手机号`, visible: true },
+        { key: 7, label: `用户性别`, visible: true },
+        { key: 8, label: `卡密`, visible: false },
+        { key: 9, label: `删除标志`, visible: false },
+        { key: 10, label: `创建者`, visible: false },
+        { key: 11, label: `创建时间`, visible: true },
+        { key: 12, label: `更新者`, visible: false },
+        { key: 13, label: `更新时间`, visible: false },
+        { key: 14, label: `备注`, visible: false }
+      ]
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询员工信息列表 */
+    getList() {
+      this.loading = true
+      listBaseStaffInfo(this.queryParams).then(response => {
+        this.baseStaffInfoList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        staffId: null,
+        staffName: null,
+        staffType: '1',
+        cardId: null,
+        teamCode: null,
+        phoneNumber: null,
+        sex: '2',
+        passWord: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: 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.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加员工信息'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const objId = row.objId || this.ids
+      getBaseStaffInfo(objId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改员工信息'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateBaseStaffInfo(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addBaseStaffInfo(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除员工信息编号为"' + objIds + '"的数据项？').then(function() {
+        return delBaseStaffInfo(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/base/baseStaffInfo/export', {
+        ...this.queryParams
+      }, `baseStaffInfo_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>

src/views/mes/base/baseStation/index.vue

@@ -126,7 +126,7 @@
           <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/mes/base/baseTeamMembers/index.vue

@@ -0,0 +1,403 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+<!--      <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 label="所属工位" prop="stationCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stationCode"-->
+<!--          placeholder="请输入所属工位"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="班次" prop="classes">
+        <el-select v-model="queryParams.classes" placeholder="请选择班次" clearable>
+          <el-option
+            v-for="dict in dict.type.classes"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="启用标识" prop="isFlag">
+        <el-select v-model="queryParams.isFlag" placeholder="请选择启用标识" clearable>
+          <el-option
+            v-for="dict in dict.type.is_flag"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="机台编号" prop="machineCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.machineCode"-->
+<!--          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-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/base:baseTeamMembers: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/base:baseTeamMembers: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/base:baseTeamMembers: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/base:baseTeamMembers:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="baseTeamMembersList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[1].visible"/>
+      <el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[2].visible"/>
+      <el-table-column label="班组负责人" align="center" prop="teamHead" v-if="columns[3].visible"/>
+      <el-table-column label="所属工位" align="center" prop="stationCode" v-if="columns[4].visible"/>
+      <el-table-column label="班次" align="center" prop="classes" v-if="columns[5].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.classes" :value="scope.row.classes"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="上班时间" align="center" prop="startTime" v-if="columns[6].visible"/>
+      <el-table-column label="下班时间" align="center" prop="endTime" v-if="columns[7].visible"/>
+      <el-table-column label="休息时间" align="center" prop="dineTime" v-if="columns[8].visible"/>
+      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[9].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="机台编号" align="center" prop="machineCode" v-if="columns[14].visible"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes/base:baseTeamMembers:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes/base:baseTeamMembers: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="100px">
+        <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="teamHead">
+          <el-input v-model="form.teamHead" placeholder="请输入班组负责人"/>
+        </el-form-item>
+        <el-form-item label="所属工位" prop="stationCode">
+          <el-input v-model="form.stationCode" placeholder="请输入所属工位"/>
+        </el-form-item>
+        <el-form-item label="班次" prop="classes">
+          <el-radio-group v-model="form.classes">
+            <el-radio
+              v-for="dict in dict.type.classes"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="上班时间" prop="startTime">
+          <el-input v-model="form.startTime" placeholder="请输入上班时间"/>
+        </el-form-item>
+        <el-form-item label="下班时间" prop="endTime">
+          <el-input v-model="form.endTime" placeholder="请输入下班时间"/>
+        </el-form-item>
+        <el-form-item label="休息时间" prop="dineTime">
+          <el-input v-model="form.dineTime" placeholder="请输入休息时间"/>
+        </el-form-item>
+        <el-form-item label="启用标识" prop="isFlag">
+          <el-radio-group v-model="form.isFlag">
+            <el-radio
+              v-for="dict in dict.type.is_flag"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="机台编号" prop="machineCode">
+          <el-input v-model="form.machineCode" 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 {
+  listBaseTeamMembers,
+  getBaseTeamMembers,
+  delBaseTeamMembers,
+  addBaseTeamMembers,
+  updateBaseTeamMembers
+} from '@/api/mes/base/baseTeamMembers'
+
+export default {
+  name: 'BaseTeamMembers',
+  dicts: ['classes', 'is_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 班组信息表格数据
+      baseTeamMembersList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        teamCode: null,
+        teamName: null,
+        teamHead: null,
+        stationCode: null,
+        classes: null,
+        startTime: null,
+        endTime: null,
+        dineTime: null,
+        isFlag: null,
+        machineCode: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: '主键标识不能为空', trigger: 'blur' }
+        ]
+      },
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `班组编号`, visible: true },
+        { key: 2, label: `班组名称`, visible: true },
+        { key: 3, label: `班组负责人`, visible: true },
+        { key: 4, label: `所属工位`, visible: true },
+        { key: 5, label: `班次`, visible: true },
+        { key: 6, label: `上班时间`, visible: true },
+        { key: 7, label: `下班时间`, visible: true },
+        { key: 8, label: `休息时间`, visible: false },
+        { key: 9, label: `启用标识`, visible: true },
+        { key: 10, label: `创建人`, visible: false },
+        { key: 11, label: `创建时间`, visible: false },
+        { key: 12, label: `更新人`, visible: false },
+        { key: 13, label: `更新时间`, visible: false },
+        { key: 14, label: `机台编号`, visible: true }
+      ]
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询班组信息列表 */
+    getList() {
+      this.loading = true
+      listBaseTeamMembers(this.queryParams).then(response => {
+        this.baseTeamMembersList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        teamCode: null,
+        teamName: null,
+        teamHead: null,
+        stationCode: null,
+        classes: null,
+        startTime: null,
+        endTime: null,
+        dineTime: null,
+        isFlag: '0',
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        machineCode: 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.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加班组信息'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const objId = row.objId || this.ids
+      getBaseTeamMembers(objId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改班组信息'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateBaseTeamMembers(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addBaseTeamMembers(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除班组信息编号为"' + objIds + '"的数据项？').then(function() {
+        return delBaseTeamMembers(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/base/baseTeamMembers/export', {
+        ...this.queryParams
+      }, `baseTeamMembers_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>