diff --git a/src/api/mes/qc/iqc/defect.ts b/src/api/mes/qc/iqc/defect/index.ts similarity index 93% rename from src/api/mes/qc/iqc/defect.ts rename to src/api/mes/qc/iqc/defect/index.ts index a8ed636ee..284eb011a 100644 --- a/src/api/mes/qc/iqc/defect.ts +++ b/src/api/mes/qc/iqc/defect/index.ts @@ -1,13 +1,12 @@ import request from '@/config/axios' -// TODO @AI:defect/index.ts // MES 来料检验缺陷记录 VO export interface QcIqcDefectVO { id: number // 编号 iqcId: number // 来料检验单 ID lineId: number // 来料检验行 ID defectName: string // 缺陷描述 - defectLevel: string // 缺陷等级 + defectLevel: number // 缺陷等级 defectQuantity: number // 缺陷数量 remark: string // 备注 } diff --git a/src/api/mes/qc/iqc/line.ts b/src/api/mes/qc/iqc/line/index.ts similarity index 97% rename from src/api/mes/qc/iqc/line.ts rename to src/api/mes/qc/iqc/line/index.ts index 5f6a1df6f..fc0a6de33 100644 --- a/src/api/mes/qc/iqc/line.ts +++ b/src/api/mes/qc/iqc/line/index.ts @@ -1,6 +1,5 @@ import request from '@/config/axios' -// TODO @AI:line/index.ts // MES 来料检验单行 VO export interface QcIqcLineVO { id: number // 编号 diff --git a/src/views/mes/qc/iqc/IqcDefectList.vue b/src/views/mes/qc/iqc/IqcDefectList.vue index 09c3a3720..88b4a3b01 100644 --- a/src/views/mes/qc/iqc/IqcDefectList.vue +++ b/src/views/mes/qc/iqc/IqcDefectList.vue @@ -81,7 +81,7 @@ import { dateFormatter } from '@/utils/formatTime' -import { getStrDictOptions, DICT_TYPE } from '@/utils/dict' +import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { QcIqcDefectApi, QcIqcDefectVO } from '@/api/mes/qc/iqc/defect' import { QcIqcLineApi, QcIqcLineVO } from '@/api/mes/qc/iqc/line' defineOptions({ name: 'IqcDefectList' }) -const props = defineProps<{ iqcId: number }>() +const props = defineProps<{ + iqcId: number + lineId?: number // 可选:从行表操作列打开时按行筛选 +}>() const message = useMessage() const { t } = useI18n() @@ -133,7 +136,8 @@ const getList = async () => { const data = await QcIqcDefectApi.getIqcDefectPage({ pageNo: 1, pageSize: 100, - iqcId: props.iqcId + iqcId: props.iqcId, + lineId: props.lineId }) list.value = data.list } finally { @@ -161,7 +165,7 @@ const formRef = ref() const formData = ref({ id: undefined, iqcId: undefined as number | undefined, - lineId: undefined, + lineId: undefined as number | undefined, defectName: undefined, defectLevel: undefined, defectQuantity: 1, @@ -180,6 +184,10 @@ const openForm = async (type: string, id?: number) => { formType.value = type resetForm() formData.value.iqcId = props.iqcId + // 如果有 lineId prop,预设 lineId + if (props.lineId) { + formData.value.lineId = props.lineId + } // 加载检验行列表 await loadLineList() // 修改时,查询详情(缺陷记录只有分页接口,从列表中获取) @@ -248,4 +256,10 @@ watch( () => getList(), { immediate: true } ) + +/** 监听 lineId 变化,重新加载列表 */ +watch( + () => props.lineId, + () => getList() +) diff --git a/src/views/mes/qc/iqc/IqcForm.vue b/src/views/mes/qc/iqc/IqcForm.vue index cd6a05ae7..f6e30e0b8 100644 --- a/src/views/mes/qc/iqc/IqcForm.vue +++ b/src/views/mes/qc/iqc/IqcForm.vue @@ -2,9 +2,6 @@