diff --git a/src/api/mes/md/item/index.ts b/src/api/mes/md/item/index.ts index d80323100..e34a890a2 100644 --- a/src/api/mes/md/item/index.ts +++ b/src/api/mes/md/item/index.ts @@ -27,11 +27,6 @@ export const MdItemApi = { return await request.get({ url: `/mes/md/item/page`, params }) }, - // 查询物料产品精简列表 - getItemSimpleList: async () => { - return await request.get({ url: `/mes/md/item/simple-list` }) - }, - // 查询物料产品详情 getItem: async (id: number) => { return await request.get({ url: `/mes/md/item/get?id=` + id }) diff --git a/src/views/mes/md/item/components/MdItemSelect.vue b/src/views/mes/md/item/components/MdItemSelect.vue index 154c351a3..d5e2fd85f 100644 --- a/src/views/mes/md/item/components/MdItemSelect.vue +++ b/src/views/mes/md/item/components/MdItemSelect.vue @@ -1,48 +1,70 @@ - + - - - - {{ item.name }} - - 编号: {{ item.code }} - - - 规格: {{ item.specification }} - - - 单位: {{ item.unitMeasureName }} - - - - + + + + 编码:{{ selectedItem.code }} + 名称:{{ selectedItem.name }} + 规格:{{ selectedItem.specification || '-' }} + 单位:{{ selectedItem.unitMeasureName || '-' }} + + + + + + + + + diff --git a/src/views/mes/md/item/components/MdItemSelectDialog.vue b/src/views/mes/md/item/components/MdItemSelectDialog.vue index ae4cf54f9..ef326231d 100644 --- a/src/views/mes/md/item/components/MdItemSelectDialog.vue +++ b/src/views/mes/md/item/components/MdItemSelectDialog.vue @@ -1,26 +1,19 @@ - + - - + @@ -51,26 +44,56 @@ - + - - - - + + + + + + + + + + + - {{ getItemOrProductLabel(scope.row.itemOrProduct) }} + + + + diff --git a/src/views/mes/md/item/components/MdItemSelectDialogV2.vue b/src/views/mes/md/item/components/MdItemSelectDialogV2.vue deleted file mode 100644 index 23bf5495d..000000000 --- a/src/views/mes/md/item/components/MdItemSelectDialogV2.vue +++ /dev/null @@ -1,302 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - 搜索 - - - 重置 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 确 定 - 取 消 - - - - - - - diff --git a/src/views/mes/md/item/components/MdItemSelectV2.vue b/src/views/mes/md/item/components/MdItemSelectV2.vue deleted file mode 100644 index e7d18304a..000000000 --- a/src/views/mes/md/item/components/MdItemSelectV2.vue +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - 编码:{{ selectedItem.code }} - 名称:{{ selectedItem.name }} - 规格:{{ selectedItem.specification || '-' }} - 单位:{{ selectedItem.unitMeasureName || '-' }} - - - - - - - - - - - - diff --git a/src/views/mes/md/item/index.vue b/src/views/mes/md/item/index.vue index 0783e14f0..a4c1922a2 100644 --- a/src/views/mes/md/item/index.vue +++ b/src/views/mes/md/item/index.vue @@ -4,7 +4,7 @@ - + @@ -186,7 +186,7 @@ import { CommonStatusEnum } from '@/utils/constants' import { MdItemApi, MdItemVO } from '@/api/mes/md/item' import MdItemForm from './MdItemForm.vue' import MdItemImportForm from './MdItemImportForm.vue' -import ItemTypeTree from './ItemTypeTree.vue' +import MdItemTypeTree from './type/components/MdItemTypeTree.vue' import { getItemOrProductLabel, BarcodeBizTypeEnum } from '@/views/mes/utils/constants' import { BarcodeDetail } from '@/views/mes/wm/barcode/components' diff --git a/src/views/mes/wm/materialStock/index.vue b/src/views/mes/wm/materialStock/index.vue index 3ebeb9879..52de8606c 100644 --- a/src/views/mes/wm/materialStock/index.vue +++ b/src/views/mes/wm/materialStock/index.vue @@ -4,7 +4,7 @@ - + @@ -146,7 +146,7 @@ import { dateFormatter2 } from '@/utils/formatTime' import download from '@/utils/download' import { WmMaterialStockApi, WmMaterialStockVO } from '@/api/mes/wm/materialstock' -import ItemTypeTree from '@/views/mes/md/item/ItemTypeTree.vue' +import MdItemTypeTree from '@/views/mes/md/item/type/components/MdItemTypeTree.vue' import AreaForm from '@/views/mes/wm/warehouse/area/AreaForm.vue' import BatchForm from '@/views/mes/wm/batch/BatchForm.vue' import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'