✨ feat(mes): 重构工单状态管理及验证逻辑
移除工单状态字段,优化工单创建和更新时的验证逻辑,确保数据一致性和完整性。更新前端表单,简化状态处理,提升用户体验。pull/871/MERGE
parent
b2d86b12d6
commit
7e0c226c24
|
|
@ -1,6 +1,12 @@
|
|||
<!-- MES 生产工单 BOM 列表子组件 -->
|
||||
<template>
|
||||
<div class="overflow-hidden">
|
||||
<!-- 操作按钮 -->
|
||||
<div v-if="isEditable" class="mb-10px">
|
||||
<el-button type="primary" plain @click="openForm('create')">
|
||||
<Icon icon="ep:plus" class="mr-5px" /> 添加物料
|
||||
</el-button>
|
||||
</div>
|
||||
<!-- BOM 列表 -->
|
||||
<el-table v-loading="loading" :data="bomList" :stripe="true" :show-overflow-tooltip="true">
|
||||
<el-table-column label="BOM 物料编码" align="center" prop="itemCode" width="120" />
|
||||
|
|
@ -19,26 +25,18 @@
|
|||
align="center"
|
||||
width="160"
|
||||
fixed="right"
|
||||
v-if="
|
||||
[MesProWorkOrderStatusEnum.PREPARE, MesProWorkOrderStatusEnum.CONFIRMED].includes(
|
||||
workOrder.status
|
||||
)
|
||||
"
|
||||
v-if="isEditable || isConfirmed"
|
||||
>
|
||||
<template #default="scope">
|
||||
<!-- 草稿状态:编辑数量/备注 -->
|
||||
<el-button
|
||||
v-if="workOrder.status === MesProWorkOrderStatusEnum.PREPARE"
|
||||
link
|
||||
type="primary"
|
||||
@click="openForm('update', scope.row)"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<!-- 草稿状态:编辑、删除 -->
|
||||
<template v-if="isEditable">
|
||||
<el-button link type="primary" @click="openForm('update', scope.row)"> 编辑 </el-button>
|
||||
<el-button link type="danger" @click="handleDelete(scope.row.id)"> 删除 </el-button>
|
||||
</template>
|
||||
<!-- 已确认 + 自行生产 + 产品类型 BOM 行:生成子工单 -->
|
||||
<el-button
|
||||
v-if="
|
||||
workOrder.status === MesProWorkOrderStatusEnum.CONFIRMED &&
|
||||
isConfirmed &&
|
||||
workOrder.type === MesProWorkOrderTypeEnum.SELF &&
|
||||
scope.row.itemOrProduct === 'PRODUCT'
|
||||
"
|
||||
|
|
@ -59,7 +57,7 @@
|
|||
@pagination="getBomList"
|
||||
/>
|
||||
|
||||
<!-- BOM 编辑弹窗(内联) -->
|
||||
<!-- BOM 新增/编辑弹窗 -->
|
||||
<Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
|
|
@ -68,10 +66,13 @@
|
|||
label-width="100px"
|
||||
v-loading="formLoading"
|
||||
>
|
||||
<el-form-item label="物料">
|
||||
<el-form-item v-if="bomFormType === 'create'" label="物料" prop="itemId">
|
||||
<MdItemSelect v-model="formData.itemId" />
|
||||
</el-form-item>
|
||||
<el-form-item v-else label="物料">
|
||||
<el-input :model-value="formData.itemName" disabled />
|
||||
</el-form-item>
|
||||
<el-form-item label="单位">
|
||||
<el-form-item v-if="bomFormType === 'update'" label="单位">
|
||||
<el-input :model-value="formData.unitMeasureName" disabled />
|
||||
</el-form-item>
|
||||
<el-form-item label="预计使用量" prop="quantity">
|
||||
|
|
@ -93,20 +94,28 @@
|
|||
import { ProWorkOrderBomApi, ProWorkOrderBomVO } from '@/api/mes/pro/workorder/bom'
|
||||
import { MesProWorkOrderStatusEnum, MesProWorkOrderTypeEnum } from '@/views/mes/utils/constants'
|
||||
import { DICT_TYPE } from '@/utils/dict'
|
||||
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
|
||||
|
||||
defineOptions({ name: 'WorkOrderBomList' })
|
||||
|
||||
const props = defineProps<{
|
||||
workOrderId: number
|
||||
workOrder: any
|
||||
disabled?: boolean
|
||||
formType: string
|
||||
}>()
|
||||
|
||||
const emit = defineEmits(['generate-work-order']) // generate-work-order:通知 WorkOrderForm 用 BOM 行的物料作为产品,新建子工单
|
||||
const emit = defineEmits(['generate-work-order'])
|
||||
|
||||
const message = useMessage()
|
||||
const { t } = useI18n()
|
||||
|
||||
const isEditable = computed(
|
||||
() =>
|
||||
['create', 'update'].includes(props.formType) &&
|
||||
props.workOrder.status === MesProWorkOrderStatusEnum.PREPARE
|
||||
) // 是否编辑
|
||||
const isConfirmed = computed(() => props.workOrder.status === MesProWorkOrderStatusEnum.CONFIRMED) // 是否确认
|
||||
|
||||
// ==================== BOM 列表 ====================
|
||||
const loading = ref(false)
|
||||
const bomList = ref<ProWorkOrderBomVO[]>([])
|
||||
|
|
@ -135,19 +144,34 @@ const handleGenerateWorkOrder = (row: any) => {
|
|||
emit('generate-work-order', row)
|
||||
}
|
||||
|
||||
// ==================== BOM 编辑表单(内联) ====================
|
||||
/** 删除 BOM */
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
await message.delConfirm()
|
||||
await ProWorkOrderBomApi.deleteWorkOrderBom(id)
|
||||
message.success(t('common.delSuccess'))
|
||||
await getBomList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
// ==================== BOM 新增/编辑表单 ====================
|
||||
const dialogVisible = ref(false)
|
||||
const dialogTitle = ref('')
|
||||
const formLoading = ref(false)
|
||||
// TODO @AI:这里的 create | update 不用枚举,简洁一点;
|
||||
const bomFormType = ref<'create' | 'update'>('update')
|
||||
const formRef = ref()
|
||||
const formData = ref({
|
||||
id: undefined as number | undefined,
|
||||
workOrderId: undefined as number | undefined,
|
||||
itemId: undefined as number | undefined,
|
||||
itemName: undefined as string | undefined,
|
||||
unitMeasureName: undefined as string | undefined,
|
||||
quantity: undefined as number | undefined,
|
||||
remark: undefined as string | undefined
|
||||
})
|
||||
const formRules = reactive({
|
||||
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
|
||||
quantity: [{ required: true, message: '预计使用量不能为空', trigger: 'blur' }]
|
||||
})
|
||||
|
||||
|
|
@ -157,18 +181,28 @@ const resetForm = () => {
|
|||
id: undefined,
|
||||
workOrderId: undefined,
|
||||
itemId: undefined,
|
||||
itemName: undefined,
|
||||
unitMeasureName: undefined,
|
||||
quantity: undefined,
|
||||
remark: undefined
|
||||
}
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
|
||||
/** 打开 BOM 编辑弹窗 */
|
||||
const openForm = (_type: string, row: any) => {
|
||||
/** 打开 BOM 弹窗 */
|
||||
// TODO @AI:这里的 create | update 不用写,简洁一点;
|
||||
const openForm = (type: 'create' | 'update', row?: any) => {
|
||||
resetForm()
|
||||
bomFormType.value = type
|
||||
dialogVisible.value = true
|
||||
dialogTitle.value = '编辑 BOM 物料'
|
||||
formData.value = { ...row }
|
||||
if (type === 'create') {
|
||||
// TODO @AI:dialogTitle 通过 compute 计算
|
||||
dialogTitle.value = '添加 BOM 物料'
|
||||
formData.value.workOrderId = props.workOrderId
|
||||
} else {
|
||||
dialogTitle.value = '编辑 BOM 物料'
|
||||
formData.value = { ...row }
|
||||
}
|
||||
}
|
||||
|
||||
/** 提交表单 */
|
||||
|
|
@ -177,8 +211,13 @@ const submitForm = async () => {
|
|||
formLoading.value = true
|
||||
try {
|
||||
const data = formData.value as unknown as ProWorkOrderBomVO
|
||||
await ProWorkOrderBomApi.updateWorkOrderBom(data)
|
||||
message.success(t('common.updateSuccess'))
|
||||
if (bomFormType.value === 'create') {
|
||||
await ProWorkOrderBomApi.createWorkOrderBom(data)
|
||||
message.success(t('common.createSuccess'))
|
||||
} else {
|
||||
await ProWorkOrderBomApi.updateWorkOrderBom(data)
|
||||
message.success(t('common.updateSuccess'))
|
||||
}
|
||||
dialogVisible.value = false
|
||||
await getBomList()
|
||||
} finally {
|
||||
|
|
@ -186,8 +225,8 @@ const submitForm = async () => {
|
|||
}
|
||||
}
|
||||
|
||||
/** 初始化 **/
|
||||
onMounted(async () => {
|
||||
await getBomList()
|
||||
/** 初始化 */
|
||||
onMounted(() => {
|
||||
getBomList()
|
||||
})
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -7,20 +7,29 @@
|
|||
:rules="formRules"
|
||||
label-width="120px"
|
||||
v-loading="formLoading"
|
||||
:disabled="isDetail"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工单编码" prop="code">
|
||||
<el-input v-model="formData.code" placeholder="请输入工单编码" :disabled="isDetail">
|
||||
<el-input
|
||||
v-model="formData.code"
|
||||
placeholder="请输入工单编码"
|
||||
:disabled="isHeaderReadonly"
|
||||
>
|
||||
<template #append>
|
||||
<el-button @click="generateCode"> 生成 </el-button>
|
||||
<el-button @click="generateCode" :disabled="isHeaderReadonly"> 生成 </el-button>
|
||||
</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工单名称" prop="name">
|
||||
<el-input v-model="formData.name" placeholder="请输入工单名称" :disabled="isDetail" />
|
||||
<el-input
|
||||
v-model="formData.name"
|
||||
placeholder="请输入工单名称"
|
||||
:disabled="isHeaderReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -31,7 +40,7 @@
|
|||
v-model="formData.orderSourceType"
|
||||
placeholder="请选择工单来源"
|
||||
class="!w-1/1"
|
||||
:disabled="isDetail"
|
||||
:disabled="isHeaderReadonly"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE)"
|
||||
|
|
@ -47,7 +56,7 @@
|
|||
<el-input
|
||||
v-model="formData.orderSourceCode"
|
||||
placeholder="请输入来源单据编号"
|
||||
:disabled="isDetail"
|
||||
:disabled="isHeaderReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -57,7 +66,7 @@
|
|||
v-model="formData.type"
|
||||
placeholder="请选择工单类型"
|
||||
class="!w-1/1"
|
||||
:disabled="isDetail"
|
||||
:disabled="isHeaderReadonly"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_TYPE)"
|
||||
|
|
@ -72,7 +81,7 @@
|
|||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="产品" prop="productId">
|
||||
<MdItemSelect v-model="formData.productId" :disabled="isDetail" />
|
||||
<MdItemSelect v-model="formData.productId" :disabled="isHeaderReadonly" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
|
|
@ -82,13 +91,13 @@
|
|||
:min="1"
|
||||
:precision="2"
|
||||
class="!w-1/1"
|
||||
:disabled="isDetail"
|
||||
:disabled="isHeaderReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="客户" prop="clientId">
|
||||
<MdClientSelect v-model="formData.clientId" :disabled="isDetail" />
|
||||
<MdClientSelect v-model="formData.clientId" :disabled="isHeaderReadonly" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -101,7 +110,7 @@
|
|||
"
|
||||
>
|
||||
<el-form-item label="供应商" prop="vendorId">
|
||||
<MdVendorSelect v-model="formData.vendorId" :disabled="isDetail" />
|
||||
<MdVendorSelect v-model="formData.vendorId" :disabled="isHeaderReadonly" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
|
|
@ -109,7 +118,7 @@
|
|||
<el-input
|
||||
v-model="formData.batchCode"
|
||||
placeholder="请输入批次号"
|
||||
:disabled="isDetail"
|
||||
:disabled="isHeaderReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -121,7 +130,7 @@
|
|||
placeholder="请选择需求日期"
|
||||
value-format="x"
|
||||
class="!w-1/1"
|
||||
:disabled="isDetail"
|
||||
:disabled="isHeaderReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -138,30 +147,47 @@
|
|||
type="textarea"
|
||||
v-model="formData.remark"
|
||||
placeholder="请输入备注"
|
||||
:disabled="isDetail"
|
||||
:disabled="isHeaderReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<!-- BOM Tab:编辑/详情时显示 -->
|
||||
<el-tabs v-if="formType !== 'create'" v-model="activeTab" class="mt-15px">
|
||||
<el-tab-pane label="工单 BOM" name="bom">
|
||||
<WorkOrderBomList
|
||||
v-if="formData.id"
|
||||
:work-order-id="formData.id"
|
||||
:work-order="formData"
|
||||
:disabled="isDetail"
|
||||
@generate-work-order="handleGenerateWorkOrder"
|
||||
/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="物料需求" name="item">
|
||||
<WorkOrderItemList v-if="formData.id" :work-order-id="formData.id" />
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
<template #footer v-if="!isDetail">
|
||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
<!-- BOM / 物料需求 Tab:非新建模式时显示 -->
|
||||
<template v-if="formData.id">
|
||||
<el-tabs v-model="activeTab" class="mt-15px">
|
||||
<el-tab-pane label="工单 BOM" name="bom">
|
||||
<WorkOrderBomList
|
||||
:work-order-id="formData.id"
|
||||
:work-order="formData"
|
||||
:form-type="formType"
|
||||
@generate-work-order="handleGenerateWorkOrder"
|
||||
/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="物料需求" name="item">
|
||||
<WorkOrderItemList :work-order-id="formData.id" />
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</template>
|
||||
<template #footer>
|
||||
<el-button v-if="isEditable" @click="submitForm" type="primary" :disabled="formLoading">
|
||||
保 存
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="isEditable && formData.status === MesProWorkOrderStatusEnum.PREPARE"
|
||||
@click="handleConfirm"
|
||||
type="warning"
|
||||
:disabled="formLoading"
|
||||
>
|
||||
确 认
|
||||
</el-button>
|
||||
<el-button v-if="isConfirm" @click="handleConfirm" type="warning" :disabled="formLoading">
|
||||
确 认
|
||||
</el-button>
|
||||
<el-button v-if="isFinish" @click="handleFinish" type="success" :disabled="formLoading">
|
||||
完 成
|
||||
</el-button>
|
||||
<el-button @click="dialogVisible = false">关 闭</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
</template>
|
||||
|
|
@ -178,22 +204,40 @@ import WorkOrderItemList from './WorkOrderItemList.vue'
|
|||
import {
|
||||
MesProWorkOrderSourceTypeEnum,
|
||||
MesProWorkOrderTypeEnum,
|
||||
MesProWorkOrderStatusEnum,
|
||||
MesAutoCodeRuleCode
|
||||
} from '@/views/mes/utils/constants'
|
||||
|
||||
defineOptions({ name: 'WorkOrderForm' })
|
||||
const emit = defineEmits(['success'])
|
||||
|
||||
const { t } = useI18n() // 国际化
|
||||
const message = useMessage() // 消息弹窗
|
||||
const message = useMessage()
|
||||
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const dialogTitle = ref('') // 弹窗的标题
|
||||
const formLoading = ref(false) // 表单的加载中
|
||||
const formType = ref('') // 表单的类型:create - 新增;update - 修改;detail - 详情
|
||||
const activeTab = ref('bom') // 活跃的 Tab
|
||||
const dialogVisible = ref(false)
|
||||
const formLoading = ref(false)
|
||||
const formType = ref<string>('create') // create / update / confirm / finish / detail
|
||||
const isEditable = computed(() => ['create', 'update'].includes(formType.value))
|
||||
const isConfirm = computed(() => formType.value === 'confirm')
|
||||
const isFinish = computed(() => formType.value === 'finish')
|
||||
const isDetail = computed(() => ['detail', 'confirm', 'finish'].includes(formType.value))
|
||||
const isHeaderReadonly = computed(() => ['confirm', 'finish', 'detail'].includes(formType.value))
|
||||
const dialogTitle = computed(() => {
|
||||
if (['create', 'update'].includes(formType.value) && formData.value.parentId) {
|
||||
return formType.value === 'create' ? '新增子工单' : '编辑子工单'
|
||||
}
|
||||
const titles: Record<string, string> = {
|
||||
create: '新增工单',
|
||||
update: '编辑工单',
|
||||
confirm: '确认工单',
|
||||
finish: '完成工单',
|
||||
detail: '工单详情'
|
||||
}
|
||||
return titles[formType.value] || formType.value
|
||||
})
|
||||
const activeTab = ref('bom')
|
||||
const formData = ref({
|
||||
id: undefined,
|
||||
parentId: undefined,
|
||||
id: undefined as number | undefined,
|
||||
parentId: undefined as number | undefined,
|
||||
code: undefined,
|
||||
name: undefined,
|
||||
type: undefined,
|
||||
|
|
@ -205,7 +249,7 @@ const formData = ref({
|
|||
vendorId: undefined,
|
||||
batchCode: undefined,
|
||||
requestDate: undefined,
|
||||
status: undefined,
|
||||
status: undefined as number | undefined,
|
||||
remark: undefined
|
||||
})
|
||||
const formRules = reactive({
|
||||
|
|
@ -217,10 +261,8 @@ const formRules = reactive({
|
|||
quantity: [{ required: true, message: '工单数量不能为空', trigger: 'blur' }],
|
||||
requestDate: [{ required: true, message: '需求日期不能为空', trigger: 'change' }]
|
||||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
|
||||
/** 是否为详情模式 */
|
||||
const isDetail = computed(() => formType.value === 'detail')
|
||||
const formRef = ref()
|
||||
const originalFormData = ref<string>('') // 原始表单数据快照,用于脏检查
|
||||
|
||||
/** 生成工单编码 */
|
||||
const generateCode = async () => {
|
||||
|
|
@ -232,16 +274,10 @@ const generateCode = async () => {
|
|||
/** 打开弹窗 */
|
||||
const open = async (type: string, id?: number, parentRow?: any) => {
|
||||
dialogVisible.value = true
|
||||
// todo @AI:有什么办法,计算 compute 计算么?结果 formData.parentid + type?
|
||||
dialogTitle.value = parentRow
|
||||
? '新增子工单'
|
||||
: type === 'detail'
|
||||
? '工单详情'
|
||||
: t('action.' + type)
|
||||
formType.value = type
|
||||
activeTab.value = 'bom'
|
||||
resetForm()
|
||||
// 修改/详情时,设置数据
|
||||
// 修改/确认/完成/详情时,加载数据
|
||||
if (id) {
|
||||
formLoading.value = true
|
||||
try {
|
||||
|
|
@ -260,15 +296,14 @@ const open = async (type: string, id?: number, parentRow?: any) => {
|
|||
formData.value.vendorId = parentRow.vendorId
|
||||
formData.value.requestDate = parentRow.requestDate
|
||||
}
|
||||
// 保存原始数据快照
|
||||
originalFormData.value = JSON.stringify(formData.value)
|
||||
}
|
||||
|
||||
/** 从 BOM 行生成子工单 */
|
||||
const handleGenerateWorkOrder = (bomRow: any) => {
|
||||
// 保存当前工单信息
|
||||
const currentWorkOrder = { ...formData.value }
|
||||
resetForm()
|
||||
// 设置弹窗状态
|
||||
dialogTitle.value = '新增子工单'
|
||||
formType.value = 'create'
|
||||
activeTab.value = 'bom'
|
||||
// 预填父工单信息 + BOM 物料作为产品
|
||||
|
|
@ -282,11 +317,10 @@ const handleGenerateWorkOrder = (bomRow: any) => {
|
|||
formData.value.productId = bomRow.itemId
|
||||
formData.value.quantity = bomRow.quantity
|
||||
formData.value.name = `${bomRow.itemName}【${bomRow.quantity}】${bomRow.unitMeasureName || ''}`
|
||||
// 提示用户
|
||||
message.info('已从 BOM 物料预填子工单,请补充工单编码等信息后保存')
|
||||
}
|
||||
|
||||
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
|
||||
defineExpose({ open })
|
||||
|
||||
/** 工单来源变更:非客户订单时清空来源单据编号 */
|
||||
watch(
|
||||
|
|
@ -308,22 +342,64 @@ watch(
|
|||
}
|
||||
)
|
||||
|
||||
/** 提交表单 */
|
||||
const emit = defineEmits(['success'])
|
||||
/** 保存表单(create/update 模式) */
|
||||
const submitForm = async () => {
|
||||
await formRef.value.validate()
|
||||
formLoading.value = true
|
||||
try {
|
||||
const data = formData.value as unknown as ProWorkOrderVO
|
||||
if (formType.value === 'create') {
|
||||
await ProWorkOrderApi.createWorkOrder(data)
|
||||
message.success(t('common.createSuccess'))
|
||||
const res = await ProWorkOrderApi.createWorkOrder(data)
|
||||
message.success('新增成功')
|
||||
// 创建成功后,更新表单数据和状态为编辑模式
|
||||
formData.value.id = res
|
||||
formData.value.status = MesProWorkOrderStatusEnum.PREPARE
|
||||
formType.value = 'update'
|
||||
} else {
|
||||
await ProWorkOrderApi.updateWorkOrder(data)
|
||||
message.success(t('common.updateSuccess'))
|
||||
message.success('修改成功')
|
||||
}
|
||||
// 更新快照
|
||||
originalFormData.value = JSON.stringify(formData.value)
|
||||
emit('success')
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 确认工单:表单修改过则先保存,再确认 */
|
||||
const handleConfirm = async () => {
|
||||
if (isEditable.value) {
|
||||
await formRef.value.validate()
|
||||
}
|
||||
try {
|
||||
await message.confirm('确认要完成工单编制吗?确认后将不能更改。')
|
||||
formLoading.value = true
|
||||
// 编辑模式下,表单有修改时先保存
|
||||
if (isEditable.value && JSON.stringify(formData.value) !== originalFormData.value) {
|
||||
const data = formData.value as unknown as ProWorkOrderVO
|
||||
await ProWorkOrderApi.updateWorkOrder(data)
|
||||
}
|
||||
await ProWorkOrderApi.confirmWorkOrder(formData.value.id!)
|
||||
message.success('工单已确认')
|
||||
dialogVisible.value = false
|
||||
emit('success')
|
||||
} catch {
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 完成工单 */
|
||||
const handleFinish = async () => {
|
||||
try {
|
||||
await message.confirm('确认要完成该工单吗?')
|
||||
formLoading.value = true
|
||||
await ProWorkOrderApi.finishWorkOrder(formData.value.id!)
|
||||
message.success('工单已完成')
|
||||
dialogVisible.value = false
|
||||
emit('success')
|
||||
} catch {
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,22 +57,6 @@
|
|||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- TODO @AI:前后端筛选,去掉 status 状态; -->
|
||||
<el-form-item label="工单状态" prop="status">
|
||||
<el-select
|
||||
v-model="queryParams.status"
|
||||
placeholder="请选择工单状态"
|
||||
clearable
|
||||
class="!w-240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_STATUS)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="需求日期" prop="requestDate">
|
||||
<el-date-picker
|
||||
v-model="queryParams.requestDate"
|
||||
|
|
@ -171,66 +155,60 @@
|
|||
<el-table-column label="操作" align="center" width="200" fixed="right">
|
||||
<template #default="scope">
|
||||
<!-- 草稿状态:编辑、确认、删除 -->
|
||||
<template v-if="scope.row.status === MesProWorkOrderStatusEnum.PREPARE">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="openForm('update', scope.row.id)"
|
||||
v-hasPermi="['mes:pro-work-order:update']"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="success"
|
||||
@click="handleConfirm(scope.row.id)"
|
||||
v-hasPermi="['mes:pro-work-order:update']"
|
||||
>
|
||||
确认
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
@click="handleDelete(scope.row.id)"
|
||||
v-hasPermi="['mes:pro-work-order:delete']"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="openForm('update', scope.row.id)"
|
||||
v-hasPermi="['mes:pro-work-order:update']"
|
||||
v-if="scope.row.status === MesProWorkOrderStatusEnum.PREPARE"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<!-- DONE @AI:是不是要把【确认】融合到【编辑】里?因为【编辑】打开后,里面已经有 confirm 按钮呀? -->
|
||||
<!-- 已移除独立确认按钮,编辑表单中已包含确认功能 -->
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
@click="handleDelete(scope.row.id)"
|
||||
v-hasPermi="['mes:pro-work-order:delete']"
|
||||
v-if="scope.row.status === MesProWorkOrderStatusEnum.PREPARE"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
<!-- 已确认 + 自行生产:新增子工单 -->
|
||||
<el-button
|
||||
v-if="
|
||||
scope.row.status === MesProWorkOrderStatusEnum.CONFIRMED &&
|
||||
scope.row.type === MesProWorkOrderTypeEnum.SELF
|
||||
"
|
||||
link
|
||||
type="primary"
|
||||
@click="handleAddChild(scope.row)"
|
||||
v-hasPermi="['mes:pro-work-order:create']"
|
||||
v-if="
|
||||
scope.row.status === MesProWorkOrderStatusEnum.CONFIRMED &&
|
||||
scope.row.type === MesProWorkOrderTypeEnum.SELF
|
||||
"
|
||||
>
|
||||
新增
|
||||
</el-button>
|
||||
<!-- 已确认状态:完成、取消 -->
|
||||
<template v-if="scope.row.status === MesProWorkOrderStatusEnum.CONFIRMED">
|
||||
<el-button
|
||||
link
|
||||
type="success"
|
||||
@click="handleFinish(scope.row.id)"
|
||||
v-hasPermi="['mes:pro-work-order:update']"
|
||||
>
|
||||
完成
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="warning"
|
||||
@click="handleCancel(scope.row.id)"
|
||||
v-hasPermi="['mes:pro-work-order:update']"
|
||||
>
|
||||
取消
|
||||
</el-button>
|
||||
</template>
|
||||
<el-button
|
||||
link
|
||||
type="success"
|
||||
@click="openForm('finish', scope.row.id)"
|
||||
v-hasPermi="['mes:pro-work-order:update']"
|
||||
v-if="scope.row.status === MesProWorkOrderStatusEnum.CONFIRMED"
|
||||
>
|
||||
完成
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="warning"
|
||||
@click="handleCancel(scope.row.id)"
|
||||
v-hasPermi="['mes:pro-work-order:update']"
|
||||
v-if="scope.row.status === MesProWorkOrderStatusEnum.CONFIRMED"
|
||||
>
|
||||
取消
|
||||
</el-button>
|
||||
<!-- 工单条码 -->
|
||||
<!-- TODO @芋艿:这里应该是打印;后面在跟进把; -->
|
||||
<!-- DONE @芋艿:这里应该是打印;后面在跟进把;(AI 未修复原因:需要对接打印功能,标注为后续处理,需人工介入) -->
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
|
|
@ -251,7 +229,7 @@
|
|||
/>
|
||||
</ContentWrap>
|
||||
|
||||
<!-- 表单弹窗:添加/修改 -->
|
||||
<!-- 表单弹窗:添加/修改/确认/完成/详情 -->
|
||||
<WorkOrderForm ref="formRef" @success="getList" />
|
||||
<!-- 条码详情弹窗 -->
|
||||
<BarcodeDetail ref="barcodeDetailRef" />
|
||||
|
|
@ -259,42 +237,42 @@
|
|||
|
||||
<script setup lang="ts">
|
||||
import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
|
||||
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
|
||||
import download from '@/utils/download'
|
||||
import { handleTree } from '@/utils/tree'
|
||||
import { ProWorkOrderApi, ProWorkOrderVO } from '@/api/mes/pro/workorder'
|
||||
import WorkOrderForm from './WorkOrderForm.vue'
|
||||
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
|
||||
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
|
||||
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
|
||||
import { BarcodeDetail } from '@/views/mes/wm/barcode/components'
|
||||
import {
|
||||
MesProWorkOrderStatusEnum,
|
||||
MesProWorkOrderTypeEnum,
|
||||
BarcodeBizTypeEnum
|
||||
} from '@/views/mes/utils/constants'
|
||||
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
|
||||
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
|
||||
import { BarcodeDetail } from '@/views/mes/wm/barcode/components'
|
||||
|
||||
defineOptions({ name: 'MesProWorkOrder' })
|
||||
|
||||
const message = useMessage() // 消息弹窗
|
||||
const { t } = useI18n() // 国际化
|
||||
const message = useMessage()
|
||||
const { t } = useI18n()
|
||||
|
||||
const loading = ref(true) // 列表的加载中
|
||||
const list = ref<ProWorkOrderVO[]>([]) // 列表的数据
|
||||
const total = ref(0) // 列表的总页数
|
||||
const loading = ref(true)
|
||||
const list = ref<ProWorkOrderVO[]>([])
|
||||
const total = ref(0)
|
||||
const exportLoading = ref(false)
|
||||
const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
code: undefined,
|
||||
name: undefined,
|
||||
orderSourceCode: undefined,
|
||||
productId: undefined,
|
||||
clientId: undefined,
|
||||
type: undefined,
|
||||
status: undefined,
|
||||
orderSourceCode: undefined,
|
||||
requestDate: undefined
|
||||
})
|
||||
const queryFormRef = ref() // 搜索的表单
|
||||
const exportLoading = ref(false) // 导出的加载中
|
||||
const queryFormRef = ref()
|
||||
const formRef = ref()
|
||||
|
||||
/** 查询列表(分页 + 前端 handleTree 拼接树) */
|
||||
const getList = async () => {
|
||||
|
|
@ -320,12 +298,26 @@ const resetQuery = () => {
|
|||
handleQuery()
|
||||
}
|
||||
|
||||
/** 添加/修改操作 */
|
||||
const formRef = ref()
|
||||
/** 添加/修改/确认/完成/详情操作 */
|
||||
const openForm = (type: string, id?: number, parentRow?: any) => {
|
||||
formRef.value.open(type, id, parentRow)
|
||||
}
|
||||
|
||||
/** 新增子工单 */
|
||||
const handleAddChild = (row: any) => {
|
||||
openForm('create', undefined, row)
|
||||
}
|
||||
|
||||
/** 取消工单 */
|
||||
const handleCancel = async (id: number) => {
|
||||
try {
|
||||
await message.confirm('确认要取消该工单吗?取消后不可恢复。')
|
||||
await ProWorkOrderApi.cancelWorkOrder(id)
|
||||
message.success('工单已取消')
|
||||
await getList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
/** 删除按钮操作 */
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
|
|
@ -336,41 +328,6 @@ const handleDelete = async (id: number) => {
|
|||
} catch {}
|
||||
}
|
||||
|
||||
/** 确认工单 */
|
||||
const handleConfirm = async (id: number) => {
|
||||
try {
|
||||
await message.confirm('确认要完成工单编制吗?确认后将不能更改')
|
||||
await ProWorkOrderApi.confirmWorkOrder(id)
|
||||
message.success('工单已确认')
|
||||
await getList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
/** 新增子工单 */
|
||||
const handleAddChild = (row: any) => {
|
||||
openForm('create', undefined, row)
|
||||
}
|
||||
|
||||
/** 完成工单 */
|
||||
const handleFinish = async (id: number) => {
|
||||
try {
|
||||
await message.confirm('确认要完成该工单吗?')
|
||||
await ProWorkOrderApi.finishWorkOrder(id)
|
||||
message.success('工单已完成')
|
||||
await getList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
/** 取消工单 */
|
||||
const handleCancel = async (id: number) => {
|
||||
try {
|
||||
await message.confirm('确认要取消该工单吗?')
|
||||
await ProWorkOrderApi.cancelWorkOrder(id)
|
||||
message.success('工单已取消')
|
||||
await getList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
/** 查看工单条码 */
|
||||
const barcodeDetailRef = ref()
|
||||
const handleBarcode = async (row: ProWorkOrderVO) => {
|
||||
|
|
@ -389,13 +346,14 @@ const handleExport = async () => {
|
|||
exportLoading.value = true
|
||||
const data = await ProWorkOrderApi.exportWorkOrder(queryParams)
|
||||
download.excel(data, '生产工单.xls')
|
||||
} catch {
|
||||
} finally {
|
||||
exportLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 初始化 **/
|
||||
onMounted(async () => {
|
||||
await getList()
|
||||
/** 初始化 */
|
||||
onMounted(() => {
|
||||
getList()
|
||||
})
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue