物料入库单

This commit is contained in:
JinLu.Yin 2022-05-22 22:32:08 +08:00
parent 908303f3a7
commit 2eb876f5b6
5 changed files with 828 additions and 2 deletions

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询物料入库单列表
export function listItemrecpt(query) {
return request({
url: '/mes/wm/itemrecpt/list',
method: 'get',
params: query
})
}
// 查询物料入库单详细
export function getItemrecpt(recptId) {
return request({
url: '/mes/wm/itemrecpt/' + recptId,
method: 'get'
})
}
// 新增物料入库单
export function addItemrecpt(data) {
return request({
url: '/mes/wm/itemrecpt',
method: 'post',
data: data
})
}
// 修改物料入库单
export function updateItemrecpt(data) {
return request({
url: '/mes/wm/itemrecpt',
method: 'put',
data: data
})
}
// 删除物料入库单
export function delItemrecpt(recptId) {
return request({
url: '/mes/wm/itemrecpt/' + recptId,
method: 'delete'
})
}

View File

@ -9,6 +9,13 @@ export function listWarehouse(query) {
}) })
} }
export function getTreeList(){
return request({
url: '/mes/wm/warehouse/getTreeList',
method: 'get'
})
}
// 查询仓库设置详细 // 查询仓库设置详细
export function getWarehouse(warehouseId) { export function getWarehouse(warehouseId) {
return request({ return request({

View File

@ -0,0 +1,230 @@
<template>
<el-dialog title="客户选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="80%"
center
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="检验单编号" prop="iqcCode">
<el-input
v-model="queryParams.iqcCode"
placeholder="请输入来料检验单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商编码" prop="vendorCode">
<el-input
v-model="queryParams.vendorCode"
placeholder="请输入供应商编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商名称" prop="vendorName">
<el-input
v-model="queryParams.vendorName"
placeholder="请输入供应商名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商批次号" prop="vendorBatch">
<el-input
v-model="queryParams.vendorBatch"
placeholder="请输入供应商批次号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品物料编码" prop="itemCode">
<el-input
v-model="queryParams.itemCode"
placeholder="请输入产品物料编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品物料名称" prop="itemName">
<el-input
v-model="queryParams.itemName"
placeholder="请输入产品物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检测人员" prop="inspector">
<el-input
v-model="queryParams.inspector"
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-table v-loading="loading" :data="iqcList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="50" align="center" >
<template v-slot="scope">
<el-radio v-model="selectedId" :label="scope.row.iqcId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
</template>
</el-table-column>
<el-table-column label="来料检验单编号" width="140px" align="center" prop="iqcCode" >
</el-table-column>
<el-table-column label="来料检验单名称" width="120px" align="center" prop="iqcName" :show-overflow-tooltip="true"/>
<el-table-column label="供应商简称" width="100px" align="center" prop="vendorNick" :show-overflow-tooltip="true"/>
<el-table-column label="供应商批次号" width="120px" align="center" prop="vendorBatch" />
<el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
<el-table-column label="产品物料名称" width="120px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
<el-table-column label="接收数量" width="90px" align="center" prop="quantityRecived" />
<el-table-column label="检测数量" width="90px" align="center" prop="quantityCheck" />
<el-table-column label="不合格数" align="center" prop="quantityUnqualified" />
<el-table-column label="检测结果" align="center" prop="checkResult" >
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_qc_result" :value="scope.row.checkResult"/>
</template>
</el-table-column>
<el-table-column label="来料日期" align="center" prop="reciveDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.reciveDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="检测日期" align="center" prop="inspectDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.inspectDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="检测人员" align="center" prop="inspectorName" />
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect"> </el-button>
<el-button @click="showFlag=false"> </el-button>
</div>
</el-dialog>
</template>
<script>
import { listIqc, getIqc, delIqc, addIqc, updateIqc } from "@/api/mes/qc/iqc";
export default {
name: "IqcSelect",
dicts: ['mes_qc_result','mes_order_status'],
data() {
return {
showFlag:false,
//
loading: true,
//
selectedId: null,
selectedRow: undefined,
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
iqcList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
iqcCode: null,
iqcName: null,
templateId: null,
vendorId: null,
vendorCode: null,
vendorName: null,
vendorNick: null,
vendorBatch: null,
itemId: null,
itemCode: null,
itemName: null,
specification: null,
checkResult: 'ACCEPT',
reciveDate: null,
inspectDate: null,
inspector: null,
status: null,
},
};
},
created() {
this.getList();
},
methods: {
/** 查询来料检验单列表 */
getList() {
this.loading = true;
listIqc(this.queryParams).then(response => {
this.iqcList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
handleCurrent(row){
if(row){
this.selectedRow = row;
}
},
//
handleRowDbClick(row){
if(row){
this.selectedRow = row;
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
},
//
handleRowChange(row) {
debugger;
if(row){
this.selectedRow = row;
}
},
//
confirmSelect(){
if(this.selectedId ==null || this.selectedId==0){
this.$notify({
title:'提示',
type:'warning',
message: '请至少选择一条数据!'
});
return;
}
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
}
};
</script>

View File

@ -154,7 +154,11 @@
<el-table-column label="接收数量" width="90px" align="center" prop="quantityRecived" /> <el-table-column label="接收数量" width="90px" align="center" prop="quantityRecived" />
<el-table-column label="检测数量" width="90px" align="center" prop="quantityCheck" /> <el-table-column label="检测数量" width="90px" align="center" prop="quantityCheck" />
<el-table-column label="不合格数" align="center" prop="quantityUnqualified" /> <el-table-column label="不合格数" align="center" prop="quantityUnqualified" />
<el-table-column label="检测结果" align="center" prop="checkResult" /> <el-table-column label="检测结果" align="center" prop="checkResult" >
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_qc_result" :value="scope.row.checkResult"/>
</template>
</el-table-column>
<el-table-column label="来料日期" align="center" prop="reciveDate" width="180"> <el-table-column label="来料日期" align="center" prop="reciveDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.reciveDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.reciveDate, '{y}-{m}-{d}') }}</span>
@ -666,7 +670,7 @@ export default {
handleSelectVendor(){ handleSelectVendor(){
this.$refs.vendorSelect.showFlag = true; this.$refs.vendorSelect.showFlag = true;
}, },
// //
onVendorSelected(obj){ onVendorSelected(obj){
debugger; debugger;
if(obj != undefined && obj != null){ if(obj != undefined && obj != null){

View File

@ -0,0 +1,541 @@
<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="入库单编号" prop="recptCode">
<el-input
v-model="queryParams.recptCode"
placeholder="请输入入库单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库单名称" prop="recptName">
<el-input
v-model="queryParams.recptName"
placeholder="请输入入库单名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商名称" prop="vendorName">
<el-input
v-model="queryParams.vendorName"
placeholder="请输入供应商名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单编号" prop="poCode">
<el-input
v-model="queryParams.poCode"
placeholder="请输入订单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库日期" prop="recptDate">
<el-date-picker clearable
v-model="queryParams.recptDate"
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:wm:itemrecpt: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:wm:itemrecpt: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:wm:itemrecpt: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:wm:itemrecpt:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="itemrecptList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="入库单编号" align="center" width="180px" prop="recptCode" >
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:wm:itemrecpt:query']"
>{{scope.row.recptCode}}</el-button>
</template>
</el-table-column>
<el-table-column label="入库单名称" align="center" prop="recptName" :show-overflow-tooltip="true"/>
<el-table-column label="检验单编号" align="center" width="180px" prop="iqcCode" />
<el-table-column label="供应商名称" align="center" prop="vendorName" :show-overflow-tooltip="true"/>
<el-table-column label="入库日期" align="center" prop="recptDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.recptDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="采购订单号" align="center" prop="poCode" />
<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" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
v-if="scope.row.status =='PREPARE'"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:wm:itemrecpt:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
v-if="scope.row.status =='PREPARE'"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:wm:itemrecpt: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="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="recptCode">
<el-input v-model="form.recptCode" placeholder="请输入入库单编号" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="入库单名称" prop="recptName">
<el-input v-model="form.recptName" placeholder="请输入入库单名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="入库日期" prop="recptDate">
<el-date-picker clearable
v-model="form.recptDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择入库日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="采购订单号" prop="poCode">
<el-input v-model="form.poCode" placeholder="请输入采购订单号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单据状态" prop="status">
<el-select v-model="form.status" disabled placeholder="请选择单据状态">
<el-option
v-for="dict in dict.type.mes_order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="来料检验单" prop="iqcCode">
<el-input v-model="form.iqcCode" readonly="readonly" placeholder="请选择来料检验单" >
<el-button slot="append" @click="handleSelectIqc" icon="el-icon-search"></el-button>
</el-input>
<IqcSelect ref="iqcSelect" @onSelected="onIqcSelected"></IqcSelect>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供应商" prop="vendorName">
<el-input v-model="form.vendorName" readonly="readonly" placeholder="请选择供应商" >
<el-button slot="append" @click="handleSelectVendor" icon="el-icon-search"></el-button>
</el-input>
<VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="入库仓库">
<el-cascader v-model="warehouseInfo"
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
</el-cascader>
</el-form-item>
</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="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-else> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listItemrecpt, getItemrecpt, delItemrecpt, addItemrecpt, updateItemrecpt } from "@/api/mes/wm/itemrecpt";
import {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule"
import VendorSelect from "@/components/vendorSelect/single.vue";
import IqcSelect from "@/components/iqcSelect/single.vue";
export default {
name: "Itemrecpt",
dicts:['mes_order_status'],
components :{VendorSelect,IqcSelect},
data() {
return {
//
autoGenFlag:false,
optType: undefined,
warehouseInfo:[],
warehouseOptions:[],
warehouseProps:{
multiple: false,
value: 'warehouseId',
label: 'warehouseName',
},
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
itemrecptList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
recptCode: null,
recptName: null,
iqcId: null,
iqcCode: null,
vendorId: null,
vendorCode: null,
vendorName: null,
vendorNick: null,
warehouseId: null,
warehouseCode: null,
warehouseName: null,
locationId: null,
locationCode: null,
locationName: null,
areaId: null,
areaCode: null,
areaName: null,
recptDate: null,
poCode: null,
status: null,
},
//
form: {},
//
rules: {
recptCode: [
{ required: true, message: "入库单编号不能为空", trigger: "blur" }
],
recptName: [
{ required: true, message: "入库单名称不能为空", trigger: "blur" }
],
recptDate: [
{ required: true, message: "入库时间不能为空", trigger: "blur"}
]
}
};
},
created() {
this.getList();
this.getWarehouseList();
},
methods: {
/** 查询物料入库单列表 */
getList() {
this.loading = true;
listItemrecpt(this.queryParams).then(response => {
this.itemrecptList = response.rows;
this.total = response.total;
this.loading = false;
});
},
getWarehouseList(){
getTreeList().then( response =>{
this.warehouseOptions = response.data;
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/areaId/g, 'warehouseId').replace(/areaName/g,'warehouseName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/locationId/g, 'warehouseId').replace(/locationName/g,'warehouseName');
w.children = JSON.parse(wstr);
});
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
recptId: null,
recptCode: null,
recptName: null,
iqcId: null,
iqcCode: null,
vendorId: null,
vendorCode: null,
vendorName: null,
vendorNick: null,
warehouseId: null,
warehouseCode: null,
warehouseName: null,
locationId: null,
locationCode: null,
locationName: null,
areaId: null,
areaCode: null,
areaName: null,
recptDate: null,
poCode: null,
status: "PREPARE",
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.autoGenFlag = false;
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.recptId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.warehouseInfo = [];
this.open = true;
this.title = "添加物料入库单";
this.optType = "add";
},
//
handleView(row){
this.reset();
const recptIds = row.recptId
getItemrecpt(recptIds).then(response => {
debugger;
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看入库单信息";
this.optType = "view";
});
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const recptId = row.recptId || this.ids
getItemrecpt(recptId).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
console.log(this.warehouseInfo);
this.open = true;
this.title = "修改物料入库单";
this.optType = "edit";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.recptId != null) {
updateItemrecpt(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addItemrecpt(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const recptIds = row.recptId || this.ids;
this.$modal.confirm('是否确认删除物料入库单?').then(function() {
return delItemrecpt(recptIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/wm/itemrecpt/export', {
...this.queryParams
}, `itemrecpt_${new Date().getTime()}.xlsx`)
},
//
handleWarehouseChanged(obj){
debugger;
if(obj !=null){
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
this.form.areaId = obj[2];
}
},
//IQC
handleSelectIqc(){
this.$refs.iqcSelect.showFlag = true;
},
//IQC
onIqcSelected(obj){
if(obj != undefined && obj != null){
this.form.iqcId = obj.iqcId;
this.form.iqcCode = obj.iqcCode;
this.form.recptName = obj.iqcName;
this.form.vendorId = obj.vendorId;
this.form.vendorCode = obj.vendorCode;
this.form.vendorName = obj.vendorName;
this.form.vendorNick = obj.vendorNick;
}
},
//
handleSelectVendor(){
this.$refs.vendorSelect.showFlag = true;
},
//
onVendorSelected(obj){
if(obj != undefined && obj != null){
this.form.vendorId = obj.vendorId;
this.form.vendorCode = obj.vendorCode;
this.form.vendorName = obj.vendorName;
this.form.vendorNick = obj.vendorNick;
}
},
//
handleAutoGenChange(autoGenFlag){
if(autoGenFlag){
genCode('ITEMRECPT_CODE').then(response =>{
this.form.recptCode = response;
});
}else{
this.form.recptCode = null;
}
}
}
};
</script>
<style scoped>
.collapse-title {
flex: 0 1 54%;
order: 1;
}
</style>