yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

✨ feat(mes): 新增批次编码字段及外协工单编码处理逻辑

pull/871/MERGE
YunaiV 2026-04-01 00:42:54 +08:00
parent f9e3eba6b6
commit a21d5193f7
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailList.vue
View File

@ -2,7 +2,7 @@
<template> <template>
<div class="pl-60px pr-20px py-10px"> <div class="pl-60px pr-20px py-10px">
<el-button <el-button
v-if="isUpdate" v-if="isUpdate || isStock"
type="primary" type="primary"
plain plain
size="small" size="small"
@ -12,10 +12,11 @@
<Icon icon="ep:plus" class="mr-5px" /> 添加明细 <Icon icon="ep:plus" class="mr-5px" /> 添加明细
</el-button> </el-button>
<el-table v-loading="loading" :data="list" border size="small"> <el-table v-loading="loading" :data="list" border size="small">
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" /> <el-table-column label="仓库名称" align="center" prop="warehouseName" min-width="100" />
<el-table-column label="库位名称" align="center" prop="locationName" min-width="100" /> <el-table-column label="库区名称" align="center" prop="locationName" min-width="100" />
<el-table-column label="库位名称" align="center" prop="areaName" min-width="100" />
<el-table-column label="数量" align="center" prop="quantity" width="100" /> <el-table-column label="数量" align="center" prop="quantity" width="100" />
<el-table-column v-if="isUpdate" label="操作" align="center" width="120" fixed="right"> <el-table-column v-if="isUpdate || isStock" label="操作" align="center" width="120" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="emit('edit-detail', scope.row.id)"> <el-button link type="primary" @click="emit('edit-detail', scope.row.id)">
编辑 编辑
@ -48,6 +49,7 @@ const { t } = useI18n()
const message = useMessage() const message = useMessage()
const isUpdate = computed(() => ['create', 'update'].includes(props.formType)) const isUpdate = computed(() => ['create', 'update'].includes(props.formType))
const isStock = computed(() => props.formType === 'stock')
const loading = ref(false) const loading = ref(false)
const list = ref<WmOutsourceReceiptDetailVO[]>([]) const list = ref<WmOutsourceReceiptDetailVO[]>([])

2
src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue
View File

@ -30,7 +30,7 @@
<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" />
<el-table-column label="单位" align="center" prop="unitName" width="80" /> <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="入库数量" align="center" prop="quantity" width="100" /> <el-table-column label="入库数量" align="center" prop="quantity" width="100" />
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" /> <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
<el-table-column label="是否检验" align="center" prop="iqcCheckFlag" width="100"> <el-table-column label="是否检验" align="center" prop="iqcCheckFlag" width="100">