diff --git a/src/views/mes/pro/task/ProTaskList.vue b/src/views/mes/pro/task/ProTaskList.vue index eee2219c8..775d2eb7e 100644 --- a/src/views/mes/pro/task/ProTaskList.vue +++ b/src/views/mes/pro/task/ProTaskList.vue @@ -92,7 +92,7 @@ () const { t } = useI18n() const message = useMessage() +const getDefaultColor = () => props.colorCode || '#00AEF3' // ==================== 列表 ==================== const loading = ref(false) const list = ref([]) -/** 查询任务列表(按工单+工序过滤) */ +/** 查询任务列表(按工单 + 路线 + 工序过滤) */ const getList = async () => { loading.value = true try { const data = await ProTaskApi.getTaskPage({ workOrderId: props.workOrderId, + routeId: props.routeId, processId: props.processId, pageNo: 1, pageSize: 100 @@ -234,13 +236,16 @@ const formData = ref({ startTime: undefined, duration: 1, endTime: undefined, - colorCode: '#00AEF3', + colorCode: undefined, status: undefined, remark: undefined } as unknown as ProTaskVO) const formRules = reactive({ workstationId: [{ required: true, message: '工作站不能为空', trigger: 'change' }], - quantity: [{ required: true, message: '排产数量不能为空', trigger: 'blur' }], + quantity: [ + { required: true, message: '排产数量不能为空', trigger: 'blur' }, + { type: 'number', min: 0.01, message: '排产数量必须大于 0', trigger: 'blur' } + ], startTime: [{ required: true, message: '开始时间不能为空', trigger: 'change' }], duration: [{ required: true, message: '生产时长不能为空', trigger: 'blur' }] }) @@ -276,6 +281,7 @@ const openForm = async (type: string, id?: number) => { formData.value.routeId = props.routeId! formData.value.processId = props.processId! formData.value.itemId = props.itemId! + formData.value.colorCode = getDefaultColor() } else if (id) { // 编辑:加载任务数据 formLoading.value = true @@ -320,7 +326,7 @@ const resetForm = () => { startTime: undefined, duration: 1, endTime: undefined, - colorCode: '#00AEF3', + colorCode: undefined, status: undefined, remark: undefined } as unknown as ProTaskVO diff --git a/src/views/mes/pro/task/WorkOrderForm2.vue b/src/views/mes/pro/task/WorkOrderForm2.vue index 6ef342d11..1a4ff2fb0 100644 --- a/src/views/mes/pro/task/WorkOrderForm2.vue +++ b/src/views/mes/pro/task/WorkOrderForm2.vue @@ -140,6 +140,7 @@ :route-id="currentRouteId" :process-id="rp.processId" :item-id="formData.productId!" + :color-code="rp.colorCode" :disabled="formType === 'detail'" />