From 1a63159cac5aeb31c95c115b7dbb2892bbfa3f51 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 18 Apr 2025 10:36:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E7=A7=BB=E5=BA=93=E5=88=B0?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E7=8A=B6=E6=80=81=E5=AD=97=E5=85=B8=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableForm/src/TableForm.vue | 6 +++--- .../inventorymoveRequestMain.data.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index f28e1fd2c..d52a73f87 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -561,9 +561,9 @@ const initSelectOptions = (headerItem, row) => { if (row[headerItem.field + 'InitOptions']) { return row[headerItem.field + 'InitOptions'] } else { - return headerItem.dictType - ? getStrDictOptions(headerItem.dictType) - : headerItem.tableForm.initOptions + return headerItem?.tableForm?.initOptions?.length>0 + ? headerItem.tableForm.initOptions + : getStrDictOptions(headerItem.dictType) } } //普通下拉改变事件 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts index 5512d10d3..46ff6c269 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts @@ -900,7 +900,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( { label: '到库存状态', field: 'toInventoryStatus', - // dictType: DICT_TYPE.INVENTORY_STATUS, + dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', isTable: true, sort: 'custom',