✨ feat(mes): 添加采购入库明细列表接口及上架明细表单功能
YunaiV
parent
ea476a1ec3
commit
e736f26166
|
|
@ -24,9 +24,9 @@ export interface WmItemReceiptDetailVO {
|
|||
|
||||
// MES 采购入库明细 API
|
||||
export const WmItemReceiptDetailApi = {
|
||||
// 查询采购入库明细分页
|
||||
getItemReceiptDetailPage: async (params: any) => {
|
||||
return await request.get({ url: '/mes/wm/item-receipt-detail/page', params })
|
||||
// 查询采购入库明细列表（按行编号）
|
||||
getItemReceiptDetailListByLineId: async (lineId: number) => {
|
||||
return await request.get({ url: '/mes/wm/item-receipt-detail/list-by-line', params: { lineId } })
|
||||
},
|
||||
|
||||
// 查询采购入库明细详情
|
||||
|
|
|
|||
|
|
@ -0,0 +1,147 @@
|
|||
<!-- MES 采购入库上架明细表单弹窗 -->
|
||||
<template>
|
||||
<Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="formData"
|
||||
:rules="formRules"
|
||||
label-width="110px"
|
||||
v-loading="formLoading"
|
||||
>
|
||||
<el-form-item label="物料" prop="itemId">
|
||||
<MdItemSelect v-model="formData.itemId" disabled />
|
||||
</el-form-item>
|
||||
<el-form-item label="入库仓库" prop="warehouseId">
|
||||
<WmWarehouseSelect v-model="formData.warehouseId" />
|
||||
</el-form-item>
|
||||
<el-form-item label="库区" prop="locationId" v-if="formData.warehouseId">
|
||||
<WmWarehouseLocationSelect
|
||||
v-model="formData.locationId"
|
||||
:warehouse-id="formData.warehouseId"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="库位" prop="areaId" v-if="formData.locationId">
|
||||
<WmWarehouseAreaSelect v-model="formData.areaId" :location-id="formData.locationId" />
|
||||
</el-form-item>
|
||||
<el-form-item label="数量" prop="quantity">
|
||||
<el-input-number
|
||||
v-model="formData.quantity"
|
||||
:precision="2"
|
||||
:min="0"
|
||||
controls-position="right"
|
||||
class="!w-1/1"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { WmItemReceiptDetailApi, WmItemReceiptDetailVO } from '@/api/mes/wm/itemreceipt/detail'
|
||||
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
|
||||
import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue'
|
||||
import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue'
|
||||
import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehouseAreaSelect.vue'
|
||||
|
||||
defineOptions({ name: 'ItemReceiptDetailForm' })
|
||||
|
||||
const props = defineProps<{
|
||||
receiptId: number
|
||||
}>()
|
||||
|
||||
const emit = defineEmits(['success'])
|
||||
|
||||
const { t } = useI18n() // 国际化
|
||||
const message = useMessage() // 消息弹窗
|
||||
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const dialogTitle = ref('') // 弹窗的标题
|
||||
const formLoading = ref(false) // 表单的加载中
|
||||
const formType = ref('') // 表单的类型：create / update
|
||||
const currentLineId = ref<number>() // 当前操作的行 ID
|
||||
const formRef = ref() // 表单 Ref
|
||||
const formData = ref({
|
||||
id: undefined as number | undefined,
|
||||
lineId: undefined as number | undefined,
|
||||
receiptId: undefined as number | undefined,
|
||||
itemId: undefined as number | undefined,
|
||||
quantity: undefined as number | undefined,
|
||||
warehouseId: undefined as number | undefined,
|
||||
locationId: undefined as number | undefined,
|
||||
areaId: undefined as number | undefined
|
||||
})
|
||||
const formRules = reactive({
|
||||
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
|
||||
warehouseId: [{ required: true, message: '入库仓库不能为空', trigger: 'change' }],
|
||||
locationId: [{ required: true, message: '库区不能为空', trigger: 'change' }],
|
||||
areaId: [{ required: true, message: '库位不能为空', trigger: 'change' }],
|
||||
quantity: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
|
||||
})
|
||||
|
||||
/** 打开弹窗 */
|
||||
const open = async (type: string, lineId: number, itemId?: number, detailId?: number) => {
|
||||
dialogVisible.value = true
|
||||
dialogTitle.value = type === 'create' ? '添加上架明细' : '编辑上架明细'
|
||||
formType.value = type
|
||||
currentLineId.value = lineId
|
||||
resetForm()
|
||||
// 修改时，设置数据
|
||||
if (detailId) {
|
||||
formLoading.value = true
|
||||
try {
|
||||
formData.value = await WmItemReceiptDetailApi.getItemReceiptDetail(detailId)
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
} else if (itemId) {
|
||||
formData.value.itemId = itemId
|
||||
}
|
||||
}
|
||||
defineExpose({ open })
|
||||
|
||||
/** 提交表单 */
|
||||
const submitForm = async () => {
|
||||
// 校验表单
|
||||
await formRef.value.validate()
|
||||
// 提交请求
|
||||
formLoading.value = true
|
||||
try {
|
||||
const data = {
|
||||
...formData.value,
|
||||
receiptId: props.receiptId,
|
||||
lineId: currentLineId.value
|
||||
} as unknown as WmItemReceiptDetailVO
|
||||
if (formType.value === 'create') {
|
||||
await WmItemReceiptDetailApi.createItemReceiptDetail(data)
|
||||
message.success(t('common.createSuccess'))
|
||||
} else {
|
||||
await WmItemReceiptDetailApi.updateItemReceiptDetail(data)
|
||||
message.success(t('common.updateSuccess'))
|
||||
}
|
||||
dialogVisible.value = false
|
||||
// 发送操作成功的事件
|
||||
emit('success', currentLineId.value)
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
lineId: undefined,
|
||||
receiptId: undefined,
|
||||
itemId: undefined,
|
||||
quantity: undefined,
|
||||
warehouseId: undefined,
|
||||
locationId: undefined,
|
||||
areaId: undefined
|
||||
}
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
</script>
|
||||
|
|
@ -1,138 +1,42 @@
|
|||
<!-- MES 采购入库明细列表子组件（上架分配） -->
|
||||
<!-- TODO DONE @AI：暂不融合。当前通过行弹窗嵌套展示明细，结构清晰。后续可考虑改为 el-table expand-row 折叠行方式 -->
|
||||
<!-- MES 采购入库上架明细列表（展开行内嵌子组件） -->
|
||||
<template>
|
||||
<div>
|
||||
<!-- TODO @AI：不用这个交互，还是使用所在行的【上架】操作； -->
|
||||
<el-button v-if="!isReadonly" type="primary" plain @click="openForm('create')" class="mb-10px">
|
||||
<Icon icon="ep:plus" class="mr-5px" /> 添加上架明细
|
||||
</el-button>
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
|
||||
<!-- TODO @AI：折叠方案【必须按照我说的】：如果有 MesWmItemReceiptDetailDO，则可以展开展示；只在存在类似数据的时候，才有这个交互；
|
||||
字段有：仓库名称、库区名称、库位名称、上架数量；如果没有数据，则不展示这个交互；【允许编辑、删除】；当然，还是要注意下 formType；
|
||||
-->
|
||||
<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="specification" min-width="120" />
|
||||
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
|
||||
<div class="pl-60px pr-20px py-10px">
|
||||
<el-table v-loading="loading" :data="list" border size="small">
|
||||
<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="areaName" min-width="100" />
|
||||
<el-table-column label="上架数量" align="center" prop="quantity" width="100" />
|
||||
<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="areaName" min-width="100" />
|
||||
<el-table-column label="备注" align="center" prop="remark" min-width="120" />
|
||||
<el-table-column v-if="!isReadonly" label="操作" align="center" width="120" fixed="right">
|
||||
<el-table-column
|
||||
v-if="props.formType === 'shelving'"
|
||||
label="操作"
|
||||
align="center"
|
||||
width="120"
|
||||
fixed="right"
|
||||
>
|
||||
<template #default="scope">
|
||||
<!-- TODO DONE @AI：已通过 isReadonly 计算属性控制。shelving 模式下可编辑，detail 模式只读 -->
|
||||
<el-button link type="primary" @click="openForm('update', scope.row.id)">编辑</el-button>
|
||||
<el-button link type="primary" @click="emit('edit-detail', scope.row.id)">
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button link type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
|
||||
<!-- TODO @AI：你没理解我的意思，我指的是：formType 为“上架”时，需要有 【上架】按钮。然后弹出 MesWmItemReceiptDetailDO 的添加！！！
|
||||
|
||||
里面的字段是：【物资材料选择】【入库仓库】【数量】；
|
||||
-->
|
||||
<!-- TODO @芋艿【暂时不用删除】：标签打印； -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<Pagination
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<!-- 添加/编辑上架明细弹窗 -->
|
||||
<!-- TODO DONE @AI：当前方案为弹窗嵌套展示，暂不改为折叠行 -->
|
||||
<Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="formData"
|
||||
:rules="formRules"
|
||||
label-width="110px"
|
||||
v-loading="formLoading"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="物料" prop="itemId">
|
||||
<el-select
|
||||
v-model="formData.itemId"
|
||||
placeholder="请选择物料"
|
||||
filterable
|
||||
clearable
|
||||
class="!w-1/1"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in itemList"
|
||||
:key="item.id"
|
||||
:label="`${item.code} - ${item.name}`"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="上架数量" prop="quantity">
|
||||
<el-input-number
|
||||
v-model="formData.quantity"
|
||||
:precision="2"
|
||||
:min="0"
|
||||
controls-position="right"
|
||||
class="!w-1/1"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="仓库" prop="warehouseId">
|
||||
<WmWarehouseSelect v-model="formData.warehouseId" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="库区" prop="locationId">
|
||||
<WmWarehouseLocationSelect
|
||||
v-model="formData.locationId"
|
||||
:warehouse-id="formData.warehouseId"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="库位" prop="areaId">
|
||||
<WmWarehouseAreaSelect v-model="formData.areaId" :location-id="formData.locationId" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { WmItemReceiptDetailApi, WmItemReceiptDetailVO } from '@/api/mes/wm/itemreceipt/detail'
|
||||
import { MdItemApi } from '@/api/mes/md/item'
|
||||
import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue'
|
||||
import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue'
|
||||
import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehouseAreaSelect.vue'
|
||||
|
||||
defineOptions({ name: 'ItemReceiptDetailList' })
|
||||
|
||||
const props = defineProps<{
|
||||
receiptId: number
|
||||
lineId: number
|
||||
itemId: number
|
||||
formType: string
|
||||
}>()
|
||||
|
||||
/** 明细在 detail 模式下只读，shelving 模式下可编辑 */
|
||||
const isReadonly = computed(() => props.formType === 'detail')
|
||||
const emit = defineEmits(['edit-detail'])
|
||||
|
||||
const { t } = useI18n() // 国际化
|
||||
const message = useMessage() // 消息弹窗
|
||||
|
|
@ -140,123 +44,30 @@ const message = useMessage() // 消息弹窗
|
|||
// ==================== 列表 ====================
|
||||
const loading = ref(false) // 列表的加载中
|
||||
const list = ref<WmItemReceiptDetailVO[]>([]) // 明细列表
|
||||
const total = ref(0) // 列表的总页数
|
||||
const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
receiptId: undefined as number | undefined,
|
||||
lineId: undefined as number | undefined
|
||||
})
|
||||
|
||||
/** 查询明细列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
queryParams.receiptId = props.receiptId
|
||||
queryParams.lineId = props.lineId
|
||||
const data = await WmItemReceiptDetailApi.getItemReceiptDetailPage(queryParams)
|
||||
list.value = data.list
|
||||
total.value = data.total
|
||||
list.value = await WmItemReceiptDetailApi.getItemReceiptDetailListByLineId(props.lineId)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
defineExpose({ getList })
|
||||
|
||||
/** 删除 */
|
||||
const handleDelete = async (id: number) => {
|
||||
/** 删除上架明细 */
|
||||
const handleDelete = async (detailId: number) => {
|
||||
try {
|
||||
await message.delConfirm()
|
||||
await WmItemReceiptDetailApi.deleteItemReceiptDetail(id)
|
||||
await WmItemReceiptDetailApi.deleteItemReceiptDetail(detailId)
|
||||
message.success(t('common.delSuccess'))
|
||||
await getList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
// ==================== 添加/编辑表单 ====================
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const dialogTitle = ref('') // 弹窗的标题
|
||||
const formLoading = ref(false) // 表单的加载中
|
||||
const detailFormType = ref('') // 明细表单的类型
|
||||
const itemList = ref<any[]>([]) // 物料列表
|
||||
const formData = ref({
|
||||
id: undefined,
|
||||
lineId: undefined as number | undefined,
|
||||
receiptId: undefined as number | undefined,
|
||||
itemId: undefined,
|
||||
quantity: undefined,
|
||||
warehouseId: undefined as number | undefined,
|
||||
locationId: undefined as number | undefined,
|
||||
areaId: undefined as number | undefined,
|
||||
batchId: undefined,
|
||||
remark: undefined
|
||||
})
|
||||
const formRules = reactive({
|
||||
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
|
||||
quantity: [{ required: true, message: '上架数量不能为空', trigger: 'blur' }]
|
||||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
|
||||
/** 打开表单弹窗 */
|
||||
const openForm = async (type: string, id?: number) => {
|
||||
dialogVisible.value = true
|
||||
dialogTitle.value = t('action.' + type)
|
||||
detailFormType.value = type
|
||||
resetForm()
|
||||
// 加载物料列表
|
||||
itemList.value = await MdItemApi.getItemSimpleList()
|
||||
if (id) {
|
||||
formLoading.value = true
|
||||
try {
|
||||
formData.value = await WmItemReceiptDetailApi.getItemReceiptDetail(id)
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 提交表单 */
|
||||
const submitForm = async () => {
|
||||
await formRef.value.validate()
|
||||
formLoading.value = true
|
||||
try {
|
||||
const data = {
|
||||
...formData.value,
|
||||
receiptId: props.receiptId,
|
||||
lineId: props.lineId
|
||||
} as unknown as WmItemReceiptDetailVO
|
||||
if (detailFormType.value === 'create') {
|
||||
await WmItemReceiptDetailApi.createItemReceiptDetail(data)
|
||||
message.success(t('common.createSuccess'))
|
||||
} else {
|
||||
await WmItemReceiptDetailApi.updateItemReceiptDetail(data)
|
||||
message.success(t('common.updateSuccess'))
|
||||
}
|
||||
dialogVisible.value = false
|
||||
await getList()
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
lineId: undefined,
|
||||
receiptId: undefined,
|
||||
itemId: undefined,
|
||||
quantity: undefined,
|
||||
warehouseId: undefined,
|
||||
locationId: undefined,
|
||||
areaId: undefined,
|
||||
batchId: undefined,
|
||||
remark: undefined
|
||||
}
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
|
||||
/** 初始化 */
|
||||
onMounted(async () => {
|
||||
await getList()
|
||||
/** 初始化：延迟加载，展开时才触发 */
|
||||
onMounted(() => {
|
||||
getList()
|
||||
})
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,11 @@
|
|||
<el-col :span="8">
|
||||
<!-- 入库单编号：新增时可自动生成，其他模式不可生成 -->
|
||||
<el-form-item label="入库单编号" prop="code">
|
||||
<el-input v-model="formData.code" placeholder="请输入入库单编号" :disabled="isHeaderReadonly">
|
||||
<el-input
|
||||
v-model="formData.code"
|
||||
placeholder="请输入入库单编号"
|
||||
:disabled="isHeaderReadonly"
|
||||
>
|
||||
<template #append>
|
||||
<el-button @click="generateCode" :disabled="formType !== 'create'">
|
||||
生成
|
||||
|
|
@ -22,12 +26,20 @@
|
|||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="入库单名称" prop="name">
|
||||
<el-input v-model="formData.name" placeholder="请输入入库单名称" :disabled="isHeaderReadonly" />
|
||||
<el-input
|
||||
v-model="formData.name"
|
||||
placeholder="请输入入库单名称"
|
||||
:disabled="isHeaderReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="采购订单编号" prop="purchaseOrderCode">
|
||||
<el-input v-model="formData.purchaseOrderCode" placeholder="请输入采购订单编号" :disabled="isHeaderReadonly" />
|
||||
<el-input
|
||||
v-model="formData.purchaseOrderCode"
|
||||
placeholder="请输入采购订单编号"
|
||||
:disabled="isHeaderReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -67,7 +79,12 @@
|
|||
</el-col>
|
||||
<el-col :span="16">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" :disabled="isHeaderReadonly" />
|
||||
<el-input
|
||||
v-model="formData.remark"
|
||||
type="textarea"
|
||||
placeholder="请输入备注"
|
||||
:disabled="isHeaderReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -78,22 +95,13 @@
|
|||
<ItemReceiptLineList :receipt-id="formData.id" :form-type="formType" />
|
||||
</template>
|
||||
<template #footer>
|
||||
<!-- create/update 模式 -->
|
||||
<template v-if="formType === 'create' || formType === 'update'">
|
||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
</template>
|
||||
<!-- shelving 模式 -->
|
||||
<template v-else-if="formType === 'shelving'">
|
||||
<el-button @click="handleShelving" type="primary" :disabled="formLoading">执行上架</el-button>
|
||||
<!-- TODO @AI：这里的【取消】操作去掉，避免误点 -->
|
||||
<el-button @click="handleCancelReceipt" type="danger" :disabled="formLoading">取消入库单</el-button>
|
||||
<el-button @click="dialogVisible = false">关 闭</el-button>
|
||||
</template>
|
||||
<!-- detail 模式 -->
|
||||
<template v-else>
|
||||
<el-button @click="dialogVisible = false">关 闭</el-button>
|
||||
</template>
|
||||
<el-button v-if="isUpdate" @click="submitForm" type="primary" :disabled="formLoading"
|
||||
>确 定</el-button
|
||||
>
|
||||
<el-button v-if="isShelving" @click="handleShelving" type="primary" :disabled="formLoading"
|
||||
>执行上架</el-button
|
||||
>
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
</template>
|
||||
|
|
@ -133,18 +141,15 @@ const formRules = reactive({
|
|||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
|
||||
/** Header fields are read-only in shelving/detail modes */
|
||||
const isHeaderReadonly = computed(() =>
|
||||
['shelving', 'detail'].includes(formType.value)
|
||||
)
|
||||
|
||||
/** 弹窗标题映射 */
|
||||
const isUpdate = computed(() => ['create', 'update'].includes(formType.value)) // 是否为编辑模式
|
||||
const isShelving = computed(() => formType.value === 'shelving') // 是否为上架模式
|
||||
const isHeaderReadonly = computed(() => ['shelving', 'detail'].includes(formType.value)) // 是否只读
|
||||
const dialogTitleMap: Record<string, string> = {
|
||||
create: '新增采购入库单',
|
||||
update: '编辑采购入库单',
|
||||
shelving: '执行上架',
|
||||
detail: '采购入库单详情'
|
||||
}
|
||||
} // 弹窗标题映射
|
||||
|
||||
/** 生成入库单编号 */
|
||||
const generateCode = () => {
|
||||
|
|
@ -194,6 +199,7 @@ const submitForm = async () => {
|
|||
message.success('修改成功')
|
||||
}
|
||||
dialogVisible.value = false
|
||||
// 发送操作成功的事件
|
||||
emit('success')
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
|
|
@ -215,21 +221,6 @@ const handleShelving = async () => {
|
|||
}
|
||||
}
|
||||
|
||||
/** 取消入库单 */
|
||||
const handleCancelReceipt = async () => {
|
||||
try {
|
||||
await message.confirm('确认取消该采购入库单？取消后不可恢复。')
|
||||
formLoading.value = true
|
||||
await WmItemReceiptApi.cancelItemReceipt(formData.value.id!)
|
||||
message.success('取消成功')
|
||||
dialogVisible.value = false
|
||||
emit('success')
|
||||
} catch {
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,29 @@
|
|||
<!-- MES 采购入库单行列表子组件 -->
|
||||
<template>
|
||||
<div>
|
||||
<el-button v-if="!isReadonly" type="primary" plain @click="openForm('create')" class="mb-10px">
|
||||
<el-button v-if="isUpdate" type="primary" plain @click="openForm('create')" class="mb-10px">
|
||||
<Icon icon="ep:plus" class="mr-5px" /> 添加物料
|
||||
</el-button>
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="list"
|
||||
:stripe="true"
|
||||
:show-overflow-tooltip="true"
|
||||
border
|
||||
:row-key="(row: any) => row.id"
|
||||
>
|
||||
<el-table-column type="expand">
|
||||
<template #default="scope">
|
||||
<ItemReceiptDetailList
|
||||
:ref="(el: any) => setDetailListRef(scope.row.id, el)"
|
||||
:receipt-id="props.receiptId"
|
||||
:line-id="scope.row.id"
|
||||
:item-id="scope.row.itemId"
|
||||
:form-type="props.formType"
|
||||
@edit-detail="(detailId: number) => openDetailForm('update', scope.row.id, scope.row.itemId, detailId)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<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="specification" min-width="120" />
|
||||
|
|
@ -16,10 +35,23 @@
|
|||
prop="productionBatchNumber"
|
||||
min-width="120"
|
||||
/>
|
||||
<el-table-column v-if="!isReadonly" label="操作" align="center" width="120" fixed="right">
|
||||
<el-table-column
|
||||
v-if="isUpdate || isShelving"
|
||||
label="操作"
|
||||
align="center"
|
||||
width="160"
|
||||
fixed="right"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" @click="openForm('update', scope.row.id)">编辑</el-button>
|
||||
<el-button link type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
|
||||
<el-button v-if="isUpdate" link type="primary" @click="openForm('update', scope.row.id)">
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button v-if="isUpdate" link type="danger" @click="handleDelete(scope.row.id)">
|
||||
删除
|
||||
</el-button>
|
||||
<el-button v-if="isShelving" link type="success" @click="handleShelving(scope.row.id)">
|
||||
上架
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -43,8 +75,6 @@
|
|||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="物料" prop="itemId">
|
||||
<!-- TODO DONE：物料选择已使用 el-select 实现，后续可替换为独立的 MdItemSelect 组件 -->
|
||||
<!-- TODO @AI：就是替换成 MdItemSelect -->
|
||||
<el-select
|
||||
v-model="formData.itemId"
|
||||
placeholder="请选择物料"
|
||||
|
|
@ -112,26 +142,21 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<!-- 编辑时展示上架明细 -->
|
||||
<template v-if="formData.id">
|
||||
<el-divider content-position="center">上架明细</el-divider>
|
||||
<ItemReceiptDetailList
|
||||
:receipt-id="props.receiptId"
|
||||
:line-id="formData.id"
|
||||
:form-type="props.formType"
|
||||
/>
|
||||
</template>
|
||||
<template #footer>
|
||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
|
||||
<!-- 上架明细添加/编辑弹窗 -->
|
||||
<ItemReceiptDetailForm ref="detailFormRef" :receipt-id="props.receiptId" @success="onDetailFormSuccess" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { WmItemReceiptLineApi, WmItemReceiptLineVO } from '@/api/mes/wm/itemreceipt/line'
|
||||
import { MdItemApi } from '@/api/mes/md/item'
|
||||
import ItemReceiptDetailList from './ItemReceiptDetailList.vue'
|
||||
import ItemReceiptDetailForm from './ItemReceiptDetailForm.vue'
|
||||
|
||||
defineOptions({ name: 'ItemReceiptLineList' })
|
||||
|
||||
|
|
@ -140,12 +165,12 @@ const props = defineProps<{
|
|||
formType: string
|
||||
}>()
|
||||
|
||||
/** 行列表在 shelving/detail 模式下只读 */
|
||||
const isReadonly = computed(() => ['shelving', 'detail'].includes(props.formType))
|
||||
|
||||
const { t } = useI18n() // 国际化
|
||||
const message = useMessage() // 消息弹窗
|
||||
|
||||
const isUpdate = computed(() => ['create', 'update'].includes(props.formType)) // 是否为编辑模式
|
||||
const isShelving = computed(() => props.formType === 'shelving') // 是否为上架模式
|
||||
|
||||
// ==================== 列表 ====================
|
||||
const loading = ref(false) // 列表的加载中
|
||||
const list = ref<WmItemReceiptLineVO[]>([]) // 行列表
|
||||
|
|
@ -260,6 +285,35 @@ const resetForm = () => {
|
|||
formRef.value?.resetFields()
|
||||
}
|
||||
|
||||
// ==================== 展开行：上架明细 ====================
|
||||
const detailListRefs = ref<Record<number, InstanceType<typeof ItemReceiptDetailList>>>({})
|
||||
|
||||
/** 缓存子组件 ref */
|
||||
const setDetailListRef = (lineId: number, el: any) => {
|
||||
if (el) {
|
||||
detailListRefs.value[lineId] = el
|
||||
}
|
||||
}
|
||||
|
||||
// ==================== 上架明细表单（LineList 层级持有） ====================
|
||||
const detailFormRef = ref()
|
||||
|
||||
/** 上架：直接打开明细创建表单 */
|
||||
const handleShelving = (lineId: number) => {
|
||||
const row = list.value.find((r) => r.id === lineId)
|
||||
openDetailForm('create', lineId, row?.itemId)
|
||||
}
|
||||
|
||||
/** 打开上架明细表单 */
|
||||
const openDetailForm = (type: string, lineId: number, itemId?: number, detailId?: number) => {
|
||||
detailFormRef.value.open(type, lineId, itemId, detailId)
|
||||
}
|
||||
|
||||
/** 明细表单提交成功后，刷新已展开行的 DetailList */
|
||||
const onDetailFormSuccess = (lineId: number) => {
|
||||
detailListRefs.value[lineId]?.getList()
|
||||
}
|
||||
|
||||
/** 初始化 */
|
||||
onMounted(async () => {
|
||||
await getList()
|
||||
|
|
|
|||
|
|
@ -1,185 +0,0 @@
|
|||
<!-- TODO DONE @AI：已 review，上架明细弹窗组件功能完整 -->
|
||||
<template>
|
||||
<Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="formData"
|
||||
:rules="formRules"
|
||||
label-width="110px"
|
||||
v-loading="formLoading"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="物料" prop="itemId">
|
||||
<el-select
|
||||
v-model="formData.itemId"
|
||||
placeholder="请选择物料"
|
||||
filterable
|
||||
clearable
|
||||
class="!w-1/1"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in itemList"
|
||||
:key="item.id"
|
||||
:label="`${item.code} - ${item.name}`"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="上架数量" prop="quantity">
|
||||
<el-input-number
|
||||
v-model="formData.quantity"
|
||||
:precision="2"
|
||||
:min="0"
|
||||
controls-position="right"
|
||||
class="!w-1/1"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="仓库" prop="warehouseId">
|
||||
<el-select
|
||||
v-model="formData.warehouseId"
|
||||
placeholder="请选择仓库"
|
||||
clearable
|
||||
class="!w-1/1"
|
||||
>
|
||||
<el-option
|
||||
v-for="warehouse in warehouseList"
|
||||
:key="warehouse.id"
|
||||
:label="warehouse.name"
|
||||
:value="warehouse.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="库区" prop="locationId">
|
||||
<el-input v-model="formData.locationId" placeholder="请输入库区ID" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="库位" prop="areaId">
|
||||
<el-input v-model="formData.areaId" placeholder="请输入库位ID" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { WmItemReceiptDetailApi, WmItemReceiptDetailVO } from '@/api/mes/wm/itemreceipt/detail'
|
||||
import { MdItemApi } from '@/api/mes/md/item'
|
||||
import { WmWarehouseApi } from '@/api/mes/wm/warehouse'
|
||||
|
||||
defineOptions({ name: 'ItemReceiptDetailForm' })
|
||||
|
||||
const props = defineProps<{ receiptId: number; lineId: number }>()
|
||||
const { t } = useI18n()
|
||||
const message = useMessage()
|
||||
|
||||
const dialogVisible = ref(false)
|
||||
const dialogTitle = ref('')
|
||||
const formLoading = ref(false)
|
||||
const formType = ref('')
|
||||
const itemList = ref<any[]>([])
|
||||
const warehouseList = ref<any[]>([])
|
||||
const formData = ref({
|
||||
id: undefined,
|
||||
lineId: undefined as number | undefined,
|
||||
receiptId: undefined as number | undefined,
|
||||
itemId: undefined,
|
||||
quantity: undefined,
|
||||
warehouseId: undefined,
|
||||
locationId: undefined,
|
||||
areaId: undefined,
|
||||
batchId: undefined,
|
||||
remark: undefined
|
||||
})
|
||||
const formRules = reactive({
|
||||
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
|
||||
quantity: [{ required: true, message: '上架数量不能为空', trigger: 'blur' }]
|
||||
})
|
||||
const formRef = ref()
|
||||
|
||||
/** 打开弹窗 */
|
||||
const open = async (type: string, id?: number) => {
|
||||
dialogVisible.value = true
|
||||
dialogTitle.value = t('action.' + type)
|
||||
formType.value = type
|
||||
resetForm()
|
||||
const [items, warehouses] = await Promise.all([
|
||||
MdItemApi.getItemSimpleList(),
|
||||
WmWarehouseApi.getWarehouseSimpleList()
|
||||
])
|
||||
itemList.value = items
|
||||
warehouseList.value = warehouses
|
||||
if (id) {
|
||||
formLoading.value = true
|
||||
try {
|
||||
formData.value = await WmItemReceiptDetailApi.getItemReceiptDetail(id)
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
}
|
||||
defineExpose({ open })
|
||||
|
||||
/** 提交表单 */
|
||||
const emit = defineEmits(['success'])
|
||||
const submitForm = async () => {
|
||||
await formRef.value.validate()
|
||||
formLoading.value = true
|
||||
try {
|
||||
const data = {
|
||||
...formData.value,
|
||||
receiptId: props.receiptId,
|
||||
lineId: props.lineId
|
||||
} as unknown as WmItemReceiptDetailVO
|
||||
if (formType.value === 'create') {
|
||||
await WmItemReceiptDetailApi.createItemReceiptDetail(data)
|
||||
message.success(t('common.createSuccess'))
|
||||
} else {
|
||||
await WmItemReceiptDetailApi.updateItemReceiptDetail(data)
|
||||
message.success(t('common.updateSuccess'))
|
||||
}
|
||||
dialogVisible.value = false
|
||||
emit('success')
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
lineId: undefined,
|
||||
receiptId: undefined,
|
||||
itemId: undefined,
|
||||
quantity: undefined,
|
||||
warehouseId: undefined,
|
||||
locationId: undefined,
|
||||
areaId: undefined,
|
||||
batchId: undefined,
|
||||
remark: undefined
|
||||
}
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
</script>
|
||||
|
|
@ -1,167 +0,0 @@
|
|||
<!-- TODO DONE @AI：已 review，上架明细列表页功能完整 -->
|
||||
<template>
|
||||
<ContentWrap>
|
||||
<el-button @click="goBack" class="mb-10px">
|
||||
<Icon icon="ep:arrow-left" class="mr-5px" /> 返回行项目列表
|
||||
</el-button>
|
||||
</ContentWrap>
|
||||
|
||||
<ContentWrap>
|
||||
<el-form
|
||||
class="-mb-15px"
|
||||
:model="queryParams"
|
||||
ref="queryFormRef"
|
||||
:inline="true"
|
||||
label-width="68px"
|
||||
>
|
||||
<el-form-item>
|
||||
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
||||
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
@click="openForm('create')"
|
||||
v-hasPermi="['mes:wm-item-receipt:create']"
|
||||
>
|
||||
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</ContentWrap>
|
||||
|
||||
<ContentWrap>
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||
<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="specification" min-width="120" />
|
||||
<el-table-column label="单位" align="center" prop="unitMeasureName" min-width="80" />
|
||||
<el-table-column label="上架数量" align="center" prop="quantity" min-width="100" />
|
||||
<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="areaName" min-width="100" />
|
||||
<el-table-column label="备注" align="center" prop="remark" min-width="150" />
|
||||
<el-table-column
|
||||
label="创建时间"
|
||||
align="center"
|
||||
prop="createTime"
|
||||
:formatter="dateFormatter"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column label="操作" align="center" width="160">
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="openForm('update', scope.row.id)"
|
||||
v-hasPermi="['mes:wm-item-receipt:update']"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
@click="handleDelete(scope.row.id)"
|
||||
v-hasPermi="['mes:wm-item-receipt:delete']"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<Pagination
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</ContentWrap>
|
||||
|
||||
<ItemReceiptDetailForm
|
||||
ref="formRef"
|
||||
@success="getList"
|
||||
:receiptId="receiptId"
|
||||
:lineId="lineId"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { dateFormatter } from '@/utils/formatTime'
|
||||
import {
|
||||
WmItemReceiptDetailApi,
|
||||
WmItemReceiptDetailVO
|
||||
} from '@/api/mes/wm/itemreceipt/detail'
|
||||
import ItemReceiptDetailForm from './ItemReceiptDetailForm.vue'
|
||||
|
||||
defineOptions({ name: 'MesWmItemReceiptDetail' })
|
||||
|
||||
const message = useMessage()
|
||||
const { t } = useI18n()
|
||||
const router = useRouter()
|
||||
const route = useRoute()
|
||||
|
||||
const receiptId = Number(route.query.receiptId)
|
||||
const lineId = Number(route.query.lineId)
|
||||
const loading = ref(true)
|
||||
const list = ref<WmItemReceiptDetailVO[]>([])
|
||||
const total = ref(0)
|
||||
const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
receiptId,
|
||||
lineId
|
||||
})
|
||||
const queryFormRef = ref()
|
||||
|
||||
/** 查询列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await WmItemReceiptDetailApi.getItemReceiptDetailPage(queryParams)
|
||||
list.value = data.list
|
||||
total.value = data.total
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 搜索 */
|
||||
const handleQuery = () => {
|
||||
queryParams.pageNo = 1
|
||||
getList()
|
||||
}
|
||||
|
||||
/** 重置 */
|
||||
const resetQuery = () => {
|
||||
queryFormRef.value.resetFields()
|
||||
handleQuery()
|
||||
}
|
||||
|
||||
/** 新增/修改 */
|
||||
const formRef = ref()
|
||||
const openForm = (type: string, id?: number) => {
|
||||
formRef.value.open(type, id)
|
||||
}
|
||||
|
||||
/** 删除 */
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
await message.delConfirm()
|
||||
await WmItemReceiptDetailApi.deleteItemReceiptDetail(id)
|
||||
message.success(t('common.delSuccess'))
|
||||
await getList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
/** 返回 */
|
||||
const goBack = () => {
|
||||
router.push({
|
||||
name: 'MesWmItemReceiptLine',
|
||||
query: { receiptId: String(receiptId) }
|
||||
})
|
||||
}
|
||||
|
||||
/** 初始化 */
|
||||
onMounted(async () => {
|
||||
await getList()
|
||||
})
|
||||
</script>
|
||||
|
|
@ -170,7 +170,6 @@
|
|||
执行上架
|
||||
</el-button>
|
||||
<!-- 待入库：执行入库、取消 -->
|
||||
<!-- TODO DONE @AI：执行入库已改为直接 confirm + API 调用，不再弹窗 -->
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
|
|
@ -194,7 +193,6 @@
|
|||
link
|
||||
type="info"
|
||||
@click="openForm('detail', scope.row.id)"
|
||||
v-if="[MesWmItemReceiptStatusEnum.FINISHED, MesWmItemReceiptStatusEnum.CANCELED].includes(scope.row.status)"
|
||||
>
|
||||
详情
|
||||
</el-button>
|
||||
|
|
|
|||
Loading…
Reference in New Issue