From 3c4d241b9ef0d14a0cea5cd69b7919dfba1d14c5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 24 七月 2026 16:17:15 +0800
Subject: [PATCH] 银川 1.销售订单生产状态不匹配， 2.采购订单中没有退货状态字段，筛选项有退货状态 3.采购申请添加查看订单、查看审批功能 4.物料管理与mes产品管理的联动逻辑修改
---
src/views/mes/workbench/components/tabs/ReturnIssueLineFormModal.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/views/mes/workbench/components/tabs/ReturnIssueLineFormModal.vue b/src/views/mes/workbench/components/tabs/ReturnIssueLineFormModal.vue
index cf2ef03..06f2052 100644
--- a/src/views/mes/workbench/components/tabs/ReturnIssueLineFormModal.vue
+++ b/src/views/mes/workbench/components/tabs/ReturnIssueLineFormModal.vue
@@ -16,7 +16,6 @@
getReturnIssueLine,
updateReturnIssueLine,
} from '#/api/mes/wm/returnissue/line';
-import { MdItemSelect } from '#/views/mes/md/item/components';
import { WmMaterialStockSelect } from '#/views/wls/materialstock/components';
const emit = defineEmits(['success']);
@@ -40,6 +39,9 @@
batchCode: stock?.batchCode,
batchId: stock?.batchId,
itemId: stock?.itemId,
+ materialDisplayName: stock
+ ? [stock.itemName, stock.specification].filter(Boolean).join(' | ')
+ : undefined,
quantity: stock?.quantity,
quantityMax: stock?.quantity,
});
@@ -83,9 +85,14 @@
},
{
fieldName: 'itemId',
+ component: 'Input',
+ dependencies: { triggerFields: [''], show: () => false },
+ },
+ {
+ fieldName: 'materialDisplayName',
label: '鐗╂枡',
- component: markRaw(MdItemSelect),
- componentProps: { disabled: true },
+ component: 'Input',
+ componentProps: { disabled: true, placeholder: '閫夋嫨搴撳瓨鍚庤嚜鍔ㄥ甫鍑�' },
},
{
fieldName: 'batchCode',
@@ -145,7 +152,12 @@
modalApi.lock();
try {
formData.value = await getReturnIssueLine(data.id);
- await formApi.setValues(formData.value);
+ await formApi.setValues({
+ ...formData.value,
+ materialDisplayName: [formData.value.itemName, formData.value.specification]
+ .filter(Boolean)
+ .join(' | '),
+ });
} finally {
modalApi.unlock();
}
--
Gitblit v1.9.3