✨ feat(item-receipt): 添加采购入库单相关字段和功能
新增采购入库单编码和采购订单号字段,优化相关服务和控制器以支持批量获取入库单信息,提升数据处理能力。pull/871/MERGE
parent
e39389137c
commit
302ca05052
|
|
@ -158,11 +158,11 @@
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
<!-- 编辑/详情时显示关联数据 tab -->
|
<!-- 编辑/详情时显示关联数据 tab -->
|
||||||
<el-tabs v-if="formType !== 'create' && formData.id" v-model="activeTab" class="mt-10px">
|
<el-tabs v-if="formData.id" v-model="activeTab" class="mt-10px">
|
||||||
<el-tab-pane label="物料清单" name="itemReceiptLine" lazy>
|
<el-tab-pane label="物料清单" name="itemReceiptLine" lazy>
|
||||||
<VendorItemReceiptLineList :vendorId="formData.id" />
|
<VendorItemReceiptLineList :vendorId="formData.id" />
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane label="采购入库" name="itemReceipt" lazy>
|
<el-tab-pane label="采购记录" name="itemReceipt" lazy>
|
||||||
<VendorItemReceiptList :vendorId="formData.id" />
|
<VendorItemReceiptList :vendorId="formData.id" />
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
|
|
|
||||||
|
|
@ -1,27 +1,20 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="overflow-hidden">
|
<div class="overflow-hidden">
|
||||||
<!-- 供应商详情-采购记录 tab(复用 getItemReceiptPage 分页接口) -->
|
<!-- 供应商详情-采购记录 tab -->
|
||||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||||
<el-table-column label="入库单编号" align="center" prop="code" min-width="160">
|
<el-table-column label="入库单编号" align="center" prop="receiptCode" min-width="160">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button link type="primary" @click="handleDetail(scope.row.id)">
|
<el-button link type="primary" @click="handleDetail(scope.row.receiptId)">
|
||||||
{{ scope.row.code }}
|
{{ scope.row.receiptCode }}
|
||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="入库单名称" align="center" prop="name" min-width="150" />
|
<el-table-column label="采购订单号" align="center" prop="purchaseOrderCode" min-width="150" />
|
||||||
<el-table-column
|
<el-table-column label="物料编码" align="center" prop="itemCode" width="140" />
|
||||||
label="入库日期"
|
<el-table-column label="物料名称" align="center" prop="itemName" min-width="150" />
|
||||||
align="center"
|
<el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
|
||||||
prop="receiptDate"
|
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
|
||||||
:formatter="dateFormatter2"
|
<el-table-column label="入库数量" align="center" prop="receivedQuantity" width="100" />
|
||||||
width="180px"
|
|
||||||
/>
|
|
||||||
<el-table-column label="单据状态" align="center" prop="status" min-width="100">
|
|
||||||
<template #default="scope">
|
|
||||||
<dict-tag :type="DICT_TYPE.MES_WM_ITEM_RECEIPT_STATUS" :value="scope.row.status" />
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
</el-table>
|
||||||
<Pagination
|
<Pagination
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -36,9 +29,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { dateFormatter2 } from '@/utils/formatTime'
|
import { WmItemReceiptLineApi } from '@/api/mes/wm/itemreceipt/line'
|
||||||
import { DICT_TYPE } from '@/utils/dict'
|
|
||||||
import { WmItemReceiptApi } from '@/api/mes/wm/itemreceipt'
|
|
||||||
import ItemReceiptForm from '@/views/mes/wm/itemreceipt/ItemReceiptForm.vue'
|
import ItemReceiptForm from '@/views/mes/wm/itemreceipt/ItemReceiptForm.vue'
|
||||||
|
|
||||||
defineOptions({ name: 'VendorItemReceiptList' })
|
defineOptions({ name: 'VendorItemReceiptList' })
|
||||||
|
|
@ -61,7 +52,7 @@ const getList = async () => {
|
||||||
if (!queryParams.vendorId) return
|
if (!queryParams.vendorId) return
|
||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
const data = await WmItemReceiptApi.getItemReceiptPage(queryParams)
|
const data = await WmItemReceiptLineApi.getItemReceiptLinePage(queryParams)
|
||||||
list.value = data.list
|
list.value = data.list
|
||||||
total.value = data.total
|
total.value = data.total
|
||||||
} finally {
|
} finally {
|
||||||
|
|
@ -71,8 +62,8 @@ const getList = async () => {
|
||||||
|
|
||||||
/** 查看详情 */
|
/** 查看详情 */
|
||||||
const formRef = ref()
|
const formRef = ref()
|
||||||
const handleDetail = (id: number) => {
|
const handleDetail = (receiptId: number) => {
|
||||||
formRef.value.open('detail', id)
|
formRef.value.open('detail', receiptId)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 监听 vendorId 变化,自动加载 */
|
/** 监听 vendorId 变化,自动加载 */
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,18 @@
|
||||||
<el-table-column label="物料名称" align="center" prop="itemName" min-width="150" />
|
<el-table-column label="物料名称" align="center" prop="itemName" min-width="150" />
|
||||||
<el-table-column label="规格型号" align="center" prop="itemSpec" width="120" />
|
<el-table-column label="规格型号" align="center" prop="itemSpec" width="120" />
|
||||||
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
|
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
|
||||||
|
<el-table-column label="物料/产品" align="center" prop="itemOrProduct" width="100">
|
||||||
|
<template #default="scope">
|
||||||
|
<dict-tag :type="DICT_TYPE.MES_MD_ITEM_OR_PRODUCT" :value="scope.row.itemOrProduct" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="需求数量" align="center" prop="quantity" width="120" />
|
<el-table-column label="需求数量" align="center" prop="quantity" width="120" />
|
||||||
</el-table>
|
</el-table>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ProWorkOrderBomApi } from '@/api/mes/pro/workorder/bom'
|
import { ProWorkOrderBomApi } from '@/api/mes/pro/workorder/bom'
|
||||||
|
import { DICT_TYPE } from '@/utils/dict'
|
||||||
|
|
||||||
defineOptions({ name: 'WorkOrderItemList' })
|
defineOptions({ name: 'WorkOrderItemList' })
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue