From 100f14bad7a37a30ccdea6b388e9bc6e7de0f2e2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 29 七月 2026 14:59:28 +0800
Subject: [PATCH] 银川 1.点击合同号进入合同详情，点击销售订单号，出现404页面
---
src/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue | 20 +++++-----
src/views/erp/sale/order/index.vue | 13 +++++-
src/views/erp/purchase/request/data.ts | 2
src/views/crm/contract/detail/modules/info.vue | 4 +-
src/components/upload/file-upload.vue | 16 +++++--
src/views/erp/purchase/request/modules/item-form.vue | 24 ++++--------
6 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/src/components/upload/file-upload.vue b/src/components/upload/file-upload.vue
index 35c7fe6..fb2f1dd 100644
--- a/src/components/upload/file-upload.vue
+++ b/src/components/upload/file-upload.vue
@@ -84,23 +84,29 @@
} else {
value.push(v);
}
+ const existingMap = new Map<string | number, UploadFile>();
+ for (const f of fileList.value ?? []) {
+ const id = (f as any)?.response?.[props.valueKey] ?? (f as any)?.[props.valueKey] ?? f?.uid;
+ if (id != null) existingMap.set(id, f);
+ }
fileList.value = value
.map((item, i) => {
if (item && isString(item)) {
- return {
+ return existingMap.get(item) ?? {
uid: `${-i}`,
name: item.slice(Math.max(0, item.lastIndexOf('/') + 1)),
status: UploadResultStatus.DONE,
url: item,
};
} else if (item && isObject(item)) {
- return item;
+ const key = item[props.valueKey] ?? item.uid;
+ return (key != null && existingMap.get(key)) || { ...item, url: String((item as any).url ?? '') };
} else if (item && (typeof item === 'number' || typeof item === 'string')) {
- return {
+ return existingMap.get(item) ?? {
uid: `${-i}`,
name: `鏂囦欢 ${String(item)}`,
status: UploadResultStatus.DONE,
- url: item,
+ url: String(item),
response: { [props.valueKey]: item },
} as UploadFile;
}
@@ -207,7 +213,7 @@
fileList.value?.splice(index!, 1);
}
- const fileUrl = res?.url || res?.data || res;
+ const fileUrl = res?.url || res?.data || (typeof res === 'string' ? res : '');
uploadList.value.push({
name: res?.name || file.name,
url: fileUrl,
diff --git a/src/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue b/src/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue
index c5501fb..42e4957 100644
--- a/src/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue
+++ b/src/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue
@@ -12,6 +12,7 @@
nextTick,
onUnmounted,
ref,
+ toRaw,
useTemplateRef,
watch,
} from 'vue';
@@ -88,16 +89,15 @@
return formApi;
}
-const FieldComponent = computed(() => {
- const finalComponent = isString(component)
- ? componentMap.value[component]
- : component;
- if (!finalComponent) {
- // 缁勪欢鏈敞鍐�
- console.warn(`Component ${component} is not registered`);
- }
- return finalComponent;
-});
+const FieldComponent = isString(component)
+ ? computed(() => {
+ const comp = componentMap.value[component];
+ if (!comp) {
+ console.warn(`Component ${component} is not registered`);
+ }
+ return comp;
+ })
+ : toRaw(component);
const {
dynamicComponentProps,
diff --git a/src/views/crm/contract/detail/modules/info.vue b/src/views/crm/contract/detail/modules/info.vue
index df757d3..bd0f9a0 100644
--- a/src/views/crm/contract/detail/modules/info.vue
+++ b/src/views/crm/contract/detail/modules/info.vue
@@ -36,8 +36,8 @@
function handleViewOrder() {
if (props.contract.orderId) {
router.push({
- path: '/erp/sale/order',
- query: { orderId: props.contract.orderId },
+ name: 'ErpSaleOrder',
+ query: { id: props.contract.orderId },
});
}
}
diff --git a/src/views/erp/purchase/request/data.ts b/src/views/erp/purchase/request/data.ts
index 59cc3c5..cc4745b 100644
--- a/src/views/erp/purchase/request/data.ts
+++ b/src/views/erp/purchase/request/data.ts
@@ -163,7 +163,7 @@
title: '鍏ュ簱鏁伴噺',
minWidth: 100,
fixed: 'right',
- formatter: 'formatAmount6',
+ formatter: 'formatAmount3',
},
{
field: 'productPrice',
diff --git a/src/views/erp/purchase/request/modules/item-form.vue b/src/views/erp/purchase/request/modules/item-form.vue
index 4265d46..7cd972a 100644
--- a/src/views/erp/purchase/request/modules/item-form.vue
+++ b/src/views/erp/purchase/request/modules/item-form.vue
@@ -1,5 +1,4 @@
<script lang="ts" setup>
-import type { MdmItemApi } from '#/api/mdm/item';
import type { ErpPurchaseRequestApi } from '#/api/erp/purchase/request';
import { computed, nextTick, onMounted, ref, watch } from 'vue';
@@ -10,10 +9,10 @@
erpPriceMultiply,
} from '@vben/utils';
-import { Input, InputNumber, Select, DatePicker, Switch } from 'ant-design-vue';
+import { Input, InputNumber, DatePicker, Switch } from 'ant-design-vue';
import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { getItemPage } from '#/api/mdm/item';
+import { MdmItemSelect } from '#/views/basicData/mdm/components';
import { useFormItemColumns } from '../data';
@@ -30,7 +29,6 @@
const emit = defineEmits(['update:items']);
const tableData = ref<ErpPurchaseRequestApi.PurchaseRequestItem[]>([]);
-const productOptions = ref<MdmItemApi.Item[]>([]);
/** 鑾峰彇琛ㄦ牸鍚堣鏁版嵁 */
const summaries = computed(() => {
@@ -114,12 +112,11 @@
}
/** 澶勭悊浜у搧鍙樻洿 */
-async function handleProductChange(productId: any, row: any) {
- const product = productOptions.value.find((p) => p.id === productId);
+function handleProductChange(product: any, row: any) {
if (!product) {
return;
}
- row.productId = productId;
+ row.productId = product.id;
row.productBarCode = product.barCode;
row.productUnitId = product.unitMeasureId;
row.productUnitName = product.unitMeasureName;
@@ -171,9 +168,7 @@
});
/** 鍒濆鍖� */
-onMounted(async () => {
- const res = await getItemPage({ pageNo: 1, pageSize: 100, status: 0 });
- productOptions.value = res.list || [];
+onMounted(() => {
if (tableData.value.length === 0) {
handleAdd();
}
@@ -183,14 +178,11 @@
<template>
<Grid class="w-full">
<template #productId="{ row }">
- <Select
+ <MdmItemSelect
v-if="!disabled"
- v-model:value="row.productId"
- :options="productOptions"
- :field-names="{ label: 'name', value: 'id' }"
- class="w-full"
+ :model-value="row.productId"
placeholder="璇烽�夋嫨浜у搧"
- show-search
+ @update:model-value="row.productId = $event"
@change="handleProductChange($event, row)"
/>
<span v-else>{{ row.productName || '-' }}</span>
diff --git a/src/views/erp/sale/order/index.vue b/src/views/erp/sale/order/index.vue
index 0b3c24f..7071c8e 100644
--- a/src/views/erp/sale/order/index.vue
+++ b/src/views/erp/sale/order/index.vue
@@ -2,8 +2,8 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
-import { ref } from 'vue';
-import { useRouter } from 'vue-router';
+import { onMounted, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
import { Page, useVbenModal } from '@vben/common-ui';
import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
@@ -30,6 +30,7 @@
defineOptions({ name: 'ErpSaleOrder' });
const router = useRouter();
+const route = useRoute();
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
@@ -205,6 +206,14 @@
checkboxChange: handleRowCheckboxChange,
},
});
+
+/** 澶勭悊浠庡悎鍚岃烦杞繃鏉ョ殑鏌ヨ鍙傛暟 */
+onMounted(() => {
+ const orderId = route.query.id;
+ if (orderId) {
+ formModalApi.setData({ formType: 'detail', id: Number(orderId) }).open();
+ }
+});
</script>
<template>
--
Gitblit v1.9.3