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',