From de26a68bb2cf0caa9a35e8eb6dce852435143b25 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 21 八月 2026 19:42:12 +0800
Subject: [PATCH] feat: 发货新增自提选择

---
 src/views/salesManagement/salesLedger/index.vue |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 693c97b..1057d97 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -24,6 +24,18 @@
                     prefix-icon="Search"
                     @change="handleQuery" />
         </el-form-item>
+        <el-form-item label="鍙戣揣鐘舵�侊細">
+          <el-select v-model="searchForm.shippingStatus"
+                     placeholder="璇烽�夋嫨"
+                     clearable
+                     style="width: 160px"
+                     @change="handleQuery">
+            <el-option label="鏈彂璐�"
+                       value="鏈彂璐�" />
+            <el-option label="宸插彂璐�"
+                       value="宸插彂璐�" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="褰曞叆鏃ユ湡锛�">
           <el-date-picker v-model="searchForm.entryDate"
                           value-format="YYYY-MM-DD"
@@ -940,6 +952,8 @@
                            value="蹇��" />
                 <el-option label="璐ц溅"
                            value="璐ц溅" />
+                <el-option label="鑷彁"
+                           value="鑷彁" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -972,7 +986,8 @@
         </el-row>
         <el-row :gutter="30"
                 >
-          <el-col :span="24">
+          <el-col :span="24"
+                  v-if="deliveryForm.type !== '鑷彁'">
             <el-form-item label="蹇�掑崟鍙凤細"
                           prop="expressNumber">
               <el-input v-model="deliveryForm.expressNumber"
@@ -1031,8 +1046,6 @@
                     <el-input-number v-model="scope.row.deliveryQuantity"
                                      :min="0"
                                      :max="getDeliveryBatchDeliveryMax(scope.row)"
-                                     :precision="2"
-                                     :step="0.01"
                                      controls-position="right"
                                      @change="handleDeliveryBatchQuantityChange(scope.row)"
                                      style="width: 100%;" />
@@ -1127,6 +1140,8 @@
     searchForm: {
       customerName: "", // 瀹㈡埛鍚嶇О
       salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
+      projectName: "", // 椤圭洰鍚嶇О
+      shippingStatus: "", // 鍙戣揣鐘舵�侊紙鏈彂璐�/宸插彂璐э級
       entryDate: null, // 褰曞叆鏃ユ湡
       entryDateStart: undefined,
       entryDateEnd: undefined,
@@ -1232,7 +1247,7 @@
     return quantity ?? 0;
   };
   const formatDeliveryBatchSalesOrderNo = item =>
-    item?.salesContractNo || item?.sourceOrderNo || item?.salesOrderNo || "--";
+    item?.salesContractNo || "--";
   const currentStock = ref(null);
   const fetchCurrentStock = async (productModelId) => {
     if (!productModelId) {
@@ -1240,7 +1255,7 @@
       return;
     }
     try {
-      const res = await getStockInventoryByModelId(productModelId);
+      const res = await getStockInventoryByModelId(productModelId, currentId.value);
       const rawList = Array.isArray(res?.data)
         ? res.data
         : res?.data?.records || res?.data?.rows || [];
@@ -1302,9 +1317,9 @@
       item => Number(item?.deliveryQuantity || 0) > 0
     );
   };
-  const getDeliveryBatchNoList = async productModelId => {
+  const getDeliveryBatchNoList = async (productModelId, salesLedgerId) => {
     if (!productModelId) return [];
-    const res = await getStockInventoryByModelId(productModelId);
+    const res = await getStockInventoryByModelId(productModelId, salesLedgerId);
     const rawList = Array.isArray(res?.data)
       ? res.data
       : res?.data?.records || res?.data?.rows || [];
@@ -2483,7 +2498,8 @@
 
     currentDeliveryRow.value = row;
     const batchNoList = await getDeliveryBatchNoList(
-      row.productModelId || row.modelId
+      row.productModelId || row.modelId,
+      row.salesLedgerId
     );
     deliveryForm.value = {
       shippingCarNumber: "",
@@ -2590,6 +2606,10 @@
     if (val === "璐ц溅") {
       deliveryForm.value.expressCompany = "";
       deliveryForm.value.expressNumber = "";
+    } else if (val === "鑷彁") {
+      deliveryForm.value.shippingCarNumber = "";
+      deliveryForm.value.expressCompany = "";
+      deliveryForm.value.expressNumber = "";
     } else {
       deliveryForm.value.shippingCarNumber = "";
     }

--
Gitblit v1.9.3