Merge remote-tracking branch 'origin/master'

master
mengjiao 4 months ago
commit ea3bb0b03d

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询MES打卡记录列表
export function listAttendanceRecords(query) {
return request({
url: '/mes/AttendanceRecords/list',
method: 'get',
params: query
})
}
// 查询MES打卡记录详细
export function getAttendanceRecords(id) {
return request({
url: '/mes/AttendanceRecords/' + id,
method: 'get'
})
}
// 新增MES打卡记录
export function addAttendanceRecords(data) {
return request({
url: '/mes/AttendanceRecords',
method: 'post',
data: data
})
}
// 修改MES打卡记录
export function updateAttendanceRecords(data) {
return request({
url: '/mes/AttendanceRecords',
method: 'put',
data: data
})
}
// 删除MES打卡记录
export function delAttendanceRecords(id) {
return request({
url: '/mes/AttendanceRecords/' + id,
method: 'delete'
})
}

@ -0,0 +1,317 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="员工号" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入员工号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户名称" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="上班打卡时间" prop="startTime" :label-width="'100px'">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
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:AttendanceRecords: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:AttendanceRecords: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:AttendanceRecords: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:AttendanceRecords:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="AttendanceRecordsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="员工号" align="center" prop="userId" />
<el-table-column label="员工名称" align="center" prop="userName" />
<el-table-column label="考勤状态" align="center" prop="attendanceStatus" />
<el-table-column label="上班打卡时间" align="center" prop="startTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="产线" align="center" prop="startAddr" />
<el-table-column label="岗位" align="center" prop="post" />
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改MES打卡记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="用户名称" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名称" />
</el-form-item>
<el-form-item label="年龄" prop="age">
<el-input v-model="form.age" placeholder="请输入年龄" />
</el-form-item>
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model="form.idNumber" placeholder="请输入身份证号" />
</el-form-item>
<el-form-item label="上班打卡时间" prop="startTime">
<el-date-picker clearable
v-model="form.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择上班打卡时间">
</el-date-picker>
</el-form-item>
<el-form-item label="上班打卡地点" prop="startAddr">
<el-input v-model="form.startAddr" placeholder="请输入上班打卡地点" />
</el-form-item>
<el-form-item label="下班打卡时间" prop="endTime">
<el-date-picker clearable
v-model="form.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择下班打卡时间">
</el-date-picker>
</el-form-item>
<el-form-item label="下班打开地点" prop="endAddr">
<el-input v-model="form.endAddr" placeholder="请输入下班打开地点" />
</el-form-item>
<el-form-item label="考勤时间段" prop="attendanceTime">
<el-input v-model="form.attendanceTime" placeholder="请输入考勤时间段" />
</el-form-item>
<el-form-item label="考勤日期" prop="attendanceDate">
<el-date-picker clearable
v-model="form.attendanceDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择考勤日期">
</el-date-picker>
</el-form-item>
<el-form-item label="工作时长" prop="workHours">
<el-input v-model="form.workHours" placeholder="请输入工作时长" />
</el-form-item>
<el-form-item label="岗位" prop="post">
<el-input v-model="form.post" 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 { listAttendanceRecords, getAttendanceRecords, delAttendanceRecords, addAttendanceRecords, updateAttendanceRecords } from "@/api/mes/AttendanceRecords";
export default {
name: "AttendanceRecords",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// MES
AttendanceRecordsList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
userId: null,
userName: null,
attendanceStatus: null,
startTime: null,
attendanceTime: null,
post: null
},
//
form: {},
//
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询MES打卡记录列表 */
getList() {
this.loading = true;
listAttendanceRecords(this.queryParams).then(response => {
this.AttendanceRecordsList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
userId: null,
userName: null,
attendanceStatus: null,
sex: null,
age: null,
idNumber: null,
startTime: null,
startAddr: null,
endTime: null,
endAddr: null,
attendanceTime: null,
attendanceDate: null,
workHours: null,
createTime: null,
post: 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.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加MES打卡记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getAttendanceRecords(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改MES打卡记录";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateAttendanceRecords(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addAttendanceRecords(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除MES打卡记录编号为"' + ids + '"的数据项?').then(function() {
return delAttendanceRecords(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/AttendanceRecords/export', {
...this.queryParams
}, `AttendanceRecords_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -14,7 +14,6 @@
<el-input v-model="queryParams.productCode" placeholder="请输入产品编码" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable
@keyup.enter.native="handleQuery" />

@ -1,34 +1,24 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<el-form-item label="工单编码/SAP订单号/产品编码" prop="keywords">
<el-form-item label="订单号/物料号" prop="workorderCodeSap">
<el-input
v-model="queryParams.keywords"
placeholder="工单编码/SAP订单号/产品编码"
v-model="queryParams.workorderCodeSap"
placeholder="请输入订单号/产品号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生产时间" prop="feedbackTimeArray">
<el-form-item label="工单生产时间" prop="dateRange">
<el-date-picker
v-model="queryParams.feedbackTimeArray"
format="yyyy-MM-dd"
type="datetimerange"
range-separator="至"
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="SAP报工结果" prop="uploadStatus">
<el-select v-model="queryParams.uploadStatus" placeholder="请选择结果" clearable>
<!-- <el-option-->
<!-- v-for="item in uploadStatusList"-->
<!-- :key="item.dictValue"-->
<!-- :label="item.dictLabel"-->
<!-- :value="item.dictValue">-->
<!-- </el-option>-->
</el-select>
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>
@ -36,51 +26,55 @@
</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:reportWork:add']"
>新增</el-button>
</el-col>
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="24" :xs="24">-->
<!-- <div>-->
<!-- <ul class="list-group list-group-striped">-->
<!-- <li class="list-group-item">-->
<!-- 订单号{{ user.workorderCodeSap }}-->
<!-- </li>-->
<!-- <li class="list-group-item">-->
<!-- 生产版本{{ user.atrr2 }}-->
<!-- </li>-->
<!-- <li class="list-group-item">-->
<!-- 产品编码{{ user.materialCode }}-->
<el-col :span="1.5">
<!-- </li>-->
<!-- <li class="list-group-item">-->
<!-- 产品名称{{ user.materialName }}-->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- </li>-->
<!-- <li class="list-group-item">-->
<!-- 计划数量<el-tag>{{ user.planNumber }}</el-tag>{{ user.unit }}-->
<!-- </li>-->
<!-- <li class="list-group-item">-->
<!-- 生产数量<el-tag>{{ user.proNumber }}</el-tag>{{ user.unit }}-->
<!-- </li>-->
<!-- </ul>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-table
v-loading="loading" :data="reportWorkList" @selection-change="handleSelectionChange"
row-key="id"
lazy
:load="load"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="selection" align="center" />
<el-table-column label="SAP订单编码" align="center" prop="workorderCodeSap" width="130">
</el-table-column>
<el-table-column label="产品编码" align="center" prop="productCode" width="130"
v-loading="loading" :data="reportWorkList" :row-style="rowStyle">
<el-table-column label="订单号" align="center" prop="workorderCodeSap" />
<el-table-column label="工单日期" align="center" prop="productDate" />
<el-table-column label="工单数量" align="center" prop="orderQuantity" />
<el-table-column label="生产数量" align="center" prop="quantityFeedback" />
<el-table-column label="物料编码" align="center" prop="materialCode" width="130"
:formatter="productCodeFormate"
/>
<el-table-column label="线体编码" align="center" prop="machineCode" />
<el-table-column label="线体名称" align="center" prop="machineName" />
<el-table-column label="产品名称" align="center" prop="productName" width="220" :show-overflow-tooltip="true" />
<el-table-column label="排产数量" align="center" prop="quantity" width="100"/>
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="累计报工数量" align="center" prop="quantityFeedback" width="100"/>
<el-table-column label="累计用人数" align="center" prop="useMan" width="100"/>
<el-table-column label="累计工时" align="center" prop="workTime" />
<el-table-column label="生产时间" align="center" prop="productDate" width="100"/>
<el-table-column label="SAP报工状态" align="center" prop="uploadStatus" width="150"/>
<el-table-column label="SAP报工时间" align="center" prop="uploadTime" width="150"/>
<el-table-column label="SAP报工信息" align="center" prop="uploadMsg" width="150" :show-overflow-tooltip="true"/>
<el-table-column label="物料名称" align="center" prop="materialName" />
<el-table-column label="领料单数量" align="center" prop="standar" />
<el-table-column label="标准领料数量" align="center" prop="should" />
<el-table-column label="实际领料数量" align="center" prop="quantity"/>
<el-table-column label="差异" align="center" prop="diff" />
<el-table-column label="单位" align="center" prop="erfme" />
<el-table-column label="反冲标识" align="center" prop="recoil" />
</el-table>
<pagination
@ -97,12 +91,16 @@
<script>
import { listReportWorks} from "@/api/mes/reportWorks";
import {
getProdLineList
} from '@/api/plan/workorder'
import moment from 'moment';
export default {
name: "ReportWork",
dicts: ['report_type'],
data() {
return {
user: {},
optType: undefined,
//
loading: true,
@ -118,7 +116,6 @@ export default {
//
total: 0,
consumeTotal:0,
// SAPCD:"",
//
title: "",
titleConsume:"",
@ -133,161 +130,58 @@ export default {
consumePageSize:10,
reportCode:null,
},
prodLineList:[],
//
dateRange: [],
//
queryParams: {
createTimeArray: [],
feedbackTimeArray: [],
pageNum: 1,
pageSize: 10,
reportType: null,
reportCode: null,
workorderCode: null,
productCode: null,
productName: null,
spec: null,
unit: null,
quantity: null,
quantityFeedback: null,
quantityQualified: null,
quantityUnqualified: null,
userName: null,
nickName: null,
feedbackChannel: null,
feedbackTime: null,
recordUser: null,
status: null,
workTime: null,
machineCode: null,
machineName: null,
teamCode: null,
shiftId: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
workorderCodeSap: null,
parentOrder:null,
uploadStatus:"0"
},
//
form: {
endReport:'0',
consumesInfos:[]
},
formSAdd: {
endReport:'0'
},
teamList:[],
batchList:[],
//
},
};
},
created() {
//this.getDate();
this.getList();
getProdLineList().then(response => {
this.prodLineList = response
})
},
methods: {
//
productCodeFormate(row, column, cellValue){
return cellValue.slice(7,18); //
},
/**获取默认查询时间段**/
getDate() {
// let start = this.Fungetdate (0)
// let end = this.Fungetdate (1)
//this.queryParams.createTimeArray.push(start,end)
//this.queryParams.feedbackTimeArray.push(start,end)
this.getList();
/** 动态设置行样式 */
rowStyle({ row, rowIndex }) {
if (row.standar < row.quantity) {
return { backgroundColor: '#ffcccc' }; //
} else if (row.standar > row.quantity) {
return { backgroundColor: '#ccffcc' }; // 绿
}
return {}; //
},
Fungetdate (num) {``
var dd = new Date();
dd.setDate(dd.getDate() + num);
var y = dd.getFullYear();
var m = dd.getMonth() + 1;//
var d = dd.getDate();
return y + "-" + m + "-" + d;
},
/** 查询报工报表列表 */
getList() {
/**
if(this.queryParams.createTimeArray !=null && this.queryParams.createTimeArray.length>0){
this.queryParams.createTimeStart = moment(this.queryParams.createTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.createTimeEnd = moment(this.queryParams.createTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}**/
// if(this.queryParams.feedbackTimeArray !=null && this.queryParams.feedbackTimeArray.length>0){
// this.queryParams.feedbackTimeStart = moment(this.queryParams.feedbackTimeArray[0]).format('YYYY-MM-DD');
// this.queryParams.feedbackTimeEnd = moment(this.queryParams.feedbackTimeArray[1]).format('YYYY-MM-DD');
// }
this.loading = true;
listReportWorks(this.queryParams).then(response => {
listReportWorks(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.reportWorkList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.openReport = false;
this.openReportSAP=false;
this.openConsume = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
reportType: 'UNI',
reportCode: null,
workorderCode: null,
productCode: null,
productName: null,
spec: null,
unit: null,
quantity: null,
quantityFeedback: null,
quantityQualified: null,
quantityUnqualified: null,
userName: null,
nickName: null,
feedbackChannel: 'PC',
feedbackTime: null,
recordUser: null,
status: null,
remark: null,
workTime: null,
machineCode: null,
machineName: null,
teamCode: null,
shiftId: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateTime: null,
updateBy: null,
endReport:'0'
};
this.resetForm("form");
this.pOrderTableList = [];
this.sOrderTableList = [];
this.pReportRows = [];
this.sReportRows = [];
this.reportRows = [];
this.pConsumeTableList = [];
this.sConsumeTableList = [];
this.pConsumeRows = [];
this.sConsumeRows = [];
this.consumeRows = [];
},
/** 搜索按钮操作 */
handleQuery() {
@ -299,88 +193,6 @@ export default {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.selectRow = selection
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加报工记录";
this.optType = "add";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.optType = "edit";
let sr = this.selectRow[0];
if(sr.uploadStatus =='sap报工成功'){
this.$modal.msgError(`上传sap成功,不允许修改`);
return
}
const id = row.id || this.ids
getReportWork(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改报工报表";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateReportWork(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addReportWork(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
let sr = this.selectRow[0];
if(sr.uploadStatus =='sap报工成功'){
this.$modal.msgError(`上传sap成功,不允许删除`);
return
}
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除报工报表编号为"' + ids + '"的数据项?').then(function() {
return delReportWork(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 报工按钮操作 */
handleEdit(index, row) {
console.log('row:',index, row);
},
//
pReportSelection(selection) {
this.pReportRows = selection
},
sReportSelection(selection) {
this.sReportRows = selection
},
/** 导出按钮操作 */
@ -393,3 +205,26 @@ export default {
}
};
</script>
<style scoped>
.el-row {
margin-top: 20px;
background: #e5e9f2;
}
.info-item {
line-height: 24px;
margin-bottom: 6px;
}
.label {
color: #666;
margin-right: 8px;
}
.value {
color: #333;
font-weight: 500;
}
.highlight {
color: #ff6600;
font-size: 16px;
}
</style>

Loading…
Cancel
Save