diff --git a/src/api/mes/wm/miscreceipt/index.ts b/src/api/mes/wm/miscreceipt/index.ts index a3a0ffdd9..e5c858159 100644 --- a/src/api/mes/wm/miscreceipt/index.ts +++ b/src/api/mes/wm/miscreceipt/index.ts @@ -5,7 +5,7 @@ export interface WmMiscReceiptVO { id: number code: string name: string - type: string + type: number sourceDocId: number sourceDocCode: string sourceDocType: string diff --git a/src/utils/dict.ts b/src/utils/dict.ts index bd9c59d3a..c24e1596f 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -306,4 +306,5 @@ export enum DICT_TYPE { MES_WM_PRODUCT_SALES_STATUS = 'mes_wm_product_sales_status', // MES 销售出库单状态 MES_SALES_NOTICE_STATUS = 'mes_sales_notice_status', // MES 发货通知单状态 MES_WM_MISC_ISSUE_TYPE = 'mes_wm_misc_issue_type', // MES 杂项单类型 + MES_WM_MISC_RECEIPT_TYPE = 'mes_wm_misc_receipt_type', // MES 杂项单类型 } diff --git a/src/views/mes/wm/miscissue/MiscIssueLineList.vue b/src/views/mes/wm/miscissue/MiscIssueLineList.vue index cc43836a0..eed86c86c 100644 --- a/src/views/mes/wm/miscissue/MiscIssueLineList.vue +++ b/src/views/mes/wm/miscissue/MiscIssueLineList.vue @@ -12,17 +12,6 @@ border :row-key="(row: any) => row.id" > - - - @@ -275,16 +264,6 @@ const resetForm = () => { formRef.value?.resetFields() } -// ==================== 展开行:出库明细 ==================== -const detailListRefs = ref>>({}) - -/** 缓存子组件 ref */ -const setDetailListRef = (lineId: number, el: any) => { - if (el) { - detailListRefs.value[lineId] = el - } -} - /** 初始化 */ onMounted(async () => { await getList() diff --git a/src/views/mes/wm/miscreceipt/MiscReceiptForm.vue b/src/views/mes/wm/miscreceipt/MiscReceiptForm.vue index 656af515c..8607653d2 100644 --- a/src/views/mes/wm/miscreceipt/MiscReceiptForm.vue +++ b/src/views/mes/wm/miscreceipt/MiscReceiptForm.vue @@ -43,7 +43,7 @@ :disabled="isHeaderReadonly" > import { generateRandomStr } from '@/utils' -import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { WmMiscReceiptApi, WmMiscReceiptVO } from '@/api/mes/wm/miscreceipt' import MiscReceiptLineList from './MiscReceiptLineList.vue' diff --git a/src/views/mes/wm/miscreceipt/index.vue b/src/views/mes/wm/miscreceipt/index.vue index 61037c969..7c8213164 100644 --- a/src/views/mes/wm/miscreceipt/index.vue +++ b/src/views/mes/wm/miscreceipt/index.vue @@ -35,7 +35,7 @@ >