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 @@
+
@@ -198,6 +199,16 @@
+
+
+
+
+
@@ -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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.startWorkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+ {{ parseTime(scope.row.endWorkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.startWorkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+ {{ parseTime(scope.row.endWorkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+