♻️ refactor(task): 移除生产任务精简列表相关代码

删除不再使用的生产任务精简列表接口及其相关逻辑,优化代码结构。
pull/871/MERGE
YunaiV 2026-04-06 23:43:05 +08:00
parent a585a48ca5
commit 69e076e496
3 changed files with 461 additions and 72 deletions

View File

@ -9,6 +9,7 @@ export interface ProTaskVO {
workOrderCode: string // 工单编码 workOrderCode: string // 工单编码
workOrderName: string // 工单名称 workOrderName: string // 工单名称
workstationId: number // 工作站编号 workstationId: number // 工作站编号
workstationCode: string // 工作站编码
workstationName: string // 工作站名称 workstationName: string // 工作站名称
routeId: number // 工艺路线编号 routeId: number // 工艺路线编号
processId: number // 工序编号 processId: number // 工序编号
@ -67,11 +68,6 @@ export const ProTaskApi = {
return await request.download({ url: `/mes/pro/task/export-excel`, params }) return await request.download({ url: `/mes/pro/task/export-excel`, params })
}, },
// 获得任务精简列表(下拉选项)
getTaskSimpleList: async (workOrderId?: number) => {
return await request.get({ url: `/mes/pro/task/simple-list`, params: { workOrderId } })
},
// 获得甘特图任务列表(非分页) // 获得甘特图任务列表(非分页)
getGanttTaskList: async (params: any) => { getGanttTaskList: async (params: any) => {
return await request.get({ url: `/mes/pro/task/gantt-list`, params }) return await request.get({ url: `/mes/pro/task/gantt-list`, params })

View File

@ -1,38 +1,69 @@
<!-- MES 生产任务选择器纯下拉前端过滤支持 codename可按工单过滤 --> <!--
MES 生产任务选择器只读输入框 + 点击弹窗选择
交互显示为只读 el-input点击打开弹窗单选模式进行选择
Props:
modelValue 绑定的任务 IDv-model
workOrderId 可选打开弹窗时默认按此工单过滤
disabled 是否禁用
clearable 是否允许清空鼠标悬停时显示清除图标
placeholder 占位文字
Events:
update:modelValue v-model 更新
change(item) 选中任务变化时触发传递完整 ProTaskVO清空时为 undefined
-->
<template> <template>
<el-select <div
v-model="selectValue" v-bind="attrs"
:placeholder="placeholder" class="w-full"
:disabled="disabled" :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
:clearable="clearable" @click="handleClick"
filterable @mouseenter="hovering = true"
:filter-method="handleFilter" @mouseleave="hovering = false"
class="!w-1/1"
@change="handleChange"
> >
<el-option v-for="item in filteredList" :key="item.id" :label="item.code" :value="item.id"> <el-tooltip :disabled="!selectedItem" placement="top" :show-after="500">
<div class="flex items-center gap-8px"> <template #content>
<span>{{ item.code }}</span> <div v-if="selectedItem" class="leading-6">
<el-tag v-if="item.name" size="small" type="info" class="ml-4px"> <div>任务编号{{ selectedItem.code }}</div>
{{ item.name }} <div>任务名称{{ selectedItem.name || '-' }}</div>
</el-tag> <div>工序{{ selectedItem.processName || '-' }}</div>
</div> <div>工作站{{ selectedItem.workstationName || '-' }}</div>
</el-option> <div>物料{{ selectedItem.itemName || '-' }}</div>
</el-select> <div>规格{{ selectedItem.itemSpec || '-' }}</div>
</div>
</template>
<el-input
:model-value="displayLabel"
:placeholder="placeholder"
:disabled="disabled"
readonly
:suffix-icon="suffixIcon"
:class="disabled ? 'is-select-disabled' : 'is-select-clickable'"
/>
</el-tooltip>
</div>
<!-- 弹窗必须放在 div 外部否则弹窗内的点击事件会冒泡到 div 触发 handleClick -->
<ProTaskSelectDialog ref="dialogRef" :multiple="false" @selected="handleSelected" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ProTaskApi, ProTaskVO } from '@/api/mes/pro/task' import { ProTaskApi, ProTaskVO } from '@/api/mes/pro/task'
import { Search, CircleClose } from '@element-plus/icons-vue'
import ProTaskSelectDialog from './ProTaskSelectDialog.vue'
defineOptions({ name: 'ProTaskSelect' }) // div + DialogVue attrs
// div class / style
const attrs = useAttrs()
defineOptions({ name: 'ProTaskSelect', inheritAttrs: false })
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
modelValue?: number modelValue?: number // ID
workOrderId?: number workOrderId?: number //
disabled?: boolean disabled?: boolean //
clearable?: boolean clearable?: boolean //
placeholder?: string placeholder?: string //
}>(), }>(),
{ {
disabled: false, disabled: false,
@ -46,59 +77,98 @@ const emit = defineEmits<{
change: [item: ProTaskVO | undefined] change: [item: ProTaskVO | undefined]
}>() }>()
const allList = ref<ProTaskVO[]>([]) const dialogRef = ref() // Ref
const filteredList = ref<ProTaskVO[]>([]) const hovering = ref(false) //
const selectValue = computed({ // ==================== ====================
get: () => props.modelValue, const selectedItem = ref<ProTaskVO | undefined>() //
set: (val) => emit('update:modelValue', val)
/** 输入框显示文本:展示任务编号,保持简洁 */
const displayLabel = computed(() => {
return selectedItem.value?.code ?? ''
}) })
/** 前端过滤code + name */ /** 是否显示清除图标 */
const handleFilter = (query: string) => { const showClear = computed(() => {
if (!query) { return props.clearable && !props.disabled && hovering.value && props.modelValue != null
filteredList.value = allList.value })
/** 后缀图标:悬停且有值时显示清除,否则显示搜索 */
const suffixIcon = computed(() => {
return showClear.value ? CircleClose : Search
})
/** 根据 ID 单条查询任务信息(用于编辑回显) */
const resolveItemById = async (id: number | undefined) => {
if (id == null) {
selectedItem.value = undefined
return
}
if (selectedItem.value?.id === id) {
return return
} }
const keyword = query.toLowerCase()
filteredList.value = allList.value.filter(
(item) =>
item.code?.toLowerCase().includes(keyword) || item.name?.toLowerCase().includes(keyword)
)
}
/** 选中变化 */
const handleChange = (val: number | undefined) => {
const item = allList.value.find((o) => o.id === val)
emit('change', item)
}
/** 加载任务列表 */
const loadData = async () => {
try { try {
allList.value = await ProTaskApi.getTaskSimpleList(props.workOrderId) selectedItem.value = await ProTaskApi.getTask(id)
filteredList.value = allList.value } catch (e) {
} catch { console.error('[ProTaskSelect] resolveItemById failed:', e)
allList.value = []
filteredList.value = []
} }
} }
/** 监听 workOrderId 变化,重新加载 */ /** 监听 modelValue 变化,触发回显 */
watch( watch(
() => props.workOrderId, () => props.modelValue,
() => { (val) => {
allList.value = [] resolveItemById(val)
filteredList.value = [] },
if (props.workOrderId) { { immediate: true }
loadData()
}
}
) )
onMounted(() => { // ==================== ====================
if (props.workOrderId) {
loadData() /** 点击组件:清除或打开弹窗 */
const handleClick = (e: MouseEvent) => {
if (props.disabled) {
return
} }
}) //
const target = e.target as HTMLElement
if (showClear.value && target.closest('.el-input__suffix')) {
e.stopPropagation()
selectedItem.value = undefined
emit('update:modelValue', undefined)
emit('change', undefined)
return
}
// ID
const selectedIds = props.modelValue != null ? [props.modelValue] : []
dialogRef.value.open(selectedIds, props.workOrderId)
}
/** 弹窗选中回调 */
const handleSelected = (rows: ProTaskVO[]) => {
if (!rows || rows.length === 0) {
return
}
const item = rows[0]
selectedItem.value = item
emit('update:modelValue', item.id)
emit('change', item)
}
</script> </script>
<style lang="scss" scoped>
/* :deep 用于穿透 el-input 内部元素的 cursor 样式UnoCSS 无法直接处理组件内部 DOM */
.is-select-clickable {
:deep(.el-input__wrapper),
:deep(.el-input__inner) {
cursor: pointer;
}
}
.is-select-disabled {
:deep(.el-input__wrapper),
:deep(.el-input__inner) {
cursor: not-allowed;
}
}
</style>

View File

@ -0,0 +1,323 @@
<!--
MES 生产任务弹窗选择器支持单选/多选
搜索字段展示字段对齐 KTG TaskSelect
Props:
multiple true 多选checkboxfalse 单选radio默认 true
Events:
selected(rows: ProTaskVO[]) 确认选择后触发单选时数组长度为 1
Expose:
open(selectedIds?: number[], workOrderId?: number) 打开弹窗可传入已选 ID 和工单 ID 用于预选过滤
-->
<template>
<Dialog title="生产任务选择" v-model="dialogVisible" width="80%">
<ContentWrap>
<el-form :inline="true" :model="queryParams" label-width="100px">
<el-form-item label="所属工序">
<ProProcessSelect
v-model="queryParams.processId"
placeholder="请选择工序"
class="!w-220px"
/>
</el-form-item>
<el-form-item label="生产工单">
<ProWorkOrderSelect
v-model="queryParams.workOrderId"
placeholder="请选择生产工单"
class="!w-220px"
/>
</el-form-item>
<el-form-item label="工作站">
<MdWorkstationSelect
v-model="queryParams.workstationId"
placeholder="请选择工作站"
class="!w-220px"
/>
</el-form-item>
<el-form-item label="任务编号">
<el-input
v-model="queryParams.code"
placeholder="请输入任务编号"
clearable
@keyup.enter="handleQuery"
class="!w-220px"
/>
</el-form-item>
<el-form-item label="任务名称">
<el-input
v-model="queryParams.name"
placeholder="请输入任务名称"
clearable
@keyup.enter="handleQuery"
class="!w-220px"
/>
</el-form-item>
<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-form-item>
</el-form>
</ContentWrap>
<!-- 数据表格单选 radio / 多选 checkbox 统一在一个 table -->
<ContentWrap>
<el-table
ref="tableRef"
v-loading="loading"
:data="list"
:stripe="true"
:show-overflow-tooltip="true"
row-key="id"
:highlight-current-row="!multiple"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
@row-dblclick="handleRowDblClick"
>
<!-- 多选checkboxreserve-selection 保证跨页勾选不丢失 -->
<el-table-column
v-if="multiple"
type="selection"
:reserve-selection="true"
width="50"
align="center"
/>
<!-- 单选radio -->
<el-table-column v-else width="50" align="center">
<template #default="{ row }">
<el-radio
v-model="selectedRadioId"
:value="row.id"
class="radio-no-label"
@change="handleRadioChange(row)"
/>
</template>
</el-table-column>
<el-table-column label="任务编号" align="center" prop="code" width="180" />
<el-table-column label="任务名称" align="left" prop="name" min-width="140" />
<el-table-column label="工作站编码" align="center" prop="workstationCode" width="140" />
<el-table-column label="工作站名称" align="center" prop="workstationName" width="140" />
<el-table-column label="工序" align="center" prop="processName" width="120" />
<el-table-column label="物料编码" align="center" prop="itemCode" width="140" />
<el-table-column label="物料名称" align="center" prop="itemName" width="140" />
<el-table-column label="规格型号" align="center" prop="itemSpec" width="120" />
<el-table-column label="排产数量" align="center" prop="quantity" width="100" />
<el-table-column label="已生产数量" align="center" prop="producedQuantity" width="110" />
<el-table-column label="开始生产时间" align="center" prop="startTime" width="170">
<template #default="scope">
<span>{{ formatDate(scope.row.startTime, 'YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="生产时长" align="center" prop="duration" width="100" />
<el-table-column label="预计完成时间" align="center" prop="endTime" width="170">
<template #default="scope">
<span>{{ formatDate(scope.row.endTime, 'YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="任务状态" align="center" prop="status" width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_PRO_TASK_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<template #footer>
<el-button type="primary" @click="confirmSelect"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { formatDate } from '@/utils/formatTime'
import { DICT_TYPE } from '@/utils/dict'
import { ProTaskApi, ProTaskVO } from '@/api/mes/pro/task'
import ProProcessSelect from '@/views/mes/pro/process/components/ProProcessSelect.vue'
import ProWorkOrderSelect from '@/views/mes/pro/workorder/components/ProWorkOrderSelect.vue'
import MdWorkstationSelect from '@/views/mes/md/workstation/components/MdWorkstationSelect.vue'
defineOptions({ name: 'ProTaskSelectDialog' })
const props = withDefaults(
defineProps<{
multiple?: boolean // true checkboxfalse radio
}>(),
{
multiple: true
}
)
const message = useMessage()
const emit = defineEmits<{
selected: [rows: ProTaskVO[]]
}>()
const dialogVisible = ref(false) //
const loading = ref(false) //
const list = ref<ProTaskVO[]>([]) //
const total = ref(0) //
// ==================== ====================
const tableRef = ref() // Ref
const selectedRows = ref<ProTaskVO[]>([]) //
const selectedRadioId = ref<number>() // ID
const currentRadioRow = ref<ProTaskVO>() //
const preSelectedIds = ref<number[]>([]) // ID
/** 多选checkbox 变化 */
const handleSelectionChange = (rows: ProTaskVO[]) => {
if (props.multiple) {
selectedRows.value = rows
}
}
/** 单选radio 变化 */
const handleRadioChange = (row: ProTaskVO) => {
currentRadioRow.value = row
}
/** 单击行:单选模式下点击整行即选中(降低操作成本),多选不处理(避免和 dblclick 冲突) */
const handleRowClick = (row: ProTaskVO) => {
if (props.multiple) {
return
}
selectedRadioId.value = row.id
currentRadioRow.value = row
}
/** 双击行:多选模式切换勾选,单选模式直接确认 */
const handleRowDblClick = (row: ProTaskVO) => {
if (props.multiple) {
tableRef.value?.toggleRowSelection(row)
return
}
selectedRadioId.value = row.id
currentRadioRow.value = row
confirmSelect()
}
// ==================== ====================
const queryParams = reactive({
pageNo: 1, //
pageSize: 10, //
code: undefined as string | undefined, //
name: undefined as string | undefined, //
processId: undefined as number | undefined, //
workOrderId: undefined as number | undefined, //
workstationId: undefined as number | undefined //
})
/** 查询任务列表 */
const getList = async () => {
loading.value = true
try {
const data = await ProTaskApi.getTaskPage(queryParams)
list.value = data.list
total.value = data.total
await nextTick()
applyPreSelection()
} finally {
loading.value = false
}
}
/** 恢复预选状态(当前页可见范围内) */
const applyPreSelection = () => {
if (preSelectedIds.value.length === 0) {
return
}
if (props.multiple) {
const table = tableRef.value
if (!table) {
return
}
list.value.forEach((row) => {
if (preSelectedIds.value.includes(row.id)) {
table.toggleRowSelection(row, true)
}
})
} else {
const match = list.value.find((row) => preSelectedIds.value.includes(row.id))
if (match) {
selectedRadioId.value = match.id
currentRadioRow.value = match
}
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置查询条件 */
const resetQuery = () => {
queryParams.code = undefined
queryParams.name = undefined
queryParams.processId = undefined
queryParams.workOrderId = undefined
queryParams.workstationId = undefined
handleQuery()
}
/** 确认选择 */
const confirmSelect = () => {
if (props.multiple) {
if (selectedRows.value.length === 0) {
message.warning('请至少选择一条数据')
return
}
emit('selected', selectedRows.value)
} else {
if (!currentRadioRow.value) {
message.warning('请选择一条数据')
return
}
emit('selected', [currentRadioRow.value])
}
dialogVisible.value = false
}
// ==================== ====================
/** 打开弹窗,可传入已选 ID 用于预选高亮workOrderId 用于默认过滤工单 */
const open = async (selectedIds?: number[], workOrderId?: number) => {
dialogVisible.value = true
// +
queryParams.code = undefined
queryParams.name = undefined
queryParams.processId = undefined
queryParams.workOrderId = workOrderId ?? undefined // workOrderId
queryParams.workstationId = undefined
queryParams.pageNo = 1
//
selectedRows.value = []
selectedRadioId.value = undefined
currentRadioRow.value = undefined
preSelectedIds.value = selectedIds ?? []
//
await nextTick()
tableRef.value?.clearSelection()
await getList()
}
defineExpose({ open })
</script>
<style lang="scss" scoped>
/* 隐藏 radio 的 label 文字,只保留圆圈 */
.radio-no-label {
:deep(.el-radio__label) {
display: none;
}
}
</style>