diff --git a/src/views/material/packageMaterial/component/BatchImportDialog.vue b/src/views/material/packageMaterial/component/BatchImportDialog.vue new file mode 100644 index 00000000..73c8286c --- /dev/null +++ b/src/views/material/packageMaterial/component/BatchImportDialog.vue @@ -0,0 +1,440 @@ + + + + + diff --git a/src/views/material/packageMaterial/index.vue b/src/views/material/packageMaterial/index.vue index a86b8376..ca3e3c8c 100644 --- a/src/views/material/packageMaterial/index.vue +++ b/src/views/material/packageMaterial/index.vue @@ -29,7 +29,10 @@ 共 {{ pagination.total }} 条 - 新增包材 +
+ 新增包材 + 批量导入 +
@@ -186,6 +189,8 @@ 保存 + +
@@ -195,6 +200,7 @@ import { ElMessage, ElMessageBox } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' +import BatchImportDialog from './component/BatchImportDialog.vue' import { packageMaterialCreate, packageMaterialDelete, @@ -240,6 +246,7 @@ const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 }) const dialogVisible = ref(false) const dialogMode = ref<'create' | 'edit'>('create') +const batchImportVisible = ref(false) const formRef = ref() const formData = reactive({ id: undefined as number | undefined, @@ -518,6 +525,14 @@ function handleBatchDelete() { .catch(() => undefined) } +function openBatchImport() { + batchImportVisible.value = true +} + +function onBatchImportSuccess() { + loadList() +} + onMounted(() => { loadList() }) @@ -558,6 +573,13 @@ onMounted(() => { min-width: 0; } + .toolbar-right { + display: flex; + align-items: center; + gap: 8px; + flex-shrink: 0; + } + .upper-wrapper { flex: 1 1 auto; min-height: 0; diff --git a/src/views/order/orderManagement/archiveOrder.vue b/src/views/order/orderManagement/archiveOrder.vue index 86955fc6..9de4fa26 100644 --- a/src/views/order/orderManagement/archiveOrder.vue +++ b/src/views/order/orderManagement/archiveOrder.vue @@ -77,6 +77,7 @@ + @@ -89,6 +90,9 @@
+
+ +

履约历程加载中...

@@ -141,6 +145,7 @@ import { } from './config/order-common-config' import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue' import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue' +import ExpressWaybillPanel from './component/ExpressWaybillPanel.vue' import log from './component/log.vue' import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue' import { createOrderPageExport } from './utils/order-page-export' diff --git a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue index 3f629311..049ffa43 100644 --- a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue +++ b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue @@ -211,7 +211,7 @@ clearable placeholder="请选择省" :disabled="isPreviewRowLocked(row)" - @change="(code: any) => handlePreviewProvinceChange(row, code)" + @change="onProvinceChange(row)" > ) { return resolveRegionCodesFromNames({ province_name: row.province, diff --git a/src/views/order/orderManagement/component/ExpressWaybillPanel.vue b/src/views/order/orderManagement/component/ExpressWaybillPanel.vue index cab60737..d8a1e4c1 100644 --- a/src/views/order/orderManagement/component/ExpressWaybillPanel.vue +++ b/src/views/order/orderManagement/component/ExpressWaybillPanel.vue @@ -14,6 +14,7 @@ +