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/productsales/modules/detail-form.vue | 85 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 79 insertions(+), 6 deletions(-)
diff --git a/src/views/wls/productsales/modules/detail-form.vue b/src/views/wls/productsales/modules/detail-form.vue
index 122c318..15e8d65 100644
--- a/src/views/wls/productsales/modules/detail-form.vue
+++ b/src/views/wls/productsales/modules/detail-form.vue
@@ -1,7 +1,7 @@
<script lang="ts" setup>
import type { MesWmProductSalesDetailApi } from '#/api/mes/wm/productsales/detail';
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
import { useVbenModal } from '@vben/common-ui';
@@ -16,11 +16,33 @@
import { $t } from '#/locales';
import { useDetailFormSchema } from '../data';
+import { previewProductSalesScan, scanProductSales, type MesWmProductSalesApi } from '#/api/mes/wm/productsales';
+import PickingBags from './picking-bags.vue';
const emit = defineEmits<{ success: [lineId: number] }>();
const formData = ref<MesWmProductSalesDetailApi.ProductSalesDetail>();
const salesId = ref<number>(); // 鎵�灞炲嚭搴撳崟缂栧彿
const lineId = ref<number>(); // 鎵�灞炲嚭搴撳崟琛岀紪鍙�
+const bagPreview = ref<MesWmProductSalesApi.ProductSalesScanResponse>();
+const selectedBagIds = ref<number[]>([]);
+const previewStockId = ref<number>();
+const previewLoading = ref(false);
+
+async function loadBags(showWarning = true) {
+ if (previewLoading.value || !salesId.value) return;
+ const values = await formApi.getValues();
+ if (!values.materialStockId || !values.batchCode) {
+ if (showWarning) message.warning('璇峰厛閫夋嫨甯︽壒娆″彿鐨勫簱瀛�');
+ return;
+ }
+ previewLoading.value = true; bagPreview.value = undefined; selectedBagIds.value = []; previewStockId.value = undefined;
+ try {
+ const preview = await previewProductSalesScan(values.batchCode, 'BATCH', salesId.value);
+ previewStockId.value = values.materialStockId;
+ bagPreview.value = { ...preview, bags: (preview.bags || []).filter(b => b.materialStockId === values.materialStockId) };
+ if (showWarning && !bagPreview.value.bags?.length) message.warning('璇ュ簱瀛樻病鏈夊彲璇嗗埆鐨勮鐮侊紱鍘嗗彶鏃犺鐮佸簱瀛樺彲鎸夋暟閲忔嫞璐�');
+ } finally { previewLoading.value = false; }
+}
const getTitle = computed(() => {
return formData.value?.id
@@ -42,6 +64,13 @@
wrapperClass: 'grid-cols-3',
});
+// 琚嬬爜鍕鹃�夊悗鍚屾椤堕儴鏁伴噺锛岀洿瑙傚弽鏄犲疄闄呮嫞鍑鸿鏁�
+watch(selectedBagIds, (ids) => {
+ if (bagPreview.value?.bags?.length && ids.length) {
+ void formApi.setFieldValue('quantity', ids.length);
+ }
+});
+
const [Modal, modalApi] = useVbenModal({
async onConfirm() {
const { valid } = await formApi.validate();
@@ -55,9 +84,28 @@
data.salesId = salesId.value;
data.lineId = lineId.value;
try {
- await (formData.value?.id
- ? updateProductSalesDetail({ ...data, id: formData.value.id })
- : createProductSalesDetail(data));
+ if (!formData.value?.id) {
+ // 鏈姞杞借鐮佹垨搴撳瓨/鎵规宸插彉鏇存椂锛屽厛鍔犺浇涓�娆★紱鏈夎鐮佺殑搴撳瓨涓嶅厑璁告寜鏁伴噺鎷h揣
+ if (!bagPreview.value || previewStockId.value !== data.materialStockId
+ || bagPreview.value.batchCode !== data.batchCode) {
+ try { await loadBags(false); } catch { /* 棰勮澶辫触鏃舵寜鏁伴噺鎷h揣锛岀敱鍚庣鏈�缁堟牎楠� */ }
+ }
+ const preview = bagPreview.value;
+ const bags = preview?.bags ?? [];
+ if (preview && bags.length) {
+ if (previewStockId.value !== data.materialStockId || preview.batchCode !== data.batchCode) {
+ message.warning('搴撳瓨鎴栨壒娆″凡鍙樻洿锛岃閲嶆柊鍔犺浇琚嬬爜'); return;
+ }
+ if (!selectedBagIds.value.length) { message.warning('璇烽�夋嫨瀹為檯鎷e嚭鐨勮鐮�'); return; }
+ await scanProductSales({ salesId: salesId.value!, lineId: lineId.value!, materialStockId: data.materialStockId,
+ manual: true, scanType: 'BATCH', scanContent: preview.scanContent!,
+ bagIds: selectedBagIds.value, quantity: selectedBagIds.value.length });
+ } else {
+ await createProductSalesDetail(data);
+ }
+ } else {
+ await updateProductSalesDetail({ ...data, id: formData.value.id });
+ }
// 鍏抽棴骞舵彁绀�
await modalApi.close();
emit('success', lineId.value!);
@@ -69,9 +117,15 @@
async onOpenChange(isOpen: boolean) {
if (!isOpen) {
formData.value = undefined;
+ bagPreview.value = undefined; selectedBagIds.value = []; previewStockId.value = undefined;
return;
}
- formApi.setState({ schema: useDetailFormSchema(formApi) });
+ formApi.setState({
+ schema: useDetailFormSchema(formApi, (stock) => {
+ // 閫夋嫨搴撳瓨鍚庤嚜鍔ㄥ姞杞借鐮侊紝閬垮厤鏈夎鐮佺殑搴撳瓨璇蛋鏁伴噺鎷h揣
+ if (stock && !formData.value?.id) { void loadBags(false); }
+ }),
+ });
// 鍔犺浇鏁版嵁
const data = modalApi.getData<{
batchId?: number;
@@ -104,7 +158,26 @@
</script>
<template>
- <Modal :title="getTitle" class="w-3/5">
+ <Modal :title="getTitle" class="w-4/5">
<Form class="mx-4" />
+ <div v-if="!formData?.id" class="mx-4 mt-2">
+ <a-alert
+ type="info"
+ show-icon
+ class="mb-3"
+ message="璇峰厛閫夋嫨甯︽壒娆″彿鐨勫簱瀛橈紝鍐嶅姞杞藉苟鍕鹃�夊疄闄呮嫞鍑虹殑琚嬬爜锛涙棤琚嬬爜鐨勫巻鍙插簱瀛樺彲鎸夋暟閲忔嫞璐с��"
+ />
+ <div class="mb-2 flex flex-wrap items-center gap-2">
+ <a-button type="primary" :loading="previewLoading" @click="loadBags()">
+ {{ previewLoading ? '姝e湪鍔犺浇琚嬬爜鈥�' : '鍔犺浇搴撳瓨琚嬬爜' }}
+ </a-button>
+ <a-tag v-if="bagPreview" color="blue">鍙瘑鍒� {{ bagPreview.bags?.length ?? 0 }} 琚�</a-tag>
+ <a-tag v-if="selectedBagIds.length" color="green">宸查�� {{ selectedBagIds.length }} 琚�</a-tag>
+ <span v-if="bagPreview && !bagPreview.bags?.length" class="text-sm text-gray-500">
+ 璇ュ簱瀛樻病鏈夊彲璇嗗埆鐨勮鐮侊紝鍙寜鏁伴噺鎷h揣銆�
+ </span>
+ </div>
+ <PickingBags v-if="bagPreview?.bags?.length" v-model="selectedBagIds" :bags="bagPreview.bags" :disabled="previewLoading" />
+ </div>
</Modal>
</template>
--
Gitblit v1.9.3