mes/mes-lxsm-ui
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PC端的简单生产报工

Browse Source
This commit is contained in:
DESKTOP-J7ED0MB\yinjinlu 2022-10-03 21:40:06 +08:00
parent 2f9af7d3c1
commit 6b5f00433e
2 changed files with 236 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/components/workstationSelect/simpletableSingle.vue
View File

@ -6,30 +6,32 @@
width="80%"
center
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
<el-row>
<el-col :span="8">
<el-form-item label="工作站编码" prop="workstationCode">
<el-col :span="7">
<el-form-item label="工作站编号" prop="workstationCode">
<el-input
v-model="queryParams.workstationCode"
placeholder="请输入工作站编码"
placeholder="请输入工作站编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工作站名称" prop="workstationName">
<el-input
v-model="queryParams.workstationName"
placeholder="请输入工作站名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-col :span="7">
<el-form-item label="所属工序" prop="processName">
<el-select v-model="queryParams.processId" placeholder="请选择工序">
<el-option
v-for="item in processOptions"
:key="item.processId"
:label="item.processName"
:value="item.processId"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在车间名称" prop="workshopName">
<el-col :span="7">
<el-form-item label="所在车间" prop="workshopName">
<el-select v-model="queryParams.workshopId" placeholder="请选择车间">
<el-option
v-for="item in workshopOptions"
@ -40,15 +42,18 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="3">
<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-col>
</el-row>
<el-row>
<el-col :span="24">
</el-col>
</el-row>
</el-form>
<el-table v-loading="loading" :data="workstationList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">

403
src/views/mes/pro/feedback/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="报工类型" prop="feedbackType">
<el-select v-model="queryParams.feedbackType" placeholder="请选择报工类型" clearable>
<el-option
@ -11,22 +11,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="工作站ID" prop="workstationId">
<el-input
v-model="queryParams.workstationId"
placeholder="请输入工作站ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工作站编号" prop="workstationCode">
<el-input
v-model="queryParams.workstationCode"
placeholder="请输入工作站编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工作站名称" prop="workstationName">
<el-input
v-model="queryParams.workstationName"
@ -35,14 +19,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生产工单ID" prop="workorderId">
<el-input
v-model="queryParams.workorderId"
placeholder="请输入生产工单ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生产工单编号" prop="workorderCode">
<el-input
v-model="queryParams.workorderCode"
@ -51,38 +27,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生产工单名称" prop="workorderName">
<el-input
v-model="queryParams.workorderName"
placeholder="请输入生产工单名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生产任务ID" prop="taskId">
<el-input
v-model="queryParams.taskId"
placeholder="请输入生产任务ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生产任务编号" prop="taskCode">
<el-input
v-model="queryParams.taskCode"
placeholder="请输入生产任务编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品物料ID" prop="itemId">
<el-input
v-model="queryParams.itemId"
placeholder="请输入产品物料ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品物料编码" prop="itemCode">
<el-input
v-model="queryParams.itemCode"
@ -99,70 +43,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="排产数量" prop="quantity">
<el-input
v-model="queryParams.quantity"
placeholder="请输入排产数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="本次报工数量" prop="quantityFeedback">
<el-input
v-model="queryParams.quantityFeedback"
placeholder="请输入本次报工数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="合格品数量" prop="quantityQualified">
<el-input
v-model="queryParams.quantityQualified"
placeholder="请输入合格品数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="不良品数量" prop="quantityUnquanlified">
<el-input
v-model="queryParams.quantityUnquanlified"
placeholder="请输入不良品数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="报工用户名" prop="userName">
<el-form-item label="报工人" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入报工用户名"
placeholder="请输入报工人名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="昵称" prop="nickName">
<el-input
v-model="queryParams.nickName"
placeholder="请输入昵称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="报工途径" prop="feedbackChannel">
<el-input
v-model="queryParams.feedbackChannel"
placeholder="请输入报工途径"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="报工时间" prop="feedbackTime">
<el-date-picker clearable
v-model="queryParams.feedbackTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择报工时间">
</el-date-picker>
</el-form-item>
<el-form-item label="记录人" prop="recordUser">
<el-input
v-model="queryParams.recordUser"
@ -186,7 +74,6 @@
<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
@ -195,7 +82,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['pro:feedback:add']"
v-hasPermi="['mes:pro:feedback:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
@ -206,7 +93,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['pro:feedback:edit']"
v-hasPermi="['mes:pro:feedback:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
@ -217,76 +104,53 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['pro:feedback:remove']"
v-hasPermi="['mes:pro:feedback: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="['pro:feedback:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="feedbackList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="记录ID" align="center" prop="recordId" />
<el-table-column label="报工类型" align="center" prop="feedbackType">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_feedback_type" :value="scope.row.feedbackType"/>
</template>
</el-table-column>
<el-table-column label="工作站ID" align="center" prop="workstationId" />
<el-table-column label="工作站编号" align="center" prop="workstationCode" />
<el-table-column label="工作站名称" align="center" prop="workstationName" />
<el-table-column label="生产工单ID" align="center" prop="workorderId" />
<el-table-column label="生产工单编号" align="center" prop="workorderCode" />
<el-table-column label="生产工单名称" align="center" prop="workorderName" />
<el-table-column label="生产任务ID" align="center" prop="taskId" />
<el-table-column label="生产任务编号" align="center" prop="taskCode" />
<el-table-column label="产品物料ID" align="center" prop="itemId" />
<el-table-column label="产品物料编码" align="center" prop="itemCode" />
<el-table-column label="产品物料名称" align="center" prop="itemName" />
<el-table-column label="工作站" width="120px" align="center" prop="workstationName" />
<el-table-column label="生产工单编号" width="150px" align="center" prop="workorderCode" />
<el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
<el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" />
<el-table-column label="规格型号" align="center" prop="specification" />
<el-table-column label="排产数量" align="center" prop="quantity" />
<el-table-column label="本次报工数量" align="center" prop="quantityFeedback" />
<el-table-column label="合格品数量" align="center" prop="quantityQualified" />
<el-table-column label="不良品数量" align="center" prop="quantityUnquanlified" />
<el-table-column label="报工用户名" align="center" prop="userName" />
<el-table-column label="昵称" align="center" prop="nickName" />
<el-table-column label="报工途径" align="center" prop="feedbackChannel" />
<el-table-column label="报工数量" align="center" prop="quantityFeedback" />
<el-table-column label="报工人" align="center" prop="nickName" />
<el-table-column label="报工时间" align="center" prop="feedbackTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.feedbackTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="记录人" align="center" prop="recordUser" />
<el-table-column label="审核人" align="center" prop="recordNick" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" width="100px" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['pro:feedback:edit']"
v-hasPermi="['mes:pro:feedback:edit']"
v-if="scope.row.status =='PREPARE'"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['pro:feedback:remove']"
v-hasPermi="['mes:pro:feedback:remove']"
v-if="scope.row.status =='PREPARE'"
>删除</el-button>
</template>
</el-table-column>
@ -301,75 +165,89 @@
/>
<!-- 添加或修改生产报工记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="8">
<el-form-item label="报工类型" prop="feedbackType">
<el-select v-model="form.feedbackType" placeholder="请选择报工类型">
<el-option
v-for="dict in dict.type.mes_feedback_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="工作站ID" prop="workstationId">
<el-input v-model="form.workstationId" placeholder="请输入工作站ID" />
</el-form-item>
<el-form-item label="工作站编号" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="请输入工作站编号" />
</el-col>
<el-col :span="8">
<el-form-item label="生产工单" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请选择生产工单" >
<el-button slot="append" icon="el-icon-search" @click="handleWorkorderSelect"></el-button>
</el-input>
</el-form-item>
<WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
</el-col>
<el-col :span="8">
<el-form-item label="工作站名称" prop="workstationName">
<el-input v-model="form.workstationName" placeholder="请输入工作站名称" />
<el-input v-model="form.workstationName" placeholder="请输入工作站名称" >
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
</el-input>
</el-form-item>
<el-form-item label="生产工单ID" prop="workorderId">
<el-input v-model="form.workorderId" placeholder="请输入生产工单ID" />
<WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="产品编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" />
</el-form-item>
<el-form-item label="生产工单编号" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入生产工单编号" />
</el-col>
<el-col :span="8">
<el-form-item label="产品名称" prop="itemName">
<el-input v-model="form.itemName" readonly="readonly" />
</el-form-item>
<el-form-item label="生产工单名称" prop="workorderName">
<el-input v-model="form.workorderName" placeholder="请输入生产工单名称" />
</el-form-item>
<el-form-item label="生产任务ID" prop="taskId">
<el-input v-model="form.taskId" placeholder="请输入生产任务ID" />
</el-form-item>
<el-form-item label="生产任务编号" prop="taskCode">
<el-input v-model="form.taskCode" placeholder="请输入生产任务编号" />
</el-form-item>
<el-form-item label="产品物料ID" prop="itemId">
<el-input v-model="form.itemId" placeholder="请输入产品物料ID" />
</el-form-item>
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入产品物料编码" />
</el-form-item>
<el-form-item label="产品物料名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入产品物料名称" />
</el-col>
<el-col :span="8">
<el-form-item label="单位" prop="unitOfMeasure">
<el-input v-model="form.unitOfMeasure" readonly="readonly" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="规格型号" prop="specification">
<el-input v-model="form.specification" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.specification" type="textarea" readonly="readonly" />
</el-form-item>
<el-form-item label="排产数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入排产数量" />
</el-form-item>
<el-form-item label="本次报工数量" prop="quantityFeedback">
<el-input v-model="form.quantityFeedback" placeholder="请输入本次报工数量" />
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="报工数量" prop="quantityFeedback">
<el-input readonly="readonly" v-model="form.quantityFeedback" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合格品数量" prop="quantityQualified">
<el-input v-model="form.quantityQualified" placeholder="请输入合格品数量" />
<el-input-number :min="0" @change="handleQuantityChanged" v-model="form.quantityQualified" placeholder="请输入合格品数量" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不良品数量" prop="quantityUnquanlified">
<el-input v-model="form.quantityUnquanlified" placeholder="请输入不良品数量" />
<el-input-number :min="0" @change="handleQuantityChanged" v-model="form.quantityUnquanlified" placeholder="请输入不良品数量" />
</el-form-item>
<el-form-item label="报工用户名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入报工用户名" />
</el-form-item>
<el-form-item label="昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入昵称" />
</el-form-item>
<el-form-item label="报工途径" prop="feedbackChannel">
<el-input v-model="form.feedbackChannel" placeholder="请输入报工途径" />
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="报工人" prop="nickName">
<el-input v-model="form.nickName" placeholder="请选择报工人" >
<el-button slot="append" @click="handleUserSelect" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<UserSingleSelect ref="userSelect" @onSelected="onUserSelected"></UserSingleSelect>
</el-col>
<el-col :span="8">
<el-form-item label="报工时间" prop="feedbackTime">
<el-date-picker clearable
v-model="form.feedbackTime"
@ -378,24 +256,28 @@
placeholder="请选择报工时间">
</el-date-picker>
</el-form-item>
<el-form-item label="记录人" prop="recordUser">
<el-input v-model="form.recordUser" placeholder="请输入记录人" />
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.mes_order_status"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-col>
<el-col :span="8">
<el-form-item label="审核人" prop="recordNick">
<el-input v-model="form.recordNick" placeholder="请选择审核人" >
<el-button slot="append" @click="handleUser2Select" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<UserSingleSelect ref="user2Select" @onSelected="onUser2Selected"></UserSingleSelect>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
<el-button type="success" @click="handleFinish" v-if="form.status =='PREPARE' && optType !='view' && form.workorderId !=null">审 批</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@ -404,12 +286,16 @@
<script>
import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback } from "@/api/mes/pro/feedback";
import WorkorderSelect from "@/components/workorderSelect/single.vue"
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import UserSingleSelect from "@/components/userSelect/single.vue"
export default {
name: "Feedback",
components: {WorkorderSelect,WorkstationSelect,UserSingleSelect},
dicts: ['mes_order_status', 'mes_feedback_type'],
data() {
return {
optType: undefined,
// 遮罩层
loading: true,
// 选中数组
@ -444,6 +330,7 @@ export default {
itemId: null,
itemCode: null,
itemName: null,
unitOfMeasure: null,
specification: null,
quantity: null,
quantityFeedback: null,
@ -454,6 +341,7 @@ export default {
feedbackChannel: null,
feedbackTime: null,
recordUser: null,
recordNick: null,
status: null,
},
// 表单参数
@ -463,21 +351,24 @@ export default {
feedbackType: [
{ required: true, message: "报工类型不能为空", trigger: "change" }
],
workstationId: [
{ required: true, message: "工作站ID不能为空", trigger: "blur" }
workstationName: [
{ required: true, message: "工作站不能为空", trigger: "blur" }
],
workorderId: [
{ required: true, message: "生产工单ID不能为空", trigger: "blur" }
workorderCode: [
{ required: true, message: "生产工单不能为空", trigger: "blur" }
],
itemId: [
{ required: true, message: "产品物料ID不能为空", trigger: "blur" }
quantityQualified: [
{ required: true, message: "请输入合格品数量", trigger: "blur"}
],
itemCode: [
{ required: true, message: "产品物料编码不能为空", trigger: "blur" }
quantityUnquanlified: [
{ required: true, message: "请输入不合格品数量", trigger: "blur"}
],
itemName: [
{ required: true, message: "产品物料名称不能为空", trigger: "blur" }
nickName: [
{ required: true, message: "请选择报工人", trigger: "blur"}
],
feedbackTime: [
{ required: true, message: "请选择报工时间", trigger: "blur"}
]
}
};
},
@ -523,9 +414,10 @@ export default {
userName: null,
nickName: null,
feedbackChannel: null,
feedbackTime: null,
feedbackTime: new Date(),
recordUser: null,
status: "0",
recordNick: null,
status: "PREPARE",
remark: null,
attr1: null,
attr2: null,
@ -538,6 +430,9 @@ export default {
};
this.resetForm("form");
},
handleQuantityChanged(){
this.form.quantityFeedback = this.form.quantityQualified + this.form.quantityUnquanlified;
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
@ -590,6 +485,20 @@ export default {
}
});
},
handleFinish(){
this.form.status = "FINISHED";
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.recordId != null) {
updateFeedback(this.form).then(response => {
this.$modal.msgSuccess("审批成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const recordIds = row.recordId || this.ids;
@ -605,7 +514,51 @@ export default {
this.download('pro/feedback/export', {
...this.queryParams
}, `feedback_${new Date().getTime()}.xlsx`)
},
//选择生产工单
handleWorkorderSelect(){
this.$refs.woSelect.showFlag = true;
},
onWorkorderSelected(row){
if(row != undefined && row != null){
this.form.workorderId = row.workorderId;
this.form.workorderCode = row.workorderCode;
this.form.workorderName = row.workorderName;
this.form.itemId = row.productId;
this.form.itemCode = row.productCode;
this.form.itemName = row.productName;
this.form.specification = row.productSpc;
this.form.unitOfMeasure = row.unitOfMeasure;
}
},
handleWorkstationSelect(){
this.$refs.wsSelect.showFlag = true;
},
onWorkstationSelected(row){
if(row != undefined && row != null){
this.form.workstationId = row.workstationId;
this.form.workstationCode = row.workstationCode;
this.form.workstationName = row.workstationName;
}
},
//点击人员选择按钮
handleUserSelect(){
this.$refs.userSelect.showFlag = true;
},
//人员选择返回
onUserSelected(row){
this.form.nickName = row.nickName;
this.form.userName = row.userName;
},
//点击人员选择按钮
handleUser2Select(){
this.$refs.user2Select.showFlag = true;
},
//人员选择返回
onUser2Selected(row){
this.form.recordUser = row.userName;
this.form.recordNick = row.nickName;
},
}
};
</script>