From 50b6559f4ca9fd621f30900ca93cdb05b26b2081 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 2 Jul 2024 15:49:21 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=B8=8A=E4=B8=8B=E7=8F=AD?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/base/processInfo.js               |   9 +
 src/api/mes/record/recordStaffCommute.js      |  44 ++
 src/views/mes/base/baseTeamMembers/index.vue  |  22 +-
 .../mes/record/recordStaffCommute/index.vue   | 405 ++++++++++++++++++
 .../mes/record/teamEmployeesWages/index.vue   | 394 +++++++++++++++++
 5 files changed, 872 insertions(+), 2 deletions(-)
 create mode 100644 src/api/mes/record/recordStaffCommute.js
 create mode 100644 src/views/mes/record/recordStaffCommute/index.vue
 create mode 100644 src/views/mes/record/teamEmployeesWages/index.vue

diff --git a/src/api/mes/base/processInfo.js b/src/api/mes/base/processInfo.js
index b0b3d07..59f2ee5 100644
--- a/src/api/mes/base/processInfo.js
+++ b/src/api/mes/base/processInfo.js
@@ -42,3 +42,12 @@ export function delProcessInfo(objId) {
     method: 'delete'
   })
 }
+
+// 查询工序信息列表
+export function getProcessInfoList(query) {
+  return request({
+    url: '/mes/base/processInfo/processInfoList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/mes/record/recordStaffCommute.js b/src/api/mes/record/recordStaffCommute.js
new file mode 100644
index 0000000..8afb170
--- /dev/null
+++ b/src/api/mes/record/recordStaffCommute.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询员工上下班记录列表
+export function listRecordStaffCommute(query) {
+  return request({
+    url: '/mes/record/recordStaffCommute/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询员工上下班记录详细
+export function getRecordStaffCommute(objId) {
+  return request({
+    url: '/mes/record/recordStaffCommute/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增员工上下班记录
+export function addRecordStaffCommute(data) {
+  return request({
+    url: '/mes/record/recordStaffCommute',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改员工上下班记录
+export function updateRecordStaffCommute(data) {
+  return request({
+    url: '/mes/record/recordStaffCommute',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除员工上下班记录
+export function delRecordStaffCommute(objId) {
+  return request({
+    url: '/mes/record/recordStaffCommute/' + objId,
+    method: 'delete'
+  })
+}
diff --git a/src/views/mes/base/baseTeamMembers/index.vue b/src/views/mes/base/baseTeamMembers/index.vue
index ec8c07e..ddbf84f 100644
--- a/src/views/mes/base/baseTeamMembers/index.vue
+++ b/src/views/mes/base/baseTeamMembers/index.vue
@@ -125,6 +125,7 @@
       <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="machineName" v-if="columns[14].visible"/>
+      <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[15].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"/>
@@ -198,6 +199,16 @@
         <el-form-item label="下班时间" prop="endTime">
           <el-input v-model="form.endTime" placeholder="请输入下班时间"/>
         </el-form-item>
+        <el-form-item label="工序名称" prop="processCode">
+          <el-select v-model="form.processCode" placeholder="请选择工序名称">
+            <el-option
+              v-for="item in processInfoList"
+              :key="item.processCode"
+              :label="item.processName"
+              :value="item.processCode"
+            />
+          </el-select>
+        </el-form-item>
 <!--        <el-form-item label="休息时间" prop="dineTime">-->
 <!--          <el-input v-model="form.dineTime" placeholder="请输入休息时间"/>-->
 <!--        </el-form-item>-->
@@ -240,6 +251,7 @@ import {
 } from '@/api/mes/base/baseTeamMembers'
 import { getBaseProductLineList } from '@/api/mes/base/baseProductLine'
 import { getDeviceLedger } from '@/api/mes/base/baseDeviceLedger'
+import { getProcessInfoList } from '@/api/mes/base/processInfo'
 
 export default {
   name: 'BaseTeamMembers',
@@ -314,12 +326,15 @@ export default {
         { key: 11, label: `创建时间`, visible: false },
         { key: 12, label: `更新人`, visible: false },
         { key: 13, label: `更新时间`, visible: false },
-        { key: 14, label: `机台编号`, visible: false }
+        { key: 14, label: `机台编号`, visible: false },
+        { key: 15, label: `工序名称`, visible: true },
       ],
       // 工位选项
       productLineList: [],
       // 设备选项
-      deviceLedgerList: []
+      deviceLedgerList: [],
+      // 工序选项
+      processInfoList: []
     }
   },
   created() {
@@ -329,6 +344,9 @@ export default {
     getDeviceLedger().then(response => {
       this.deviceLedgerList = response.data
     })
+    getProcessInfoList().then(response => {
+      this.processInfoList = response.data
+    })
     this.getList()
   },
   methods: {
diff --git a/src/views/mes/record/recordStaffCommute/index.vue b/src/views/mes/record/recordStaffCommute/index.vue
new file mode 100644
index 0000000..a95f8a8
--- /dev/null
+++ b/src/views/mes/record/recordStaffCommute/index.vue
@@ -0,0 +1,405 @@
+<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="员工ID" prop="staffId">
+        <el-input
+          v-model="queryParams.staffId"
+          placeholder="请输入员工ID"
+          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="上班打卡时间">
+        <el-date-picker
+          v-model="daterangeStartWorkTime"
+          style="width: 340px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="-"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        ></el-date-picker>
+      </el-form-item>
+<!--      <el-form-item label="下班打卡时间">-->
+<!--        <el-date-picker-->
+<!--          v-model="daterangeEndWorkTime"-->
+<!--          style="width: 340px"-->
+<!--          value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--          type="datetimerange"-->
+<!--          range-separator="-"-->
+<!--          start-placeholder="开始时间"-->
+<!--          end-placeholder="结束时间"-->
+<!--        ></el-date-picker>-->
+<!--      </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/record:recordStaffCommute: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/record:recordStaffCommute: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/record:recordStaffCommute: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/record:recordStaffCommute:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="recordStaffCommuteList" @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[14].visible"/>
+      <el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[2].visible"/>
+      <el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[15].visible"/>
+      <el-table-column label="班次" align="center" prop="classes" v-if="columns[3].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="startWorkTime" width="180" v-if="columns[4].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startWorkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="下班打卡时间" align="center" prop="endWorkTime" width="180" v-if="columns[5].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endWorkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="在班时长率" align="center" prop="clockingRatio" v-if="columns[6].visible"/>
+      <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
+      <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[8].visible"/>
+      <el-table-column label="机台编号" align="center" prop="machineCode" v-if="columns[13].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/record:recordStaffCommute:edit']"-->
+<!--          >修改-->
+<!--          </el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['mes/record:recordStaffCommute: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="teamCode">
+          <el-input v-model="form.teamCode" placeholder="请输入班组编号"/>
+        </el-form-item>
+        <el-form-item label="班次" prop="classes">
+          <el-input v-model="form.classes" placeholder="请输入班次"/>
+        </el-form-item>
+<!--        <el-form-item label="上班打卡时间" prop="startWorkTime">-->
+<!--          <el-date-picker clearable-->
+<!--                          v-model="form.startWorkTime"-->
+<!--                          type="date"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          placeholder="请选择上班打卡时间"-->
+<!--          >-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="下班打卡时间" prop="endWorkTime">-->
+<!--          <el-date-picker clearable-->
+<!--                          v-model="form.endWorkTime"-->
+<!--                          type="date"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          placeholder="请选择下班打卡时间"-->
+<!--          >-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+        <el-form-item label="在班时长率" prop="clockingRatio">
+          <el-input v-model="form.clockingRatio" placeholder="请输入在班时长率"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注"/>
+        </el-form-item>
+        <el-form-item label="是否标识" prop="isFlag">
+          <el-input v-model="form.isFlag" placeholder="请输入是否标识"/>
+        </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 {
+  listRecordStaffCommute,
+  getRecordStaffCommute,
+  delRecordStaffCommute,
+  addRecordStaffCommute,
+  updateRecordStaffCommute
+} from '@/api/mes/record/recordStaffCommute'
+
+export default {
+  name: 'RecordStaffCommute',
+  dicts: ['classes', 'is_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 员工上下班记录表格数据
+      recordStaffCommuteList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 机台编号时间范围
+      daterangeStartWorkTime: [],
+      // 机台编号时间范围
+      daterangeEndWorkTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        staffId: null,
+        teamCode: null,
+        classes: null,
+        startWorkTime: null,
+        endWorkTime: null,
+        clockingRatio: null,
+        isFlag: null,
+        machineCode: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: '主键标识不能为空', trigger: 'blur' }
+        ],
+        staffId: [
+          { required: true, message: '员工ID不能为空', 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: false },
+        { key: 8, label: `是否标识`, visible: false },
+        { key: 9, label: `创建人`, visible: false },
+        { 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 },
+        { key: 15, label: `班组名称`, visible: true },
+      ]
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询员工上下班记录列表 */
+    getList() {
+      this.loading = true
+      this.queryParams.params = {}
+      if (null != this.daterangeStartWorkTime && '' != this.daterangeStartWorkTime) {
+        this.queryParams.params['beginStartWorkTime'] = this.daterangeStartWorkTime[0]
+        this.queryParams.params['endStartWorkTime'] = this.daterangeStartWorkTime[1]
+      }
+      // if (null != this.daterangeEndWorkTime && '' != this.daterangeEndWorkTime) {
+      //   this.queryParams.params['beginEndWorkTime'] = this.daterangeEndWorkTime[0]
+      //   this.queryParams.params['endEndWorkTime'] = this.daterangeEndWorkTime[1]
+      // }
+      listRecordStaffCommute(this.queryParams).then(response => {
+        this.recordStaffCommuteList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        staffId: null,
+        teamCode: null,
+        classes: null,
+        startWorkTime: null,
+        endWorkTime: null,
+        clockingRatio: null,
+        remark: null,
+        isFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        machineCode: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeStartWorkTime = []
+      this.daterangeEndWorkTime = []
+      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
+      getRecordStaffCommute(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) {
+            updateRecordStaffCommute(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addRecordStaffCommute(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 delRecordStaffCommute(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/record/recordStaffCommute/export', {
+        ...this.queryParams
+      }, `员工上下班记录_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/src/views/mes/record/teamEmployeesWages/index.vue b/src/views/mes/record/teamEmployeesWages/index.vue
new file mode 100644
index 0000000..05579e1
--- /dev/null
+++ b/src/views/mes/record/teamEmployeesWages/index.vue
@@ -0,0 +1,394 @@
+<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="上班打卡时间">
+        <el-date-picker
+          v-model="daterangeStartWorkTime"
+          style="width: 340px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="-"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        ></el-date-picker>
+      </el-form-item>
+<!--      <el-form-item label="下班打卡时间">-->
+<!--        <el-date-picker-->
+<!--          v-model="daterangeEndWorkTime"-->
+<!--          style="width: 340px"-->
+<!--          value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--          type="datetimerange"-->
+<!--          range-separator="-"-->
+<!--          start-placeholder="开始时间"-->
+<!--          end-placeholder="结束时间"-->
+<!--        ></el-date-picker>-->
+<!--      </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/record:recordStaffCommute: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/record:recordStaffCommute: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/record:recordStaffCommute: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/record:recordStaffCommute:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="recordStaffCommuteList" @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[14].visible"/>
+      <el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[2].visible"/>
+      <el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[15].visible"/>
+      <el-table-column label="班次" align="center" prop="classes" v-if="columns[3].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="startWorkTime" width="180" v-if="columns[4].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startWorkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="下班打卡时间" align="center" prop="endWorkTime" width="180" v-if="columns[5].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endWorkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="在班时长率" align="center" prop="clockingRatio" v-if="columns[6].visible"/>
+      <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
+      <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[8].visible"/>
+      <el-table-column label="机台编号" align="center" prop="machineCode" v-if="columns[13].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/record:recordStaffCommute:edit']"-->
+<!--          >修改-->
+<!--          </el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['mes/record:recordStaffCommute: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="teamCode">
+          <el-input v-model="form.teamCode" placeholder="请输入班组编号"/>
+        </el-form-item>
+        <el-form-item label="班次" prop="classes">
+          <el-input v-model="form.classes" placeholder="请输入班次"/>
+        </el-form-item>
+<!--        <el-form-item label="上班打卡时间" prop="startWorkTime">-->
+<!--          <el-date-picker clearable-->
+<!--                          v-model="form.startWorkTime"-->
+<!--                          type="date"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          placeholder="请选择上班打卡时间"-->
+<!--          >-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="下班打卡时间" prop="endWorkTime">-->
+<!--          <el-date-picker clearable-->
+<!--                          v-model="form.endWorkTime"-->
+<!--                          type="date"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          placeholder="请选择下班打卡时间"-->
+<!--          >-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+        <el-form-item label="在班时长率" prop="clockingRatio">
+          <el-input v-model="form.clockingRatio" placeholder="请输入在班时长率"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注"/>
+        </el-form-item>
+        <el-form-item label="是否标识" prop="isFlag">
+          <el-input v-model="form.isFlag" placeholder="请输入是否标识"/>
+        </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 {
+  listRecordStaffCommute,
+  getRecordStaffCommute,
+  delRecordStaffCommute,
+  addRecordStaffCommute,
+  updateRecordStaffCommute
+} from '@/api/mes/record/recordStaffCommute'
+
+export default {
+  name: 'TeamEmployeesWages',
+  dicts: ['classes', 'is_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 员工上下班记录表格数据
+      recordStaffCommuteList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 机台编号时间范围
+      daterangeStartWorkTime: [],
+      // 机台编号时间范围
+      daterangeEndWorkTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        staffId: null,
+        teamCode: null,
+        classes: null,
+        startWorkTime: null,
+        endWorkTime: null,
+        clockingRatio: null,
+        isFlag: null,
+        machineCode: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: '主键标识不能为空', trigger: 'blur' }
+        ],
+        staffId: [
+          { required: true, message: '员工ID不能为空', 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: false },
+        { key: 8, label: `是否标识`, visible: false },
+        { key: 9, label: `创建人`, visible: false },
+        { 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 },
+        { key: 15, label: `班组名称`, visible: true },
+      ]
+    }
+  },
+  created() {
+    // this.getList()
+  },
+  methods: {
+    /** 查询员工上下班记录列表 */
+    getList() {
+      this.loading = true
+      this.queryParams.params = {}
+      if (null != this.daterangeStartWorkTime && '' != this.daterangeStartWorkTime) {
+        this.queryParams.params['beginStartWorkTime'] = this.daterangeStartWorkTime[0]
+        this.queryParams.params['endStartWorkTime'] = this.daterangeStartWorkTime[1]
+      }
+
+      listRecordStaffCommute(this.queryParams).then(response => {
+        this.recordStaffCommuteList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        staffId: null,
+        teamCode: null,
+        classes: null,
+        startWorkTime: null,
+        endWorkTime: null,
+        clockingRatio: null,
+        remark: null,
+        isFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        machineCode: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeStartWorkTime = []
+      this.daterangeEndWorkTime = []
+      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
+      getRecordStaffCommute(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) {
+            updateRecordStaffCommute(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addRecordStaffCommute(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 delRecordStaffCommute(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/record/recordStaffCommute/export', {
+        ...this.queryParams
+      }, `员工上下班记录_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>