From 8010823b016b6441b31a2e8dfd19034e951ede3c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 28 十月 2026 18:11:52 +0800
Subject: [PATCH] feat(mes): 添加盘号字段并优化权限控制
---
src/views/wls/salesnotice/modules/line-form.vue | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/views/wls/salesnotice/modules/line-form.vue b/src/views/wls/salesnotice/modules/line-form.vue
index f33e49a..87e3c2d 100644
--- a/src/views/wls/salesnotice/modules/line-form.vue
+++ b/src/views/wls/salesnotice/modules/line-form.vue
@@ -1,13 +1,16 @@
<script lang="ts" setup>
import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
-import { message } from 'ant-design-vue';
+import { message, Select } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
+import { getSaleOrderItemListByOrderId } from '#/api/erp/sale/order';
+import { getSalesNotice } from '#/api/mes/wm/salesnotice';
import {
createSalesNoticeLine,
getSalesNoticeLine,
@@ -20,6 +23,18 @@
const emit = defineEmits(['success']);
const formData = ref<MesWmSalesNoticeLineApi.SalesNoticeLine>();
const noticeId = ref<number>(); // 鎵�灞為�氱煡鍗曠紪鍙�
+const saleOrderId = ref<number>();
+const saleOrderItemId = ref<number>();
+const saleItems = ref<ErpSaleOrderApi.SaleOrderItem[]>([]);
+const saleItemOptions = computed(() => saleItems.value.map((item) => ({
+ value: item.id,
+ label: `${item.productName || item.productId || '-'} / 鐩樺彿锛�${item.reelNo || '鏈~鍐�'} / 鏄庣粏锛�${item.id}`,
+})));
+
+async function handleSaleItemChange(id: number) {
+ const item = saleItems.value.find((entry) => entry.id === id);
+ if (item?.productId) await formApi.setFieldValue('itemId', item.productId);
+}
const getTitle = computed(() => {
return formData.value?.id
@@ -43,6 +58,10 @@
const [Modal, modalApi] = useVbenModal({
async onConfirm() {
+ if (saleOrderId.value && !saleOrderItemId.value) {
+ message.warning('璇烽�夋嫨閿�鍞鍗曟槑缁�');
+ return;
+ }
const { valid } = await formApi.validate();
if (!valid) {
return;
@@ -52,6 +71,7 @@
const data =
(await formApi.getValues()) as MesWmSalesNoticeLineApi.SalesNoticeLine;
data.noticeId = noticeId.value;
+ data.saleOrderItemId = saleOrderItemId.value;
try {
await (formData.value?.id
? updateSalesNoticeLine({ ...data, id: formData.value.id })
@@ -67,19 +87,26 @@
async onOpenChange(isOpen: boolean) {
if (!isOpen) {
formData.value = undefined;
+ saleOrderId.value = undefined;
+ saleOrderItemId.value = undefined;
+ saleItems.value = [];
return;
}
// 鍔犺浇鏁版嵁
const data = modalApi.getData<{ id?: number; noticeId: number }>();
noticeId.value = data.noticeId;
- if (!data.id) {
- return;
- }
modalApi.lock();
try {
- formData.value = await getSalesNoticeLine(data.id);
- // 璁剧疆鍒� values
- await formApi.setValues(formData.value);
+ const notice = await getSalesNotice(data.noticeId);
+ saleOrderId.value = notice.saleOrderId;
+ if (notice.saleOrderId) {
+ saleItems.value = await getSaleOrderItemListByOrderId(notice.saleOrderId);
+ }
+ if (data.id) {
+ formData.value = await getSalesNoticeLine(data.id);
+ saleOrderItemId.value = formData.value.saleOrderItemId;
+ await formApi.setValues(formData.value);
+ }
} finally {
modalApi.unlock();
}
@@ -89,6 +116,11 @@
<template>
<Modal :title="getTitle" class="w-3/5">
+ <div v-if="saleOrderId" class="mx-4 mb-4 flex items-center gap-3">
+ <span>閿�鍞槑缁�</span>
+ <Select v-model:value="saleOrderItemId" class="flex-1" :options="saleItemOptions"
+ placeholder="璇烽�夋嫨閿�鍞鍗曟槑缁嗗拰鐩樺彿" @change="handleSaleItemChange" />
+ </div>
<Form class="mx-4" />
</Modal>
</template>
--
Gitblit v1.9.3