✨ feat(mes): 添加物料消耗记录行的请求和响应 VO 及控制器
新增物料消耗记录行的请求和响应数据对象,包含分页请求和响应结构。 同时实现了控制器以支持根据报工编号分页获取消耗行列表的功能。pull/871/MERGE
parent
434d68ac11
commit
d6fc4ad3ef
|
|
@ -0,0 +1,10 @@
|
||||||
|
import request from '@/config/axios'
|
||||||
|
|
||||||
|
// DONE @AI:itemconsume/line/index.ts
|
||||||
|
/** 根据报工编号分页获取消耗行列表 */
|
||||||
|
export const getItemConsumeLinePage = (params: any) => {
|
||||||
|
return request.get({
|
||||||
|
url: '/mes/wm/item-consume-line/page',
|
||||||
|
params
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
@ -207,6 +207,21 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
<!-- BOM 物资消耗 Tab:仅非草稿、非审批中时显示(即已执行后) -->
|
||||||
|
<el-tabs
|
||||||
|
v-if="
|
||||||
|
formData.id &&
|
||||||
|
formData.status !== MesProFeedbackStatusEnum.PREPARE &&
|
||||||
|
formData.status !== MesProFeedbackStatusEnum.APPROVING
|
||||||
|
"
|
||||||
|
type="border-card"
|
||||||
|
class="mt-10px"
|
||||||
|
>
|
||||||
|
<el-tab-pane label="BOM 物资消耗">
|
||||||
|
<ItemConsumeList :feedbackId="formData.id" />
|
||||||
|
</el-tab-pane>
|
||||||
|
<!-- TODO @芋艿:产品产出 Tab 待补充 -->
|
||||||
|
</el-tabs>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<template v-if="formType === 'approve'">
|
<template v-if="formType === 'approve'">
|
||||||
<el-button type="success" @click="handleApprove" :disabled="formLoading">通过</el-button>
|
<el-button type="success" @click="handleApprove" :disabled="formLoading">通过</el-button>
|
||||||
|
|
@ -229,7 +244,9 @@ import ProWorkOrderSelect from '@/views/mes/pro/workorder/components/ProWorkOrde
|
||||||
import ProTaskSelect from '@/views/mes/pro/task/components/ProTaskSelect.vue'
|
import ProTaskSelect from '@/views/mes/pro/task/components/ProTaskSelect.vue'
|
||||||
import MdWorkstationSelect from '@/views/mes/md/workstation/components/MdWorkstationSelect.vue'
|
import MdWorkstationSelect from '@/views/mes/md/workstation/components/MdWorkstationSelect.vue'
|
||||||
import UserSelect from '@/views/system/user/components/UserSelect.vue'
|
import UserSelect from '@/views/system/user/components/UserSelect.vue'
|
||||||
|
import ItemConsumeList from './ItemConsumeList.vue'
|
||||||
import { useUserStore } from '@/store/modules/user'
|
import { useUserStore } from '@/store/modules/user'
|
||||||
|
import { MesProFeedbackStatusEnum } from '@/views/mes/utils/constants'
|
||||||
|
|
||||||
defineOptions({ name: 'FeedbackForm' })
|
defineOptions({ name: 'FeedbackForm' })
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,68 @@
|
||||||
|
<!-- 物料消耗记录行列表(只读,带分页) -->
|
||||||
|
<!-- DONE @AI:挪到 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/pro/feedback;不作为 components -->
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<el-table v-loading="loading" :data="list" stripe>
|
||||||
|
<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="quantity" min-width="100" />
|
||||||
|
<el-table-column label="单位" align="center" prop="unitName" min-width="80" />
|
||||||
|
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
|
||||||
|
</el-table>
|
||||||
|
<!-- 分页 -->
|
||||||
|
<Pagination
|
||||||
|
v-model:page="queryParams.pageNo"
|
||||||
|
v-model:limit="queryParams.pageSize"
|
||||||
|
:total="total"
|
||||||
|
@pagination="getList"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts" setup>
|
||||||
|
import { getItemConsumeLinePage } from '@/api/mes/wm/itemconsume/line'
|
||||||
|
|
||||||
|
defineOptions({ name: 'ItemConsumeList' })
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
feedbackId: number
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const loading = ref(false) // 列表的加载中
|
||||||
|
const list = ref<any[]>([]) // 列表的数据
|
||||||
|
const total = ref(0) // 列表的总页数
|
||||||
|
const queryParams = reactive({
|
||||||
|
pageNo: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
feedbackId: undefined as number | undefined
|
||||||
|
})
|
||||||
|
|
||||||
|
/** 加载消耗行数据 */
|
||||||
|
const getList = async () => {
|
||||||
|
loading.value = true
|
||||||
|
try {
|
||||||
|
queryParams.feedbackId = props.feedbackId
|
||||||
|
const data = await getItemConsumeLinePage(queryParams)
|
||||||
|
list.value = data.list
|
||||||
|
total.value = data.total
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** feedbackId 变化时重新加载 */
|
||||||
|
watch(
|
||||||
|
() => props.feedbackId,
|
||||||
|
(val) => {
|
||||||
|
if (val) {
|
||||||
|
queryParams.pageNo = 1
|
||||||
|
getList()
|
||||||
|
} else {
|
||||||
|
list.value = []
|
||||||
|
total.value = 0
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ immediate: true }
|
||||||
|
)
|
||||||
|
</script>
|
||||||
Loading…
Reference in New Issue