yinq
/
aucma-mes-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update - 库存统计、生产BOM

Browse Source
master
yinq 11 months ago
parent 2c842b5f40
commit 7f059d4761
4 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File

8
src/views/base/materialInfo/index.vue
Unescape Escape View File

@ -1,6 +1,14 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="物料编号" prop="materialCode">
<el-input
v-model="queryParams.materialCode"
placeholder="请输入物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-input
v-model="queryParams.materialName"

18
src/views/base/orderInfo/index.vue
Unescape Escape 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="workCenterCode" >
<el-select v-model="queryParams.workCenterCode" placeholder="请选择工作中心" >
<el-option
@ -29,10 +29,20 @@
/>
</el-select>
</el-form-item>
<el-form-item label="工单状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
<!-- <el-form-item label="工单状态" prop="orderStatus">-->
<!-- <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.order_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="是否已下达到生产计划" prop="isRelease">
<el-select v-model="queryParams.isRelease" placeholder="请选择工单类型" clearable>
<el-option
v-for="dict in dict.type.order_status"
v-for="dict in dict.type.is_release"
:key="dict.value"
:label="dict.label"
:value="dict.value"

30
src/views/production/baseBomInfo/index.vue
Unescape Escape View File

@ -1,22 +1,32 @@
<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="materialCode">
<el-form-item label="成品物料编号" prop="materialCode">
<el-input
v-model="queryParams.materialCode"
placeholder="请输入物料编号"
placeholder="请输入成品物料编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-form-item label="成品物料名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入物料名称"
placeholder="请输入成品物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否可生产" prop="isPlanToStation">
<el-select v-model="queryParams.isPlanToStation" placeholder="请选择是否可生产" clearable>
<el-option
v-for="dict in dict.type.is_release"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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>
@ -100,9 +110,9 @@
<el-table-column label="工厂名称" align="center" prop="plantName" v-if="columns[7].visible"/>
<!-- <el-table-column label="产线/工位" align="center" prop="productLineCode" v-if="columns[8].visible"/>-->
<!-- <el-table-column label="工单编号" align="center" prop="orderCode" v-if="columns[14].visible"/>-->
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[9].visible">
<el-table-column label="是否可生产" align="center" prop="isPlanToStation" v-if="columns[9].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
<dict-tag :options="dict.type.is_release" :value="scope.row.isPlanToStation"/>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[10].visible"/>
@ -229,7 +239,7 @@ import addBom from '@//views/base/orderBomInfo/addBom.vue';
export default {
name: "BaseBomInfo",
dicts: ['material_subclass', 'is_flag'],
dicts: ['material_subclass', 'is_flag','is_release'],
components: {
'add-bom': addBom
},
@ -267,6 +277,7 @@ export default {
parentId: null,
plantCode: null,
productLineCode: null,
isPlanToStation: null,
isFlag: null,
createdBy: null,
createdTime: null,
@ -289,8 +300,8 @@ export default {
{ key: 6, label: `父物料编号`, visible: true },
{ key: 7, label: `工厂编号`, visible: true },
{ key: 8, label: `产线/工位`, visible: true },
{ key: 9, label: `是否标识`, visible: true },
{ key: 10, label: `创建人`, visible: true },
{ key: 9, label: `是否可生产`, visible: true },
{ key: 10, label: `创建人`, visible: false },
{ key: 11, label: `创建时间`, visible: true },
{ key: 12, label: `更新人`, visible: false },
{ key: 13, label: `更新时间`, visible: false },
@ -333,6 +344,7 @@ export default {
parentId: null,
plantCode: null,
productLineCode: null,
isPlanToStation: null,
isFlag: 0,
createdBy: null,
createdTime: null,

5
src/views/report/inventoryStatistics/index.vue
Unescape Escape View File

@ -56,8 +56,8 @@
<!-- <el-table-column label="主键标识" align="center" prop="OBJ_ID"/>-->
<el-table-column label="在制品库编号" align="center" prop="MATERIALCODE"/>
<el-table-column label="在制品库名称" align="center" prop="MATERIALNAME"/>
<el-table-column label="物料类型" align="center" prop="STORECODE"/>
<el-table-column label="物料名称" align="center" prop="STORENAME"/>
<!-- <el-table-column label="物料类型" align="center" prop="STORECODE"/>-->
<el-table-column label="物料型号" align="center" prop="STORENAME"/>
<el-table-column label="库存数量" align="center" prop="SPACESTOCK" />
</el-table>
</div>
@ -159,7 +159,6 @@ export default {
};
this.spaceNumber = response.data.map(item => item.spaceCapacity).reduce((accumulator, currentValue) => accumulator + currentValue);
this.occupancyNumber = response.data.map(item => item.spaceStock).reduce((accumulator, currentValue) => accumulator + currentValue);
console.log(this.spaceNumber)
this.initBarChart();
});
},

Write Preview
Loading…
Cancel
Save