style:生产计划-检验明细添加分页

pull/1/head
黄伟杰 4 weeks ago
parent 223ab3367c
commit fb969128df

@ -73,33 +73,19 @@
<!-- 投料进度子表的列表 --> <!-- 投料进度子表的列表 -->
<el-table-column type="expand"> <el-table-column type="expand">
<template #default="scope"> <template #default="scope">
<el-tabs v-if="scope.row.status <= 1 && scope.row.status != 6" model-value="itemRequisitionDetail">
<el-tab-pane :label="t('ProductionPlan.Plan.detailItemRequisitionTabLabel')" name="itemRequisitionDetail">
<ItemRequisitionDetailList :item-requisition-id="scope.row.requisitionId" />
</el-tab-pane>
<!-- <el-tab-pane label="派工记录" name="paigongRecord">
<PaigongRecordList :plan-id="scope.row.id"/>
</el-tab-pane> -->
</el-tabs>
<!-- <el-tabs v-if="scope.row.status == 0" model-value="paigongRecord"> <!-- <el-tabs v-if="scope.row.status == 0" model-value="paigongRecord">
<el-tab-pane label="派工记录" name="paigongRecord"> <el-tab-pane label="派工记录" name="paigongRecord">
<PaigongRecordList :plan-id="scope.row.id"/> <PaigongRecordList :plan-id="scope.row.id"/>
</el-tab-pane> </el-tab-pane>
</el-tabs> --> </el-tabs> -->
<el-tabs v-if="scope.row.status == 6" model-value="zj"> <el-tabs model-value="itemRequisitionDetail">
<el-tab-pane :label="t('ProductionPlan.Plan.detailInspectTabLabel')" name="zj">
<ZjProductPreList :key="`${scope.row.id}-zj-${zjProductPreListRefreshKey}`" :ticket="scope.row.id"
@inspectable-change="(hasPending) => setInspectable(scope.row.id, hasPending)" />
</el-tab-pane>
</el-tabs>
<el-tabs v-if="scope.row.status >= 2 && scope.row.status != 6" model-value="itemRequisitionDetail">
<el-tab-pane :label="t('ProductionPlan.Plan.detailItemRequisitionTabLabel')" name="itemRequisitionDetail"> <el-tab-pane :label="t('ProductionPlan.Plan.detailItemRequisitionTabLabel')" name="itemRequisitionDetail">
<ItemRequisitionDetailList :item-requisition-id="scope.row.requisitionId" /> <ItemRequisitionDetailList :item-requisition-id="scope.row.requisitionId" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="t('ProductionPlan.Plan.detailBaogongRecordTabLabel')" name="baogongRecord"> <el-tab-pane :label="t('ProductionPlan.Plan.detailBaogongRecordTabLabel')" name="baogongRecord">
<BaogongRecordList :key="`${scope.row.id}-${baogongRecordRefreshKey}`" :plan-id="scope.row.id" /> <BaogongRecordList :key="`${scope.row.id}-${baogongRecordRefreshKey}`" :plan-id="scope.row.id" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="t('ProductionPlan.Plan.detailInspectTabLabel')" name="zj" v-if="scope.row.status == 8"> <el-tab-pane :label="t('ProductionPlan.Plan.detailInspectTabLabel')" name="zj" >
<ZjProductPreList :key="`${scope.row.id}-zj-${zjProductPreListRefreshKey}`" :ticket="scope.row.id" <ZjProductPreList :key="`${scope.row.id}-zj-${zjProductPreListRefreshKey}`" :ticket="scope.row.id"
@inspectable-change="(hasPending) => setInspectable(scope.row.id, hasPending)" /> @inspectable-change="(hasPending) => setInspectable(scope.row.id, hasPending)" />
</el-tab-pane> </el-tab-pane>

@ -48,6 +48,12 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap> </ContentWrap>
<ZjTaskResultDialog ref="resultDialogRef" @success="getList" /> <ZjTaskResultDialog ref="resultDialogRef" @success="getList" />
@ -60,13 +66,12 @@ import { DictTag } from '@/components/DictTag'
import { DICT_TYPE } from '@/utils/dict' import { DICT_TYPE } from '@/utils/dict'
import ZjTaskResultDialog from '@/views/mes/zjTask/components/ZjTaskResultDialog.vue' import ZjTaskResultDialog from '@/views/mes/zjTask/components/ZjTaskResultDialog.vue'
/** 质量管理-质检参数 列表 */
defineOptions({ name: 'ZjProductPreList' }) defineOptions({ name: 'ZjProductPreList' })
type ZjTaskListRow = ZjTaskVO & { ticketCode?: string; executeTime?: string } type ZjTaskListRow = ZjTaskVO & { ticketCode?: string; executeTime?: string }
const props = defineProps<{ const props = defineProps<{
ticket?: number | string // id ticket?: number | string
}>() }>()
const emit = defineEmits<{ const emit = defineEmits<{
@ -75,22 +80,30 @@ const emit = defineEmits<{
const { t } = useI18n() const { t } = useI18n()
const loading = ref(false) // const loading = ref(false)
const list = ref<ZjTaskListRow[]>([]) // const list = ref<ZjTaskListRow[]>([])
const total = ref(0)
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
ticket: undefined as string | undefined
})
const resultDialogRef = ref() const resultDialogRef = ref()
/** 查询列表 */
const getList = async () => { const getList = async () => {
const ticket = props.ticket === undefined || props.ticket === null ? '' : String(props.ticket) const ticket = props.ticket === undefined || props.ticket === null ? '' : String(props.ticket)
if (!ticket) { if (!ticket) {
list.value = [] list.value = []
total.value = 0
emit('inspectableChange', false) emit('inspectableChange', false)
return return
} }
loading.value = true loading.value = true
try { try {
const data = await ZjTaskApi.getZjTaskList({ ticket }) queryParams.ticket = ticket
list.value = Array.isArray(data) ? data : data?.list ?? data?.data ?? [] const data = await ZjTaskApi.getZjTaskPage(queryParams)
list.value = data.list ?? []
total.value = data.total ?? 0
const hasPending = list.value.some((item) => String(item?.status) === '0') const hasPending = list.value.some((item) => String(item?.status) === '0')
emit('inspectableChange', hasPending) emit('inspectableChange', hasPending)
} finally { } finally {
@ -118,6 +131,7 @@ const handleRowClick = (row: ZjTaskListRow) => {
watch( watch(
() => props.ticket, () => props.ticket,
() => { () => {
queryParams.pageNo = 1
getList() getList()
}, },
{ immediate: true } { immediate: true }

Loading…
Cancel
Save