feat(workorder): 添加工单状态字段并更新相关逻辑

在 MesProWorkOrderPageReqVO 中新增工单状态字段,并在相关的 Mapper 和 Service 中更新查询逻辑以支持该字段。同时,新增批次编号字段到 MesWmMaterialStockPageReqVO,并更新相关逻辑以确保数据一致性。
pull/871/MERGE
YunaiV 2026-04-08 12:03:25 +08:00
parent 55cb175f5a
commit 5cc0a96db0
3 changed files with 429 additions and 12 deletions

View File

@ -79,14 +79,7 @@
v-loading="formLoading"
>
<el-form-item label="班组" prop="teamId">
<el-select v-model="formData.teamId" placeholder="请选择班组" class="!w-1/1">
<el-option
v-for="team in teamList"
:key="team.id"
:label="team.name"
:value="team.id"
/>
</el-select>
<CalTeamSelect v-model="formData.teamId" class="!w-1/1" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
@ -102,8 +95,8 @@
<script setup lang="ts">
import { CalPlanTeamApi, CalPlanTeamVO } from '@/api/mes/cal/plan/team'
import { CalTeamApi, CalTeamVO } from '@/api/mes/cal/team'
import { CalTeamMemberApi, CalTeamMemberVO } from '@/api/mes/cal/team/member'
import CalTeamSelect from '@/views/mes/cal/team/components/CalTeamSelect.vue'
defineOptions({ name: 'CalPlanTeamList' })
@ -117,7 +110,6 @@ const message = useMessage() // 消息弹窗
const loading = ref(false) //
const list = ref<CalPlanTeamVO[]>([]) //
const teamList = ref<CalTeamVO[]>([]) //
/** 查询列表 */
const getList = async () => {
@ -173,8 +165,6 @@ const openForm = async (type: string) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
resetForm()
//
teamList.value = await CalTeamApi.getTeamList()
}
/** 提交表单 */

View File

@ -0,0 +1,165 @@
<!--
MES 班组选择器只读输入框 + 点击弹窗选择
交互显示为只读 el-input点击打开弹窗单选模式进行选择
Props:
modelValue 绑定的班组 IDv-model
disabled 是否禁用
clearable 是否允许清空
placeholder 占位文字
Events:
update:modelValue v-model 更新
change(item) 选中班组变化时触发传递完整 CalTeamVO清空时为 undefined
-->
<template>
<div
v-bind="attrs"
class="w-full"
:class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
@click="handleClick"
@mouseenter="hovering = true"
@mouseleave="hovering = false"
>
<el-tooltip :disabled="!selectedItem" placement="top" :show-after="500">
<template #content>
<div v-if="selectedItem" class="leading-6">
<div>编码{{ selectedItem.code }}</div>
<div>名称{{ selectedItem.name }}</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 -->
<CalTeamSelectDialog ref="dialogRef" :multiple="false" @selected="handleSelected" />
</template>
<script setup lang="ts">
import { CalTeamApi, CalTeamVO } from '@/api/mes/cal/team'
import { Search, CircleClose } from '@element-plus/icons-vue'
import CalTeamSelectDialog from './CalTeamSelectDialog.vue'
const attrs = useAttrs()
defineOptions({ name: 'CalTeamSelect', inheritAttrs: false })
const props = withDefaults(
defineProps<{
modelValue?: number // ID
disabled?: boolean //
clearable?: boolean //
placeholder?: string //
}>(),
{
disabled: false,
clearable: true,
placeholder: '请选择班组'
}
)
const emit = defineEmits<{
'update:modelValue': [value: number | undefined]
change: [item: CalTeamVO | undefined]
}>()
const dialogRef = ref()
const hovering = ref(false)
// ==================== ====================
const selectedItem = ref<CalTeamVO | undefined>()
/** 输入框显示文本 */
const displayLabel = computed(() => {
return selectedItem.value?.name ?? ''
})
/** 是否显示清除图标 */
const showClear = computed(() => {
return props.clearable && !props.disabled && hovering.value && props.modelValue != null
})
/** 后缀图标 */
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
}
try {
selectedItem.value = await CalTeamApi.getTeam(id)
} catch (e) {
console.error('[CalTeamSelect] resolveItemById failed:', e)
}
}
/** 监听 modelValue 变化,触发回显 */
watch(
() => props.modelValue,
(val) => {
resolveItemById(val)
},
{ immediate: true }
)
// ==================== ====================
/** 点击组件:清除或打开弹窗 */
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
}
//
const selectedIds = props.modelValue != null ? [props.modelValue] : []
dialogRef.value.open(selectedIds)
}
/** 弹窗选中回调 */
const handleSelected = (rows: CalTeamVO[]) => {
if (!rows || rows.length === 0) {
return
}
const item = rows[0]
selectedItem.value = item
emit('update:modelValue', item.id)
emit('change', item)
}
</script>
<style lang="scss" scoped>
.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,262 @@
<!--
MES 班组弹窗选择器支持单选/多选
Props:
multiple true 多选checkboxfalse 单选radio默认 true
Events:
selected(rows: CalTeamVO[]) 确认选择后触发单选时数组长度为 1
Expose:
open(selectedIds?: number[]) 打开弹窗可传入已选 ID 用于预选高亮
-->
<template>
<Dialog title="班组选择" v-model="dialogVisible" width="720px">
<!-- 搜索 -->
<ContentWrap>
<el-form :inline="true" :model="queryParams" label-width="68px">
<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>
<!-- 列表 -->
<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"
>
<!-- 多选checkbox -->
<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" min-width="120" />
<el-table-column label="班组名称" align="center" prop="name" min-width="140" />
<el-table-column label="备注" align="center" prop="remark" min-width="120" />
</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 { CalTeamApi, CalTeamVO } from '@/api/mes/cal/team'
defineOptions({ name: 'CalTeamSelectDialog' })
const props = withDefaults(
defineProps<{
multiple?: boolean // true checkboxfalse radio
}>(),
{
multiple: true
}
)
const message = useMessage()
const emit = defineEmits<{
selected: [rows: CalTeamVO[]]
}>()
const dialogVisible = ref(false)
const loading = ref(false)
const list = ref<CalTeamVO[]>([])
const total = ref(0)
// ==================== ====================
const tableRef = ref()
const selectedRows = ref<CalTeamVO[]>([]) //
const selectedRadioId = ref<number>() // ID
const currentRadioRow = ref<CalTeamVO>() //
const preSelectedIds = ref<number[]>([]) // ID
/** 多选checkbox 变化 */
const handleSelectionChange = (rows: CalTeamVO[]) => {
if (props.multiple) {
selectedRows.value = rows
}
}
/** 单选radio 变化 */
const handleRadioChange = (row: CalTeamVO) => {
currentRadioRow.value = row
}
/** 单击行:单选模式下点击整行即选中 */
const handleRowClick = (row: CalTeamVO) => {
if (props.multiple) {
return
}
selectedRadioId.value = row.id
currentRadioRow.value = row
}
/** 双击行:多选切换勾选,单选直接确认 */
const handleRowDblClick = (row: CalTeamVO) => {
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
})
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await CalTeamApi.getTeamPage(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
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
}
// ==================== ====================
/** 打开弹窗 */
const open = async (selectedIds?: number[]) => {
dialogVisible.value = true
queryParams.code = undefined
queryParams.name = 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-no-label {
:deep(.el-radio__label) {
display: none;
}
}
</style>