✨ feat(mes): 添加物料编码、名称及规格字段,更新状态管理
parent
74e058ee49
commit
2cde22dcd7
|
|
@ -213,8 +213,8 @@ export const MesWmItemReceiptStatusEnum = {
|
||||||
export const MesWmTransferStatusEnum = {
|
export const MesWmTransferStatusEnum = {
|
||||||
PREPARE: MesOrderStatusConstants.DRAFT,
|
PREPARE: MesOrderStatusConstants.DRAFT,
|
||||||
UNCONFIRMED: MesOrderStatusConstants.CONFIRMED,
|
UNCONFIRMED: MesOrderStatusConstants.CONFIRMED,
|
||||||
UNSTOCK: MesOrderStatusConstants.APPROVING,
|
APPROVING: MesOrderStatusConstants.APPROVING,
|
||||||
UNEXECUTE: MesOrderStatusConstants.APPROVED,
|
APPROVED: MesOrderStatusConstants.APPROVED,
|
||||||
FINISHED: MesOrderStatusConstants.FINISHED,
|
FINISHED: MesOrderStatusConstants.FINISHED,
|
||||||
CANCELED: MesOrderStatusConstants.CANCELLED
|
CANCELED: MesOrderStatusConstants.CANCELLED
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="pl-60px pr-20px py-10px">
|
<div class="pl-60px pr-20px py-10px">
|
||||||
<el-table v-loading="loading" :data="list" border size="small">
|
<el-table v-loading="loading" :data="list" border size="small">
|
||||||
<!-- TODO @ai:这里物料编码、等等字段没展示,看看后端是不是没读取 -->
|
|
||||||
<el-table-column label="移入仓库" align="center" prop="toWarehouseName" min-width="100" />
|
<el-table-column label="移入仓库" align="center" prop="toWarehouseName" min-width="100" />
|
||||||
<el-table-column label="移入库区" align="center" prop="toLocationName" min-width="100" />
|
<el-table-column label="移入库区" align="center" prop="toLocationName" min-width="100" />
|
||||||
<el-table-column label="移入库位" align="center" prop="toAreaName" min-width="100" />
|
<el-table-column label="移入库位" align="center" prop="toAreaName" min-width="100" />
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,6 @@
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<!-- TODO @ai:这里物料编码、等等字段没展示,看看后端是不是没读取 -->
|
|
||||||
<el-table-column label="物料编码" align="center" prop="itemCode" min-width="120" />
|
<el-table-column label="物料编码" align="center" prop="itemCode" min-width="120" />
|
||||||
<el-table-column label="物料名称" align="center" prop="itemName" min-width="140" />
|
<el-table-column label="物料名称" align="center" prop="itemName" min-width="140" />
|
||||||
<el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
|
<el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
|
||||||
|
|
|
||||||
|
|
@ -137,7 +137,7 @@
|
||||||
到货确认
|
到货确认
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
v-if="scope.row.status === MesWmTransferStatusEnum.UNSTOCK"
|
v-if="scope.row.status === MesWmTransferStatusEnum.APPROVING"
|
||||||
link
|
link
|
||||||
type="success"
|
type="success"
|
||||||
@click="openForm('stock', scope.row.id)"
|
@click="openForm('stock', scope.row.id)"
|
||||||
|
|
@ -146,7 +146,7 @@
|
||||||
执行上架
|
执行上架
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
v-if="scope.row.status === MesWmTransferStatusEnum.UNEXECUTE"
|
v-if="scope.row.status === MesWmTransferStatusEnum.APPROVED"
|
||||||
link
|
link
|
||||||
type="primary"
|
type="primary"
|
||||||
@click="handleFinish(scope.row.id)"
|
@click="handleFinish(scope.row.id)"
|
||||||
|
|
@ -157,8 +157,8 @@
|
||||||
<el-button
|
<el-button
|
||||||
v-if="[
|
v-if="[
|
||||||
MesWmTransferStatusEnum.UNCONFIRMED,
|
MesWmTransferStatusEnum.UNCONFIRMED,
|
||||||
MesWmTransferStatusEnum.UNSTOCK,
|
MesWmTransferStatusEnum.APPROVING,
|
||||||
MesWmTransferStatusEnum.UNEXECUTE
|
MesWmTransferStatusEnum.APPROVED
|
||||||
].includes(scope.row.status)"
|
].includes(scope.row.status)"
|
||||||
link
|
link
|
||||||
type="danger"
|
type="danger"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue