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/form.vue | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/views/wls/productsales/modules/form.vue b/src/views/wls/productsales/modules/form.vue
index c05ba79..1e0372a 100644
--- a/src/views/wls/productsales/modules/form.vue
+++ b/src/views/wls/productsales/modules/form.vue
@@ -16,6 +16,7 @@
createProductSales,
finishProductSales,
getProductSales,
+ getProductSalesShipments,
previewProductSalesScan,
scanProductSales,
shippingProductSales,
@@ -33,6 +34,8 @@
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
const formData = ref<MesWmProductSalesApi.ProductSales>();
+const shipments = ref<MesWmProductSalesApi.Shipment[]>([]);
+const shipmentStatus: Record<number, string> = { 0: '鎷h揣涓�', 10: '寰呭~鍐欒繍鍗�', 20: '寰呮墽琛屽嚭搴�', 30: '宸插嚭搴�', 40: '宸插彇娑�' };
const scanContent = ref('');
const scanType = ref<'' | 'BAG' | 'BATCH' | 'PALLET'>('');
const scanPreview = ref<MesWmProductSalesApi.ProductSalesScanResponse>();
@@ -156,18 +159,17 @@
}
}
-/** 鎵ц鎷h揣锛氬嚭搴撴暟閲忎笌鎷h揣鏁伴噺涓嶄竴鑷存椂浜屾纭 */
+/** 鎵ц鎷h揣锛氭牳瀵瑰嚭搴撴暟閲忎笌鎷h揣鏁伴噺 */
async function handleStock() {
if (!formData.value?.id) {
return;
}
const quantityMatch = await checkProductSalesQuantity(formData.value.id);
if (!quantityMatch) {
- try {
- await confirm('鍑哄簱鏁伴噺涓庢嫞璐ф暟閲忎笉涓�鑷达紝纭鎵ц鎷h揣锛�');
- } catch {
- return;
- }
+ message.warning(
+ '鏈疆杩樻病鏈夊緟鍙戣揣鐨勬嫞璐ф槑缁嗭細璇峰厛鍦ㄧ墿鏂欎俊鎭腑銆屾嫞璐с�嶆垨鎵爜鍔犲叆琚嬬爜锛屼笖绱鏁伴噺涓嶈兘瓒呰繃璁″垝鏁伴噺',
+ );
+ return;
}
modalApi.lock();
try {
@@ -260,6 +262,7 @@
scanContent.value = '';
if (!isOpen) {
formData.value = undefined;
+ shipments.value = [];
originalSnapshot.value = '';
return;
}
@@ -273,8 +276,13 @@
modalApi.lock();
try {
formData.value = await getProductSales(data.id);
+ shipments.value = await getProductSalesShipments(data.id);
// 璁剧疆鍒� values
await formApi.setValues(formData.value);
+ if (formType.value === 'shipping') {
+ const current = shipments.value.find(s => s.status === 10);
+ if (current) await formApi.setValues({ carrier: current.carrier || '', shippingNumber: current.shippingNumber || '' });
+ }
} finally {
modalApi.unlock();
}
@@ -289,6 +297,14 @@
<Form class="mx-4" />
<!-- 闈炴柊寤烘ā寮忓睍绀虹墿鏂欎俊鎭� -->
<template v-if="formData?.id">
+ <div v-if="shipments.length" class="mx-4 mb-3">
+ <h3 class="font-semibold">鍙戣揣璁板綍</h3>
+ <div v-for="(shipment, index) in shipments" :key="shipment.id" class="mt-2 border-b pb-2">
+ 绗� {{index + 1}} 娆� 路 {{shipmentStatus[shipment.status] || '鏈煡鐘舵��'}}
+ <span v-if="shipment.shippingNumber"> 路 {{shipment.carrier || '鏈綍鍏ユ壙杩愬晢'}} / {{shipment.shippingNumber}}</span>
+ <span v-if="shipment.outboundTime"> 路 鍑哄簱鏃堕棿 {{shipment.outboundTime}}</span>
+ </div>
+ </div>
<Divider>鐗╂枡淇℃伅</Divider>
<div class="mx-4">
<div v-if="isStock" class="mb-3 flex items-center gap-2 px-4">
--
Gitblit v1.9.3