From 1a63159cac5aeb31c95c115b7dbb2892bbfa3f51 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 18 Apr 2025 10:36:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=88=B0=E5=BA=93=E4=BD=8D=E7=8A=B6=E6=80=81=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=9B=9E=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', From 5746a13d09c1355c2c0f444b05e603b2ba9ee8e8 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 18 Apr 2025 10:54:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=B8=8A=E4=B8=AA?= =?UTF-8?q?=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 d52a73f87..f28e1fd2c 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?.tableForm?.initOptions?.length>0 - ? headerItem.tableForm.initOptions - : getStrDictOptions(headerItem.dictType) + return headerItem.dictType + ? getStrDictOptions(headerItem.dictType) + : headerItem.tableForm.initOptions } } //普通下拉改变事件 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts index 46ff6c269..5512d10d3 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', From b35913556792bf1566f4dbd8da5fd069a14da018 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 18 Apr 2025 11:09:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=88=B0=E5=BA=93=E4=BD=8D=E7=8A=B6=E6=80=81=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=9B=9E=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 | 4 ++-- .../inventorymoveRequestMain.data.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index f28e1fd2c..6efeca2e2 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -561,8 +561,8 @@ const initSelectOptions = (headerItem, row) => { if (row[headerItem.field + 'InitOptions']) { return row[headerItem.field + 'InitOptions'] } else { - return headerItem.dictType - ? getStrDictOptions(headerItem.dictType) + return headerItem?.tableForm?.initOptions?.length>0 + ? headerItem.tableForm.initOptions : headerItem.tableForm.initOptions } } 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', From 016d80b3c09835595e5df1a3715d6bdff4f4d0bb Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 18 Apr 2025 13:04:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E7=A7=BB=E5=BA=93=E4=BB=8E=E5=BA=93=E4=BD=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain.data.ts | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts index 46ff6c269..7f4a2bf60 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts @@ -788,25 +788,25 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } } }, - { - label: '从库位代码', - field: 'fromLocationCode', - sort: 'custom', - isTable:false, - isForm:false, - isDetail:false, - table: { - width: 150 - }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, + // { + // label: '从库位代码', + // field: 'fromLocationCode', + // sort: 'custom', + // isTable:false, + // isForm:false, + // isDetail:false, + // table: { + // width: 150 + // }, + // tableForm: { + // disabled: true + // }, + // form: { + // componentProps: { + // disabled: true + // } + // } + // }, { label: '到库位代码', field: 'toLocationCode',