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

产品入库单

Browse Source
This commit is contained in:
JinLu.Yin 2022-09-23 14:30:58 +08:00
parent 53d781c9f6
commit bdd800a800
4 changed files with 178 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/stockSelect/single.vue
View File

@ -206,6 +206,7 @@ export default {
vendorCode: null,
vendorName: null,
vendorNick: null,
workorderId: this.workorderId,
quantityOnhand: null,
expireDate: null,
},
@ -221,7 +222,8 @@ export default {
locationId: null,
locationCode: null,
areaId: null,
areaCode: null
areaCode: null,
workorderId: null,
},
created() {
this.getList();

2
src/views/mes/wm/issue/line.vue
View File

@ -55,6 +55,7 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-if="optType != 'view'"
v-hasPermi="['mes:wm:issueheader:edit']"
>修改</el-button>
<el-button
@ -62,6 +63,7 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-if="optType != 'view'"
v-hasPermi="['mes:wm:issueheader:remove']"
>删除</el-button>
</template>

55
src/views/mes/wm/productrecpt/index.vue
View File

@ -87,9 +87,9 @@
<el-table v-loading="loading" :data="productrecptList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="入库单编号" width="120px" align="center" prop="recptCode" />
<el-table-column label="入库单名称" width="150px" align="center" prop="recptName" />
<el-table-column label="生产工单编码" width="120px" align="center" prop="workorderCode" />
<el-table-column label="入库单编号" width="130px" align="center" prop="recptCode" />
<el-table-column label="入库单名称" width="150px" align="center" prop="recptName" :show-overflow-tooltip="true"/>
<el-table-column label="生产工单编码" width="150px" align="center" prop="workorderCode" />
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<el-table-column label="库区名称" align="center" prop="locationName" />
<el-table-column label="库位名称" align="center" prop="areaName" />
@ -158,7 +158,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<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>
@ -166,11 +166,21 @@
<WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="生产工单名称" prop="workorderName">
<el-input v-model="form.workorderName" readonly="readonly" />
</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="8">
@ -219,6 +229,10 @@
</el-col>
</el-row>
</el-form>
<el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider>
<el-card shadow="always" v-if="form.recptId !=null" class="box-card">
<Productrecptline :recptId="form.recptId" :optType="optType" :workorderId="form.workorderId"></Productrecptline>
</el-card>
<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-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button>
@ -232,10 +246,13 @@
<script>
import { listProductrecpt, getProductrecpt, delProductrecpt, addProductrecpt, updateProductrecpt } from "@/api/mes/wm/productrecpt";
import WorkorderSelect from "@/components/workorderSelect/single.vue"
import Productrecptline from "./line.vue"
import {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule"
export default {
name: "Productrecpt",
dicts: ['mes_order_status'],
components:{WorkorderSelect},
components:{WorkorderSelect,Productrecptline},
data() {
return {
//自动生成编码
@ -302,6 +319,7 @@ export default {
},
created() {
this.getList();
this.getWarehouseList();
},
methods: {
/** 查询产品入库录列表 */
@ -313,6 +331,23 @@ export default {
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(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
this.warehouseOptions = JSON.parse(ostr);
});
},
// 取消按钮
cancel() {
this.open = false;
@ -435,6 +470,14 @@ export default {
this.form.clientName = row.clientName;
}
},
//选择默认的仓库、库区、库位
handleWarehouseChanged(obj){
if(obj !=null){
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
this.form.areaId = obj[2];
}
},
//自动生成编码
handleAutoGenChange(autoGenFlag){
if(autoGenFlag){

356
src/views/mes/wm/productrecpt/line.vue
View File

@ -1,148 +1,5 @@
<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="入库记录ID" prop="recptId">
<el-input
v-model="queryParams.recptId"
placeholder="请输入入库记录ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存记录ID" prop="materialStockId">
<el-input
v-model="queryParams.materialStockId"
placeholder="请输入库存记录ID"
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"
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="unitOfMeasure">
<el-input
v-model="queryParams.unitOfMeasure"
placeholder="请输入单位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库数量" prop="quantityRecived">
<el-input
v-model="queryParams.quantityRecived"
placeholder="请输入入库数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批次号" prop="batchCode">
<el-input
v-model="queryParams.batchCode"
placeholder="请输入批次号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库ID" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库编码" prop="warehouseCode">
<el-input
v-model="queryParams.warehouseCode"
placeholder="请输入仓库编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库名称" prop="warehouseName">
<el-input
v-model="queryParams.warehouseName"
placeholder="请输入仓库名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库区ID" prop="locationId">
<el-input
v-model="queryParams.locationId"
placeholder="请输入库区ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库区编码" prop="locationCode">
<el-input
v-model="queryParams.locationCode"
placeholder="请输入库区编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库区名称" prop="locationName">
<el-input
v-model="queryParams.locationName"
placeholder="请输入库区名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库位ID" prop="areaId">
<el-input
v-model="queryParams.areaId"
placeholder="请输入库位ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库位编码" prop="areaCode">
<el-input
v-model="queryParams.areaCode"
placeholder="请输入库位编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库位名称" prop="areaName">
<el-input
v-model="queryParams.areaName"
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
@ -162,7 +19,8 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['wm:productrecptline:edit']"
v-if="optType != 'view'"
v-hasPermi="['mes:wm:productrecpt:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
@ -173,51 +31,32 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['wm:productrecptline:remove']"
v-if="optType != 'view'"
v-hasPermi="['mes:wm:productrecpt: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="['wm:productrecptline:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="productrecptlineList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="行ID" align="center" prop="lineId" />
<el-table-column label="入库记录ID" align="center" prop="recptId" />
<el-table-column label="库存记录ID" align="center" prop="materialStockId" />
<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="规格型号" align="center" prop="specification" />
<el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
<el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" width="120px" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="入库数量" align="center" prop="quantityRecived" />
<el-table-column label="批次号" align="center" prop="batchCode" />
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
<el-table-column label="仓库编码" align="center" prop="warehouseCode" />
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<el-table-column label="库区ID" align="center" prop="locationId" />
<el-table-column label="库区编码" align="center" prop="locationCode" />
<el-table-column label="库区名称" align="center" prop="locationName" />
<el-table-column label="库位ID" align="center" prop="areaId" />
<el-table-column label="库位编码" align="center" prop="areaCode" />
<el-table-column label="库位名称" align="center" prop="areaName" />
<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" 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-if="optType != 'view'"
v-hasPermi="['wm:productrecptline:edit']"
>修改</el-button>
<el-button
@ -225,6 +64,7 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-if="optType != 'view'"
v-hasPermi="['wm:productrecptline:remove']"
>删除</el-button>
</template>
@ -240,65 +80,64 @@
/>
<!-- 添加或修改产品入库记录行对话框 -->
<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="入库记录ID" prop="recptId">
<el-input v-model="form.recptId" placeholder="请输入入库记录ID" />
</el-form-item>
<el-form-item label="库存记录ID" prop="materialStockId">
<el-input v-model="form.materialStockId" placeholder="请输入库存记录ID" />
</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-form-item>
<el-form-item label="规格型号" prop="specification">
<el-input v-model="form.specification" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="单位" prop="unitOfMeasure">
<el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
</el-form-item>
<el-form-item label="入库数量" prop="quantityRecived">
<el-input v-model="form.quantityRecived" placeholder="请输入入库数量" />
</el-form-item>
<el-form-item label="批次号" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入批次号" />
</el-form-item>
<el-form-item label="仓库ID" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
</el-form-item>
<el-form-item label="仓库编码" prop="warehouseCode">
<el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
</el-form-item>
<el-form-item label="仓库名称" prop="warehouseName">
<el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
</el-form-item>
<el-form-item label="库区ID" prop="locationId">
<el-input v-model="form.locationId" placeholder="请输入库区ID" />
</el-form-item>
<el-form-item label="库区编码" prop="locationCode">
<el-input v-model="form.locationCode" placeholder="请输入库区编码" />
</el-form-item>
<el-form-item label="库区名称" prop="locationName">
<el-input v-model="form.locationName" placeholder="请输入库区名称" />
</el-form-item>
<el-form-item label="库位ID" prop="areaId">
<el-input v-model="form.areaId" placeholder="请输入库位ID" />
</el-form-item>
<el-form-item label="库位编码" prop="areaCode">
<el-input v-model="form.areaCode" placeholder="请输入库位编码" />
</el-form-item>
<el-form-item label="库位名称" prop="areaName">
<el-input v-model="form.areaName" placeholder="请输入库位名称" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
<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="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入产品物料编码" >
<el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button>
</el-input>
<StockSelect ref="stockSelect" :workorderId="workorderId" :warehouseCode="XBK_VIRTUAL" @onSelected="onStockSelected"></StockSelect>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品物料名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入产品物料名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位" prop="unitOfMeasure">
<el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
</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-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="入库数量" prop="quantityRecived">
<el-input v-model="form.quantityRecived" placeholder="请输入入库数量" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="批次号" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入批次号" />
</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="submitForm">确 定</el-button>
@ -310,11 +149,26 @@
<script>
import { listProductrecptline, getProductrecptline, delProductrecptline, addProductrecptline, updateProductrecptline } from "@/api/mes/wm/productrecptline";
import StockSelect from "@/components/stockSelect/single.vue"
export default {
name: "Productrecptline",
components:{
StockSelect
},
props: {
recptId: null,
optType: null,
workorderId:null
},
data() {
return {
warehouseInfo:[],
warehouseOptions:[],
warehouseProps:{
multiple: false,
value: 'pId',
label: 'pName',
},
// 遮罩层
loading: true,
// 选中数组
@ -337,7 +191,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
recptId: null,
recptId: this.recptId,
materialStockId: null,
itemId: null,
itemCode: null,
@ -361,7 +215,7 @@ export default {
// 表单校验
rules: {
itemId: [
{ required: true, message: "产品物料ID不能为空", trigger: "blur" }
{ required: true, message: "产品不能为空", trigger: "blur" }
],
quantityRecived: [
{ required: true, message: "入库数量不能为空", trigger: "blur" }
@ -371,6 +225,7 @@ export default {
},
created() {
this.getList();
this.getWarehouseList();
},
methods: {
/** 查询产品入库记录行列表 */
@ -382,6 +237,23 @@ export default {
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(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
this.warehouseOptions = JSON.parse(ostr);
});
},
// 取消按钮
cancel() {
this.open = false;
@ -488,7 +360,25 @@ export default {
this.download('wm/productrecptline/export', {
...this.queryParams
}, `productrecptline_${new Date().getTime()}.xlsx`)
}
},
handleSelectStock(){
this.$refs.stockSelect.showFlag = true;
this.$refs.stockSelect.getList();
},
//物料选择弹出框
onStockSelected(obj){
if(obj != undefined && obj != null){
this.form.materialStockId = obj.materialStockId;
this.form.itemId = obj.itemId;
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.batchCode = obj.batchCode;
this.form.quantityRecpt = obj.quantityOnhand;
this.form.quantityMax = obj.quantityOnhand;
}
},
}
};
</script>