From fe3ddeab0d00f7afe62e3cff093df605857288b9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 29 十月 2026 17:22:43 +0800
Subject: [PATCH] refactor(wls): 替换旧组件引用并优化批次选择逻辑
---
src/views/wls/materialstock/components/select-dialog.vue | 11 +++--
src/views/wls/batch/components/select-dialog.vue | 14 +++++-
src/views/wls/batch/data.ts | 12 +++---
src/views/wls/materialstock/components/stock-adjust-modal.vue | 12 ++++++
src/api/mes/wm/materialstock/index.ts | 1
src/views/wls/returnsales/modules/line-form.vue | 2 -
src/views/wls/productsales/data.ts | 2
src/views/wls/returnsales/data.ts | 6 ---
src/views/wls/batch/components/select.vue | 6 +--
9 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/src/api/mes/wm/materialstock/index.ts b/src/api/mes/wm/materialstock/index.ts
index 67b4955..0767b89 100644
--- a/src/api/mes/wm/materialstock/index.ts
+++ b/src/api/mes/wm/materialstock/index.ts
@@ -96,6 +96,7 @@
areaId: number; // 搴撲綅ID
batchId?: number; // 鎵规ID锛堥�夋嫨宸叉湁鎵规鏃朵紶鍏ワ級
batchCode?: string; // 鎵规鍙凤紙鏂板缓鎵规鏃朵紶鍏ワ級
+ reelNo?: string; // 鏂版壒娆$洏鍙�
produceDate?: string; // 鐢熶骇鏃ユ湡锛堟柊寤烘壒娆℃椂浼犲叆锛�
expireDate?: string; // 鏈夋晥鏈燂紙鏂板缓鎵规鏃朵紶鍏ワ級
receiptDate?: string; // 鍏ュ簱鏃ユ湡
diff --git a/src/views/wls/batch/components/select-dialog.vue b/src/views/wls/batch/components/select-dialog.vue
index 82c5f67..ed46fe5 100644
--- a/src/views/wls/batch/components/select-dialog.vue
+++ b/src/views/wls/batch/components/select-dialog.vue
@@ -29,13 +29,16 @@
const filterTip = computed(() => {
const parts: string[] = [];
- if (externalClientId.value !== null) {
+ if (externalItemId.value != null) {
+ parts.push('鐗╂枡');
+ }
+ if (externalClientId.value != null) {
parts.push('瀹㈡埛');
}
- if (externalVendorId.value !== null) {
+ if (externalVendorId.value != null) {
parts.push('渚涘簲鍟�');
}
- if (externalSalesOrderCode.value !== null) {
+ if (externalSalesOrderCode.value != null) {
parts.push('閿�鍞鍗�');
}
return parts.length > 0 ? `宸叉寜${parts.join('/')}棰勮繃婊 : '';
@@ -130,12 +133,17 @@
trigger: 'row',
},
proxyConfig: {
+ // 绛夊閮ㄧ墿鏂欐潯浠跺啓鍏ヨ〃鍗曞悗鍐嶆煡璇紝閬垮厤鍒濆绌烘潯浠惰姹傝鐩栫粨鏋溿��
+ autoLoad: false,
ajax: {
query: async ({ page }, formValues) => {
+ const values = await gridApi.formApi.getValues();
return await getBatchPage({
pageNo: page.currentPage,
pageSize: page.pageSize,
...formValues,
+ ...values,
+ itemId: externalItemId.value ?? values.itemId,
});
},
},
diff --git a/src/views/wls/batch/components/select.vue b/src/views/wls/batch/components/select.vue
index 7447d9d..c4e2ed4 100644
--- a/src/views/wls/batch/components/select.vue
+++ b/src/views/wls/batch/components/select.vue
@@ -53,7 +53,7 @@
props.allowClear &&
!props.disabled &&
hovering.value &&
- props.modelValue !== null,
+ props.modelValue != null,
);
/** 鏍规嵁缂栧彿鍗曟潯鏌ヨ鎵规淇℃伅锛堢敤浜庣紪杈戝洖鏄撅級 */
@@ -88,9 +88,7 @@
clearSelected();
return;
}
- const selectedIds = (
- props.modelValue === null ? [] : [props.modelValue]
- ) as number[];
+ const selectedIds = props.modelValue == null ? [] : [props.modelValue];
dialogRef.value?.open(selectedIds, {
clientId: props.clientId,
itemId: props.itemId,
diff --git a/src/views/wls/batch/data.ts b/src/views/wls/batch/data.ts
index 27164e8..fa3516c 100644
--- a/src/views/wls/batch/data.ts
+++ b/src/views/wls/batch/data.ts
@@ -11,9 +11,9 @@
import { DictTag } from '#/components/dict-tag';
import { getRangePickerDefaultProps } from '#/utils';
-import { MdClientSelect } from '#/views/mes/md/client/components';
-import { MdItemSelect } from '#/views/mes/md/item/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import CrmCustomerSelect from '#/components/crm-customer-select.vue';
+import { MdmItemSelect } from '#/views/basicData/mdm/components';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
import { ProTaskSelect } from '#/views/mes/pro/task/components';
import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
@@ -34,7 +34,7 @@
{
fieldName: 'itemId',
label: '浜у搧鐗╂枡',
- component: markRaw(MdItemSelect),
+ component: markRaw(MdmItemSelect),
componentProps: {
placeholder: '璇烽�夋嫨浜у搧鐗╂枡',
},
@@ -42,7 +42,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
@@ -50,7 +50,7 @@
{
fieldName: 'clientId',
label: '瀹㈡埛',
- component: markRaw(MdClientSelect),
+ component: markRaw(CrmCustomerSelect),
componentProps: {
placeholder: '璇烽�夋嫨瀹㈡埛',
},
diff --git a/src/views/wls/materialstock/components/select-dialog.vue b/src/views/wls/materialstock/components/select-dialog.vue
index cc5e91c..9ad9516 100644
--- a/src/views/wls/materialstock/components/select-dialog.vue
+++ b/src/views/wls/materialstock/components/select-dialog.vue
@@ -45,18 +45,18 @@
/** 褰撳墠 props 鏄惁甯﹂杩囨护 */
const showAlert = computed(
() =>
- props.batchId !== null ||
- props.warehouseId !== null ||
+ props.batchId != null ||
+ props.warehouseId != null ||
props.virtualFilter === 'only',
);
/** 棰勮繃婊ゆ彁绀烘枃瀛� */
const alertTitle = computed(() => {
const parts: string[] = [];
- if (props.batchId !== null) {
+ if (props.batchId != null) {
parts.push('鎵规');
}
- if (props.warehouseId !== null) {
+ if (props.warehouseId != null) {
parts.push('浠撳簱');
}
if (props.virtualFilter === 'only') {
@@ -161,7 +161,8 @@
// 榛樿鏌ユ湭鍐荤粨
frozen: false,
itemTypeId: searchItemTypeId.value,
- itemId: props.mdmItemId,
+ itemId: props.itemId,
+ mdmItemId: props.mdmItemId,
warehouseId: formValues.warehouseId ?? props.warehouseId,
virtualFilter:
props.virtualFilter === 'all' ? undefined : props.virtualFilter,
diff --git a/src/views/wls/materialstock/components/stock-adjust-modal.vue b/src/views/wls/materialstock/components/stock-adjust-modal.vue
index 734da3e..dbdc817 100644
--- a/src/views/wls/materialstock/components/stock-adjust-modal.vue
+++ b/src/views/wls/materialstock/components/stock-adjust-modal.vue
@@ -100,6 +100,7 @@
}
// 娓呯┖鎵规鐩稿叧鍊�
await formApi.setFieldValue('batchCode', undefined);
+ await formApi.setFieldValue('reelNo', undefined);
await formApi.setFieldValue('batchId', undefined);
await formApi.setFieldValue('produceDate', undefined);
await formApi.setFieldValue('expireDate', undefined);
@@ -269,6 +270,16 @@
},
// 鏍规嵁閰嶇疆鍐冲畾鏄惁蹇呭~
rules: z.string().optional(),
+ },
+ {
+ fieldName: 'reelNo',
+ label: '鐩樺彿',
+ component: 'Input',
+ componentProps: { placeholder: '鎵嬪伐濉啓鏂版壒娆$洏鍙凤紝鐣欑┖琛ㄧず鏃犵洏鍙�', maxlength: 128 },
+ dependencies: {
+ triggerFields: ['operateType', 'batchId'],
+ show: () => operateType.value === 1 && !hasExistingBatch.value,
+ },
},
// 鐢熶骇鏃ユ湡锛堟牴鎹壒娆¢厤缃樉绀猴紝浠呭叆搴擄級
{
@@ -519,6 +530,7 @@
areaId: values.areaId,
batchId: values.batchId,
batchCode: values.batchCode,
+ reelNo: values.batchId ? undefined : values.reelNo?.trim() || undefined,
produceDate: values.produceDate,
expireDate: values.expireDate,
receiptDate: values.receiptDate,
diff --git a/src/views/wls/productsales/data.ts b/src/views/wls/productsales/data.ts
index 7fc47d7..6b96d22 100644
--- a/src/views/wls/productsales/data.ts
+++ b/src/views/wls/productsales/data.ts
@@ -678,7 +678,7 @@
triggerFields: ['itemId', 'batchId'],
componentProps: (values) => ({
batchId: values.batchId,
- itemId: values.itemId,
+ mdmItemId: values.itemId,
}),
},
},
diff --git a/src/views/wls/returnsales/data.ts b/src/views/wls/returnsales/data.ts
index f39ec57..e361198 100644
--- a/src/views/wls/returnsales/data.ts
+++ b/src/views/wls/returnsales/data.ts
@@ -342,8 +342,6 @@
/** 閫�璐у崟琛屾柊澧�/淇敼鐨勮〃鍗� */
export function useLineFormSchema(
- clientId?: number,
- salesOrderCode?: string,
items?: ErpSaleOrderApi.SaleOrderItem[],
onItemChange?: (item: ErpSaleOrderApi.SaleOrderItem | undefined) => void,
): VbenFormSchema[] {
@@ -416,19 +414,15 @@
label: '鎵规',
component: markRaw(WmBatchSelect),
componentProps: {
- clientId,
disabled: false,
placeholder: '璇烽�夋嫨鎵规',
- salesOrderCode,
},
dependencies: {
triggerFields: ['itemId'],
componentProps: (values) => ({
- clientId,
disabled: !values.itemId,
itemId: values.itemId,
placeholder: '璇烽�夋嫨鎵规',
- salesOrderCode,
}),
},
},
diff --git a/src/views/wls/returnsales/modules/line-form.vue b/src/views/wls/returnsales/modules/line-form.vue
index c18038e..34fd7cd 100644
--- a/src/views/wls/returnsales/modules/line-form.vue
+++ b/src/views/wls/returnsales/modules/line-form.vue
@@ -83,8 +83,6 @@
maxQuantity.value = undefined;
formApi.setState({
schema: useLineFormSchema(
- data.clientId,
- data.salesOrderCode,
data.items || [],
async (item) => {
maxQuantity.value = item?.count;
--
Gitblit v1.9.3