Merge remote-tracking branch 'origin/master'
chj
1 year ago
commit
c8a460bcef
@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询备料单列表
|
||||
export function listPrepare(query) {
|
||||
return request({
|
||||
url: '/mes/prepare/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
}
|
||||
|
||||
// 查询备料单详细
|
||||
export function getPrepare(prepareId) {
|
||||
return request({
|
||||
url: '/mes/prepare/' + prepareId,
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
// 新增备料单
|
||||
export function addPrepare(data) {
|
||||
return request({
|
||||
url: '/mes/prepare',
|
||||
method: 'post',
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
// 修改备料单
|
||||
export function updatePrepare(data) {
|
||||
return request({
|
||||
url: '/mes/prepare',
|
||||
method: 'put',
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
// 删除备料单
|
||||
export function delPrepare(prepareId) {
|
||||
return request({
|
||||
url: '/mes/prepare/' + prepareId,
|
||||
method: 'delete'
|
||||
});
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询mes备料单明细列表
|
||||
export function listPrepareDetail(query) {
|
||||
return request({
|
||||
url: '/mes/prepareDetail/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
}
|
||||
|
||||
// 查询mes备料单明细详细
|
||||
export function getPrepareDetail(recordId) {
|
||||
return request({
|
||||
url: '/mes/prepareDetail/' + recordId,
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
// 新增mes备料单明细
|
||||
export function addPrepareDetail(data) {
|
||||
return request({
|
||||
url: '/mes/prepareDetail',
|
||||
method: 'post',
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
// 修改mes备料单明细
|
||||
export function updatePrepareDetail(data) {
|
||||
return request({
|
||||
url: '/mes/prepareDetail',
|
||||
method: 'put',
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
// 删除mes备料单明细
|
||||
export function delPrepareDetail(recordId) {
|
||||
return request({
|
||||
url: '/mes/prepareDetail/' + recordId,
|
||||
method: 'delete'
|
||||
});
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询生产前准备记录报表列表
|
||||
export function listValidate(query) {
|
||||
return request({
|
||||
url: '/mes/validate/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
}
|
||||
|
||||
// 查询生产前准备记录报表详细
|
||||
export function getValidate(validateId) {
|
||||
return request({
|
||||
url: '/mes/validate/' + validateId,
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
// 新增生产前准备记录报表
|
||||
export function addValidate(data) {
|
||||
return request({
|
||||
url: '/mes/validate',
|
||||
method: 'post',
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
// 修改生产前准备记录报表
|
||||
export function updateValidate(data) {
|
||||
return request({
|
||||
url: '/mes/validate',
|
||||
method: 'put',
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
// 删除生产前准备记录报表
|
||||
export function delValidate(validateId) {
|
||||
return request({
|
||||
url: '/mes/validate/' + validateId,
|
||||
method: 'delete'
|
||||
});
|
||||
}
|
||||
@ -0,0 +1,412 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
|
||||
<el-form-item label="工单编码" prop="workorderCode">
|
||||
<el-input
|
||||
v-model="queryParams.workorderCode"
|
||||
placeholder="请输入工单编码"
|
||||
clearable
|
||||
@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="订单编码" prop="orderCode">
|
||||
<el-input
|
||||
v-model="queryParams.orderCode"
|
||||
placeholder="请输入订单编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="产品编号" prop="productCode">
|
||||
<el-input
|
||||
v-model="queryParams.productCode"
|
||||
placeholder="请输入产品编号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="产品名称" prop="productName">
|
||||
<el-input
|
||||
v-model="queryParams.productName"
|
||||
placeholder="请输入产品名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="规格型号" prop="productSpc">
|
||||
<el-input
|
||||
v-model="queryParams.productSpc"
|
||||
placeholder="请输入规格型号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="工单生产日期" prop="productDate">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.productDate"
|
||||
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:prepare: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:prepare: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:prepare: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:prepare:export']"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="prepareList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<!-- 序号 -->
|
||||
<el-table-column type="index" align="center" :index="indexMethod" label="序号"/>
|
||||
<el-table-column label="工单编码" align="center" prop="workorderCode" />
|
||||
<el-table-column label="工单名称" align="center" prop="workorderName" />
|
||||
<!-- <el-table-column label="父工单" align="center" prop="parentOrder" /> -->
|
||||
<el-table-column label="订单编码" align="center" prop="orderCode" />
|
||||
<el-table-column label="产品编号" align="center" prop="productCode" />
|
||||
<el-table-column label="产品类型" align="center" prop="prodType" />
|
||||
<el-table-column label="产品名称" align="center" prop="productName" />
|
||||
<el-table-column label="规格型号" align="center" prop="productSpc" />
|
||||
<el-table-column label="工单生产日期" align="center" prop="productDate" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="班次" align="center" prop="shiftId" />
|
||||
<el-table-column label="单据状态" align="center" prop="status" />
|
||||
<el-table-column label="物料编号" align="center" prop="materialCode" />
|
||||
<el-table-column label="物料名称" align="center" prop="materialName" />
|
||||
<el-table-column label="物料规格型号" align="center" prop="materialSpc" />
|
||||
<el-table-column label="单位" align="center" prop="unit" />
|
||||
<el-table-column label="生产数量" align="center" prop="quantity" />
|
||||
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
@click="handlePrepareDetail(scope.row)"
|
||||
v-hasPermi="['mes:prepareDetail:list']"
|
||||
>查看备料单</el-button>
|
||||
<Detail ref="detail"> </Detail>
|
||||
</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="80px">
|
||||
<el-form-item label="工单编码" prop="workorderCode">
|
||||
<el-input v-model="form.workorderCode" placeholder="请输入工单编码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工单名称" prop="workorderName">
|
||||
<el-input v-model="form.workorderName" placeholder="请输入工单名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="父工单" prop="parentOrder">
|
||||
<el-input v-model="form.parentOrder" placeholder="请输入父工单" />
|
||||
</el-form-item>
|
||||
<el-form-item label="订单编码" prop="orderCode">
|
||||
<el-input v-model="form.orderCode" placeholder="请输入订单编码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="产品编号" prop="productCode">
|
||||
<el-input v-model="form.productCode" placeholder="请输入产品编号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="产品名称" prop="productName">
|
||||
<el-input v-model="form.productName" placeholder="请输入产品名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="规格型号" prop="productSpc">
|
||||
<el-input v-model="form.productSpc" placeholder="请输入规格型号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="配料计划明细id" prop="wetDetailPlanId">
|
||||
<el-input v-model="form.wetDetailPlanId" placeholder="请输入配料计划明细id" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工单生产日期" prop="productDate">
|
||||
<el-date-picker clearable
|
||||
v-model="form.productDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择工单生产日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="班次" prop="shiftId">
|
||||
<el-input v-model="form.shiftId" 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="factoryCode">
|
||||
<el-input v-model="form.factoryCode" 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 { listPrepare, getPrepare, delPrepare, addPrepare, updatePrepare } from "@/api/mes/prepare";
|
||||
// import { listPrepareDetail, getPrepareDetail, delPrepareDetail, addPrepareDetail, updatePrepareDetail } from "@/api/mes/prepareDetail";
|
||||
// import Detail from "./prepareDetail.vue";
|
||||
export default {
|
||||
name: "Prepare",
|
||||
// components: {Detail},
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 备料单表格数据
|
||||
prepareList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
workorderCode: null,
|
||||
workorderName: null,
|
||||
parentOrder: null,
|
||||
orderId: null,
|
||||
orderCode: null,
|
||||
productId: null,
|
||||
productCode: null,
|
||||
prodType: null,
|
||||
productName: null,
|
||||
productSpc: null,
|
||||
wetDetailPlanId: null,
|
||||
productDate: null,
|
||||
shiftId: null,
|
||||
ancestors: null,
|
||||
status: null,
|
||||
attr1: null,
|
||||
attr2: null,
|
||||
attr3: null,
|
||||
attr4: null,
|
||||
factoryCode: null
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
workorderCode: [
|
||||
{ required: true, message: "工单编码不能为空", trigger: "blur" }
|
||||
],
|
||||
parentOrder: [
|
||||
{ required: true, message: "父工单不能为空", trigger: "blur" }
|
||||
],
|
||||
orderId: [
|
||||
{ required: true, message: "订单id不能为空", trigger: "blur" }
|
||||
],
|
||||
productCode: [
|
||||
{ required: true, message: "产品编号不能为空", trigger: "blur" }
|
||||
],
|
||||
productName: [
|
||||
{ required: true, message: "产品名称不能为空", trigger: "blur" }
|
||||
],
|
||||
}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
//新增 设备选择弹出框
|
||||
// handlePrepareDetail(){
|
||||
// this.$refs.detail.showFlag = true;
|
||||
// },
|
||||
// 生成表头序号
|
||||
indexMethod(index){
|
||||
return index+1 ;
|
||||
},
|
||||
/** 查询备料单列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listPrepare(this.queryParams).then(response => {
|
||||
this.prepareList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
prepareId: null,
|
||||
workorderCode: null,
|
||||
workorderName: null,
|
||||
parentOrder: null,
|
||||
orderId: null,
|
||||
orderCode: null,
|
||||
productId: null,
|
||||
productCode: null,
|
||||
prodType: null,
|
||||
productName: null,
|
||||
productSpc: null,
|
||||
wetDetailPlanId: null,
|
||||
productDate: null,
|
||||
shiftId: null,
|
||||
ancestors: null,
|
||||
status: null,
|
||||
remark: null,
|
||||
attr1: null,
|
||||
attr2: null,
|
||||
attr3: null,
|
||||
attr4: null,
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null,
|
||||
factoryCode: 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.prepareId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加备料单";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const prepareId = row.prepareId || this.ids
|
||||
getPrepare(prepareId).then(response => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改备料单";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.prepareId != null) {
|
||||
updatePrepare(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addPrepare(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const prepareIds = row.prepareId || this.ids;
|
||||
this.$modal.confirm('是否确认删除备料单编号为"' + prepareIds + '"的数据项？').then(function() {
|
||||
return delPrepare(prepareIds);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('mes/prepare/export', {
|
||||
...this.queryParams
|
||||
}, `prepare_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
@ -0,0 +1,239 @@
|
||||
<template>
|
||||
<el-dialog title="设备选择"
|
||||
v-if="showFlag"
|
||||
:visible.sync="showFlag"
|
||||
:modal= false
|
||||
width="1100px"
|
||||
center
|
||||
>
|
||||
|
||||
<el-table v-loading="loading" :data="prepareDetailList" @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="备料主ID" align="center" prop="prepareId" />
|
||||
<el-table-column label="物料编号" align="center" prop="materialCode" />
|
||||
<el-table-column label="物料名称" align="center" prop="materailName" />
|
||||
<el-table-column label="规格型号" align="center" prop="materailSpc" />
|
||||
<el-table-column label="单位" align="center" prop="unit" />
|
||||
<el-table-column label="生产数量" align="center" prop="quantity" />
|
||||
<el-table-column label="工单生产日期" align="center" prop="productDate" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="班次" align="center" prop="shiftId" />
|
||||
<el-table-column label="单据状态" align="center" prop="status" />
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
<el-table-column label="产品类型" align="center" prop="prodType" />
|
||||
<el-table-column label="${comment}" align="center" prop="factoryCode" />
|
||||
<el-table-column label="操作" align="center" 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="['mes:prepareDetail:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['mes:prepareDetail: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>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listPrepareDetail, getPrepareDetail, delPrepareDetail, addPrepareDetail, updatePrepareDetail } from "@/api/mes/prepareDetail";
|
||||
|
||||
export default {
|
||||
name: "PrepareDetail",
|
||||
data() {
|
||||
return {
|
||||
showFlag:false,
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// mes备料单明细表格数据
|
||||
prepareDetailList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
prepareId: null,
|
||||
materialCode: null,
|
||||
materailName: null,
|
||||
materailSpc: null,
|
||||
unit: null,
|
||||
quantity: null,
|
||||
productDate: null,
|
||||
shiftId: null,
|
||||
status: null,
|
||||
attr1: null,
|
||||
attr2: null,
|
||||
attr3: null,
|
||||
attr4: null,
|
||||
prodType: null,
|
||||
factoryCode: null
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
prepareId: [
|
||||
{ required: true, message: "备料主ID不能为空", trigger: "blur" }
|
||||
],
|
||||
materialCode: [
|
||||
{ required: true, message: "物料编号不能为空", trigger: "blur" }
|
||||
],
|
||||
materailName: [
|
||||
{ required: true, message: "物料名称不能为空", trigger: "blur" }
|
||||
],
|
||||
unit: [
|
||||
{ required: true, message: "单位不能为空", trigger: "blur" }
|
||||
],
|
||||
}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询mes备料单明细列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listPrepareDetail(this.queryParams).then(response => {
|
||||
this.prepareDetailList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
recordId: null,
|
||||
prepareId: null,
|
||||
materialCode: null,
|
||||
materailName: null,
|
||||
materailSpc: null,
|
||||
unit: null,
|
||||
quantity: null,
|
||||
productDate: null,
|
||||
shiftId: null,
|
||||
status: null,
|
||||
remark: null,
|
||||
attr1: null,
|
||||
attr2: null,
|
||||
attr3: null,
|
||||
attr4: null,
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null,
|
||||
prodType: null,
|
||||
factoryCode: 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.recordId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加mes备料单明细";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const recordId = row.recordId || this.ids
|
||||
getPrepareDetail(recordId).then(response => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改mes备料单明细";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.recordId != null) {
|
||||
updatePrepareDetail(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addPrepareDetail(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const recordIds = row.recordId || this.ids;
|
||||
this.$modal.confirm('是否确认删除mes备料单明细编号为"' + recordIds + '"的数据项？').then(function() {
|
||||
return delPrepareDetail(recordIds);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('mes/prepareDetail/export', {
|
||||
...this.queryParams
|
||||
}, `prepareDetail_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
@ -0,0 +1,307 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
|
||||
<el-form-item label="工单编码" prop="workorderCode">
|
||||
<el-input
|
||||
v-model="queryParams.workorderCode"
|
||||
placeholder="请输入工单编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="产品规格型号" prop="productSpc">
|
||||
<el-input
|
||||
v-model="queryParams.productSpc"
|
||||
placeholder="请输入产品规格型号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="产品名称" prop="productName">
|
||||
<el-input
|
||||
v-model="queryParams.productName"
|
||||
placeholder="请输入产品名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</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:validate: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:validate: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:validate: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:validate:export']"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="validateList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<!-- 序号 -->
|
||||
<el-table-column type="index" align="center" :index="indexMethod" label="序号"/>
|
||||
<el-table-column label="工单编码" align="center" prop="workorderCode" />
|
||||
<el-table-column label="订单编码" align="center" prop="workorderCode" />
|
||||
<el-table-column label="产品名称" align="center" prop="productName" />
|
||||
<el-table-column label="产品型号" align="center" prop="productSpc" />
|
||||
<el-table-column label="准备类型" align="center" prop="validateType" />
|
||||
<el-table-column label="准备内容" align="center" prop="validateName" />
|
||||
<el-table-column label="准备状态" align="center" prop="validateStatus" />
|
||||
<el-table-column label="完成时间" align="center" prop="endTime" />
|
||||
</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="80px">
|
||||
<el-form-item label="工单编码" prop="workorderCode">
|
||||
<el-input v-model="form.workorderCode" placeholder="请输入工单编码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工单名称" prop="workorderName">
|
||||
<el-input v-model="form.workorderName" placeholder="请输入工单名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="产品规格型号" prop="productSpc">
|
||||
<el-input v-model="form.productSpc" placeholder="请输入产品规格型号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="产品名称" prop="productName">
|
||||
<el-input v-model="form.productName" placeholder="请输入产品名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
<el-form-item label="预留字段1" prop="attr1">
|
||||
<el-input v-model="form.attr1" placeholder="请输入预留字段1" />
|
||||
</el-form-item>
|
||||
<el-form-item label="预留字段2" prop="attr2">
|
||||
<el-input v-model="form.attr2" placeholder="请输入预留字段2" />
|
||||
</el-form-item>
|
||||
<el-form-item label="预留字段3" prop="attr3">
|
||||
<el-input v-model="form.attr3" placeholder="请输入预留字段3" />
|
||||
</el-form-item>
|
||||
<el-form-item label="预留字段4" prop="attr4">
|
||||
<el-input v-model="form.attr4" placeholder="请输入预留字段4" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工厂编码" prop="factoryCode">
|
||||
<el-input v-model="form.factoryCode" 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 { listValidate, getValidate, delValidate, addValidate, updateValidate } from "@/api/mes/validate";
|
||||
|
||||
export default {
|
||||
name: "Validate",
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 生产前准备记录报表表格数据
|
||||
validateList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
workorderCode: null,
|
||||
workorderName: null,
|
||||
productSpc: null,
|
||||
productName: null,
|
||||
status: null,
|
||||
attr1: null,
|
||||
attr2: null,
|
||||
attr3: null,
|
||||
attr4: null,
|
||||
factoryCode: null
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
workorderCode: [
|
||||
{ required: true, message: "工单编码不能为空", trigger: "blur" }
|
||||
],
|
||||
}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
indexMethod(index){
|
||||
return index+1 ;
|
||||
},
|
||||
/** 查询生产前准备记录报表列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listValidate(this.queryParams).then(response => {
|
||||
this.validateList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
validateId: null,
|
||||
workorderCode: null,
|
||||
workorderName: null,
|
||||
productSpc: null,
|
||||
productName: null,
|
||||
status: null,
|
||||
remark: null,
|
||||
attr1: null,
|
||||
attr2: null,
|
||||
attr3: null,
|
||||
attr4: null,
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null,
|
||||
factoryCode: 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.validateId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加生产前准备记录报表";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const validateId = row.validateId || this.ids
|
||||
getValidate(validateId).then(response => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改生产前准备记录报表";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.validateId != null) {
|
||||
updateValidate(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addValidate(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const validateIds = row.validateId || this.ids;
|
||||
this.$modal.confirm('是否确认删除生产前准备记录报表编号为"' + validateIds + '"的数据项？').then(function() {
|
||||
return delValidate(validateIds);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('mes/validate/export', {
|
||||
...this.queryParams
|
||||
}, `validate_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
Loading…
Reference in New Issue