From 78caa769e452f63288743b8997f7b4c21bb06ce5 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:38 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑
---
src/views/wls/stocktaking/plan/components/condition-value-input.vue | 98 ++----------------------------------------------
1 files changed, 5 insertions(+), 93 deletions(-)
diff --git a/src/views/wls/stocktaking/plan/components/condition-value-input.vue b/src/views/wls/stocktaking/plan/components/condition-value-input.vue
index 1ad1dfc..7e33897 100644
--- a/src/views/wls/stocktaking/plan/components/condition-value-input.vue
+++ b/src/views/wls/stocktaking/plan/components/condition-value-input.vue
@@ -8,15 +8,9 @@
import { Select } from 'ant-design-vue';
-import { getWarehouseArea } from '#/api/mes/wm/warehouse/area';
-import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
import { MdItemSelect } from '#/views/mes/md/item/components';
import { WmBatchSelect } from '#/views/wls/batch/components';
-import {
- WmWarehouseAreaSelect,
- WmWarehouseLocationSelect,
- WmWarehouseSelect,
-} from '#/views/wls/warehouse/components';
+import { WmWarehouseSelect } from '#/views/wls/warehouse/components';
defineOptions({ name: 'StockTakingPlanConditionValueInput' });
@@ -49,10 +43,6 @@
/** 鍏煎 VbenForm 榛樿 v-model prop ('value') 鍜� Vue 3 鏍囧噯 ('modelValue') */
const effectiveValue = computed(() => props.value ?? props.modelValue);
-
-const locationWarehouseId = ref<number>(); // 搴撳尯閫夋嫨鍣ㄤ复鏃舵暟鎹細閫変粨搴撳悗浼犵粰搴撳尯閫夋嫨鍣�
-const areaWarehouseId = ref<number>(); // 搴撲綅閫夋嫨鍣ㄤ复鏃舵暟鎹細閫変粨搴撳悗浼犵粰搴撳尯閫夋嫨鍣�
-const areaLocationId = ref<number>(); // 搴撲綅閫夋嫨鍣ㄤ复鏃舵暟鎹細閫夊簱鍖哄悗浼犵粰搴撲綅閫夋嫨鍣�
const qualityStatusValue = ref<number>();
@@ -91,58 +81,21 @@
});
}
-/** 搴撳尯浠撳簱閫夋嫨鍥炶皟锛氭竻绌哄簱鍖� */
-function handleLocationWarehouseChange() {
- emit('update:modelValue', undefined);
- emit('update:value', undefined);
- emit('valueChange', { valueId: undefined, valueCode: '', valueName: '' });
-}
-
-/** 搴撲綅浠撳簱閫夋嫨鍥炶皟锛氭竻绌哄簱鍖哄拰搴撲綅 */
-function handleAreaWarehouseChange() {
- areaLocationId.value = undefined;
- emit('update:modelValue', undefined);
- emit('update:value', undefined);
- emit('valueChange', { valueId: undefined, valueCode: '', valueName: '' });
-}
-
-/** 搴撲綅搴撳尯閫夋嫨鍥炶皟锛氭竻绌哄簱浣� */
-function handleAreaLocationChange() {
- emit('update:modelValue', undefined);
- emit('update:value', undefined);
- emit('valueChange', { valueId: undefined, valueCode: '', valueName: '' });
-}
-
-/** 缂栬緫鏃跺洖濉骇鑱旈�夋嫨鍣ㄧ殑涓婄骇鏁版嵁锛堝簱鍖烘墍灞炰粨搴撱�佸簱浣嶆墍灞炰粨搴�/搴撳尯锛� */
-async function loadCascadeData() {
+/** 缂栬緫鏃跺洖濉川閲忕姸鎬� */
+function loadCascadeData() {
if (props.type === WlsStockTakingParamTypeEnum.QUALITY_STATUS) {
qualityStatusValue.value = props.valueCode
? Number(props.valueCode)
: undefined;
- return;
- }
- if (!effectiveValue.value) {
- return;
- }
- if (props.type === WlsStockTakingParamTypeEnum.LOCATION) {
- const location = await getWarehouseLocation(effectiveValue.value);
- locationWarehouseId.value = location?.warehouseId;
- } else if (props.type === WlsStockTakingParamTypeEnum.AREA) {
- const area = await getWarehouseArea(effectiveValue.value);
- areaWarehouseId.value = area?.warehouseId;
- areaLocationId.value = area?.locationId;
}
}
-// 鏉′欢绫诲瀷鍙樺寲鏃堕噸缃骇鑱斾复鏃舵暟鎹紱缂栬緫鍥炴樉鏃舵寜绫诲瀷鍔犺浇涓婄骇鏁版嵁
+// 鏉′欢绫诲瀷鍙樺寲鏃堕噸缃复鏃舵暟鎹紱缂栬緫鍥炴樉鏃舵寜绫诲瀷鍔犺浇
watch(
() => props.type,
() => {
- locationWarehouseId.value = undefined;
- areaWarehouseId.value = undefined;
- areaLocationId.value = undefined;
qualityStatusValue.value = undefined;
- void loadCascadeData();
+ loadCascadeData();
},
{ immediate: true },
);
@@ -154,47 +107,6 @@
:model-value="effectiveValue"
@change="handleSelectorChange"
/>
- <div
- v-else-if="type === WlsStockTakingParamTypeEnum.LOCATION"
- class="space-y-2"
- >
- <WmWarehouseSelect
- v-model="locationWarehouseId"
- placeholder="璇烽�夋嫨浠撳簱"
- @change="handleLocationWarehouseChange"
- />
- <WmWarehouseLocationSelect
- v-if="locationWarehouseId"
- :model-value="effectiveValue"
- :warehouse-id="locationWarehouseId"
- placeholder="璇烽�夋嫨搴撳尯"
- @change="handleSelectorChange"
- />
- </div>
- <div
- v-else-if="type === WlsStockTakingParamTypeEnum.AREA"
- class="space-y-2"
- >
- <WmWarehouseSelect
- v-model="areaWarehouseId"
- placeholder="璇烽�夋嫨浠撳簱"
- @change="handleAreaWarehouseChange"
- />
- <WmWarehouseLocationSelect
- v-if="areaWarehouseId"
- v-model="areaLocationId"
- placeholder="璇烽�夋嫨搴撳尯"
- :warehouse-id="areaWarehouseId"
- @change="handleAreaLocationChange"
- />
- <WmWarehouseAreaSelect
- v-if="areaLocationId"
- :model-value="effectiveValue"
- :location-id="areaLocationId"
- placeholder="璇烽�夋嫨搴撲綅"
- @change="handleSelectorChange"
- />
- </div>
<MdItemSelect
v-else-if="type === WlsStockTakingParamTypeEnum.ITEM"
:model-value="effectiveValue"
--
Gitblit v1.9.3