From e9f494339c91df35b4552573f6b4e85e51fa5a9d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 19 八月 2026 10:28:28 +0800
Subject: [PATCH] feat: 发货信息展示源单号

---
 src/views/salesManagement/salesLedger/index.vue |   58 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 35ed6c9..8819090 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -129,8 +129,7 @@
                                show-overflow-tooltip />
               <el-table-column label="鍙戣揣杞︾墝"
                                minWidth="100px"
-                               align="center"
-                               v-if="false">
+                               align="center">
                 <template #default="scope">
                   <div>
                     <el-tag type="success"
@@ -714,12 +713,12 @@
             <el-form-item label="鏄惁鐢熶骇锛�"
                           prop="isProduction">
               <div style="display: flex; align-items: center; width: 100%;">
-                <el-radio-group v-model="productForm.isProduction">
-                  <el-radio label="鏄�"
-                            :value="true" />
-                  <el-radio label="鍚�"
-                            :value="false" />
-                </el-radio-group>
+              <el-radio-group v-model="productForm.isProduction">
+                <el-radio label="鏄�"
+                          :value="true" />
+                <el-radio label="鍚�"
+                          :value="false" />
+              </el-radio-group>
                 <div 
                   v-if="currentStock !== null" 
                   :style="{
@@ -823,7 +822,7 @@
                     <span class="label">鍙戣揣鏃ユ湡锛�</span>
                     <span class="value">{{ formatDate(item.createTime) }}</span>
                   </div>
-                  <div v-if="false">
+                  <div>
                     <span class="label">鍙戣揣杞︾墝鍙凤細</span>
                     <span class="value">{{ item.shippingCarNumber }}</span>
                   </div>
@@ -911,7 +910,7 @@
     <!-- 鍙戣揣寮规 -->
     <el-dialog v-model="deliveryFormVisible"
                title="鍙戣揣淇℃伅"
-               width="40%"
+               width="960px"
                @close="closeDeliveryDia">
       <el-form :model="deliveryForm"
                label-width="120px"
@@ -926,11 +925,10 @@
                          placeholder="璇烽�夋嫨鍙戣揣绫诲瀷"
                          style="width: 100%"
                          @change="handleDeliveryTypeChange">
+                <el-option label="璐ц溅"
+                           value="璐ц溅" />
                 <el-option label="蹇��"
                            value="蹇��" />
-                <el-option v-if="false"
-                           label="璐ц溅"
-                           value="璐ц溅" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -952,7 +950,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24"
-                  v-else-if="false">
+                  v-else>
             <el-form-item label="蹇�掑叕鍙革細"
                           prop="expressCompany">
               <el-input v-model="deliveryForm.expressCompany"
@@ -962,7 +960,7 @@
           </el-col>
         </el-row>
         <el-row :gutter="30"
-                >
+                v-if="deliveryForm.type === '蹇��'">
           <el-col :span="24">
             <el-form-item label="蹇�掑崟鍙凤細"
                           prop="expressNumber">
@@ -992,6 +990,13 @@
                 <el-table-column label="鎵瑰彿"
                                  prop="batchNo"
                                  min-width="180" />
+                <el-table-column label="閿�鍞鍗曞彿"
+                                 min-width="180"
+                                 show-overflow-tooltip>
+                  <template #default="scope">
+                    {{ formatDeliveryBatchSalesOrderNo(scope.row) }}
+                  </template>
+                </el-table-column>
                 <el-table-column label="浜у搧澶х被"
                                  prop="productName"
                                  min-width="100" />
@@ -1216,6 +1221,8 @@
       item?.stockQuantity;
     return quantity ?? 0;
   };
+  const formatDeliveryBatchSalesOrderNo = item =>
+    item?.salesContractNo || item?.sourceOrderNo || item?.salesOrderNo || "--";
   const currentStock = ref(null);
   const fetchCurrentStock = async (productModelId) => {
     if (!productModelId) {
@@ -1322,7 +1329,7 @@
       shippingCarNumber: "",
       expressCompany: "",
       expressNumber: "",
-      type: "蹇��", // 璐ц溅, 蹇��
+      type: "璐ц溅", // 璐ц溅, 蹇��
     },
     deliveryRules: {
       shippingCarNumber: [
@@ -1503,6 +1510,7 @@
     productForm.value.productModelId = p.id;
     productForm.value.specificationModel = p.model || '';
     productForm.value.unit = p.unit || '';
+    fetchCurrentStock(productForm.value.productModelId);
     showProductSelectDialog.value = false;
   };
   // 鑾峰彇tree瀛愭暟鎹�
@@ -1621,9 +1629,9 @@
       param,
       ["contractAmount", "taxInclusiveTotalPrice", "taxExclusiveTotalPrice"],
       buildAmountSummaryFormat([
-        "contractAmount",
-        "taxInclusiveTotalPrice",
-        "taxExclusiveTotalPrice",
+      "contractAmount",
+      "taxInclusiveTotalPrice",
+      "taxExclusiveTotalPrice",
       ])
     );
   };
@@ -1650,9 +1658,9 @@
     return proxy.summarizeTable(
       param,
       [
-        "taxInclusiveUnitPrice",
-        "taxInclusiveTotalPrice",
-        "taxExclusiveTotalPrice",
+      "taxInclusiveUnitPrice",
+      "taxInclusiveTotalPrice",
+      "taxExclusiveTotalPrice",
       ],
       buildAmountSummaryFormat([
         "taxInclusiveUnitPrice",
@@ -2103,7 +2111,7 @@
         const data = res.data || res;
         companyName = data.companyName || companyName;
         orders.push(data.ledger);
-      }
+        }
       printSalesMulti(companyName, orders);
     } catch (e) {
       console.error('鎵撳嵃澶辫触:', e);
@@ -2483,7 +2491,7 @@
       shippingCarNumber: "",
       expressCompany: "",
       expressNumber: "",
-      type: "蹇��",
+      type: "璐ц溅",
       batchNo: [],
       batchNoList,
     };
@@ -2808,4 +2816,4 @@
       page-break-after: avoid;
     }
   }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3