change - add员工打卡记录

src/api/mes/record/recordStaffAttendance.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询员工打卡记录列表
+export function listRecordStaffAttendance(query) {
+  return request({
+    url: '/mes/record/recordStaffAttendance/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询员工打卡记录详细
+export function getRecordStaffAttendance(objId) {
+  return request({
+    url: '/mes/record/recordStaffAttendance/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增员工打卡记录
+export function addRecordStaffAttendance(data) {
+  return request({
+    url: '/mes/record/recordStaffAttendance',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改员工打卡记录
+export function updateRecordStaffAttendance(data) {
+  return request({
+    url: '/mes/record/recordStaffAttendance',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除员工打卡记录
+export function delRecordStaffAttendance(objId) {
+  return request({
+    url: '/mes/record/recordStaffAttendance/' + objId,
+    method: 'delete'
+  })
+}

src/views/mes/prod/prodOrderInfo/index.vue

@@ -56,10 +56,10 @@
           end-placeholder="结束时间"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="是否已下达计划" prop="isRelease">
+      <el-form-item label="下计划标识" prop="isRelease">
-        <el-select v-model="queryParams.isRelease" placeholder="请选择是否已下达计划" clearable>
+        <el-select v-model="queryParams.isRelease" placeholder="请选择下计划标识" clearable>
           <el-option
-            v-for="dict in dict.type.finish_flag"
+            v-for="dict in dict.type.is_release"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -182,7 +182,7 @@
         </template>
       </el-table-column>
       <el-table-column label="工厂编号" align="center" prop="factoryCode" v-if="columns[17].visible"/>
-      <el-table-column label="是否已下达计划" align="center" prop="isRelease" v-if="columns[18].visible">
+      <el-table-column label="下计划标识" align="center" prop="isRelease" v-if="columns[18].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.finish_flag" :value="scope.row.isRelease"/>
         </template>
@@ -319,7 +319,7 @@
         <el-form-item label="工厂编号" prop="factoryCode">
           <el-input v-model="form.factoryCode" placeholder="请输入工厂编号"/>
         </el-form-item>
-        <el-form-item label="是否已下达计划" prop="isRelease">
+        <el-form-item label="下计划标识" prop="isRelease">
           <el-radio-group v-model="form.isRelease">
             <el-radio
               v-for="dict in dict.type.finish_flag"
@@ -358,7 +358,7 @@ import {
 
 export default {
   name: 'ProdOrderInfo',
-  dicts: ['finish_flag', 'order_status'],
+  dicts: ['finish_flag', 'order_status', 'is_release'],
   data() {
     return {
       // 遮罩层
@@ -439,7 +439,7 @@ export default {
         { key: 15, label: `实际开始时间`, visible: true },
         { key: 16, label: `实际完成时间`, visible: true },
         { key: 17, label: `工厂编号`, visible: true },
-        { key: 18, label: `是否已下达计划`, visible: true },
+        { key: 18, label: `下计划标识`, visible: true },
         { key: 19, label: `工作中心`, visible: false },
         { key: 20, label: `工艺路线`, visible: false },
         { key: 21, label: `打印名称`, visible: false },

src/views/mes/record/recordStaffAttendance/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="员工ID" prop="staffId">
+        <el-input
+          v-model="queryParams.staffId"
+          placeholder="请输入员工ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="打卡类型" prop="attendanceType">
+        <el-select v-model="queryParams.attendanceType" placeholder="请选择打卡类型" clearable>
+          <el-option
+            v-for="dict in dict.type.attendance_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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="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="daterangeCreateTime"
+          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:recordStaffAttendance: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:recordStaffAttendance: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:recordStaffAttendance: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:recordStaffAttendance:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="recordStaffAttendanceList" @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="attendanceType" v-if="columns[2].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.attendance_type" :value="scope.row.attendanceType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[3].visible"/>
+      <el-table-column label="班次" align="center" prop="classes" v-if="columns[4].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="remark" v-if="columns[5].visible"/>
+      <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[6].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="createBy" v-if="columns[7].visible"/>
+      <el-table-column label="打卡时间" align="center" prop="createTime" width="180" v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[9].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[10].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="机台编号" align="center" prop="machineCode" v-if="columns[11].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:recordStaffAttendance:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes/record:recordStaffAttendance: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="attendanceType">
+          <el-radio-group v-model="form.attendanceType">
+            <el-radio
+              v-for="dict in dict.type.attendance_type"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </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-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="remark">
+          <el-input v-model="form.remark" 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>
+      <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 {
+  listRecordStaffAttendance,
+  getRecordStaffAttendance,
+  delRecordStaffAttendance,
+  addRecordStaffAttendance,
+  updateRecordStaffAttendance
+} from '@/api/mes/record/recordStaffAttendance'
+
+export default {
+  name: 'RecordStaffAttendance',
+  dicts: ['attendance_type', 'classes', 'is_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 员工打卡记录表格数据
+      recordStaffAttendanceList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 是否标识时间范围
+      daterangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        staffId: null,
+        attendanceType: null,
+        teamCode: null,
+        classes: null,
+        isFlag: null,
+        createTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { 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: false },
+        { key: 7, label: `创建人`, visible: false },
+        { key: 8, label: `打卡时间`, visible: true },
+        { key: 9, label: `更新人`, visible: false },
+        { key: 10, label: `更新时间`, visible: false },
+        { key: 11, label: `机台编号`, visible: true }
+      ]
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询员工打卡记录列表 */
+    getList() {
+      this.loading = true
+      this.queryParams.params = {}
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params['beginCreateTime'] = this.daterangeCreateTime[0]
+        this.queryParams.params['endCreateTime'] = this.daterangeCreateTime[1]
+      }
+      listRecordStaffAttendance(this.queryParams).then(response => {
+        this.recordStaffAttendanceList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        staffId: null,
+        attendanceType: null,
+        teamCode: null,
+        classes: null,
+        remark: null,
+        isFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCreateTime = []
+      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
+      getRecordStaffAttendance(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) {
+            updateRecordStaffAttendance(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addRecordStaffAttendance(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 delRecordStaffAttendance(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/record/recordStaffAttendance/export', {
+        ...this.queryParams
+      }, `recordStaffAttendance_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>