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/materialstock/components/stock-adjust-modal.vue | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/views/wls/materialstock/components/stock-adjust-modal.vue b/src/views/wls/materialstock/components/stock-adjust-modal.vue
index 53ad6ca..734da3e 100644
--- a/src/views/wls/materialstock/components/stock-adjust-modal.vue
+++ b/src/views/wls/materialstock/components/stock-adjust-modal.vue
@@ -21,6 +21,7 @@
import { getItem } from '#/api/mdm/item';
import { MdmItemSelect } from '#/views/basicData/mdm/components';
import { SrmSupplierSelect } from '#/views/srm/supplier/components';
+import { WmBatchSelect } from '#/views/wls/batch/components';
import BatchConfigDisplay from './batch-config-display.vue';
import {
WmWarehouseAreaSelect,
@@ -42,6 +43,7 @@
const batchEnabled = ref(false);
// 鏄惁鎵嬪姩濉啓鎵规鍙�
const manualBatchEntry = ref(false);
+const hasExistingBatch = ref(false);
// 鎵规閰嶇疆灞曠ず缁勪欢寮曠敤
const batchConfigDisplayRef = ref<InstanceType<typeof BatchConfigDisplay>>();
@@ -69,7 +71,7 @@
}
const item = selectedItem.value;
- const isIn = operateType.value === 1;
+ const isIn = operateType.value === 1 && !hasExistingBatch.value;
formApi.updateSchema([
{ fieldName: 'batchCode', dependencies: { show: () => manualBatchEntry.value } },
@@ -86,6 +88,7 @@
/** 鐗╂枡閫夋嫨鍙樺寲 */
async function handleItemChange(item: MdmItemApi.Item | undefined) {
+ hasExistingBatch.value = false;
selectedItem.value = item || null;
if (item?.id) {
const itemDetail = await getItem(item.id);
@@ -97,6 +100,7 @@
}
// 娓呯┖鎵规鐩稿叧鍊�
await formApi.setFieldValue('batchCode', undefined);
+ await formApi.setFieldValue('batchId', undefined);
await formApi.setFieldValue('produceDate', undefined);
await formApi.setFieldValue('expireDate', undefined);
await formApi.setFieldValue('manualBatchEntry', false);
@@ -158,6 +162,24 @@
onChange: handleItemChange,
},
rules: 'selectRequired',
+ },
+ {
+ fieldName: 'batchId',
+ label: '宸叉湁鎵规/鐩樺彿',
+ component: markRaw(WmBatchSelect),
+ componentProps: { placeholder: '鍙�夋嫨宸叉湁杩芥函鎵规', disabled: true },
+ dependencies: {
+ triggerFields: ['itemId'],
+ componentProps: (values: any) => ({
+ itemId: values.itemId,
+ disabled: !values.itemId,
+ placeholder: '鍙�夋嫨宸叉湁杩芥函鎵规',
+ onChange: async (batch: any) => {
+ hasExistingBatch.value = !!batch?.id;
+ await updateBatchFields();
+ },
+ }),
+ },
},
{
fieldName: 'warehouseId',
@@ -402,6 +424,7 @@
selectedWarehouse.value = null;
selectedLocation.value = null;
batchEnabled.value = false;
+ hasExistingBatch.value = false;
operateType.value = 1;
modalTitle.value = '搴撳瓨璋冩暣';
return;
@@ -450,7 +473,7 @@
const values = await formApi.getValues();
// 鍚敤鎵规绠$悊鏃剁殑鏍¢獙
- if (batchEnabled.value) {
+ if (batchEnabled.value && !values.batchId) {
if (manualBatchEntry.value && !values.batchCode) {
message.error('璇疯緭鍏ユ壒娆″彿');
return;
@@ -494,6 +517,7 @@
warehouseId: values.warehouseId,
locationId: values.locationId,
areaId: values.areaId,
+ batchId: values.batchId,
batchCode: values.batchCode,
produceDate: values.produceDate,
expireDate: values.expireDate,
@@ -514,6 +538,7 @@
warehouseId: values.warehouseId,
locationId: values.locationId,
areaId: values.areaId,
+ batchId: values.batchId,
batchCode: values.batchCode,
vendorId: values.vendorId,
quantity: values.quantity,
--
Gitblit v1.9.3