From 990257e90f992cccbfbdd5e3bebd27b0ae5402a8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 10 八月 2026 14:38:38 +0800
Subject: [PATCH] fix: 审批刷新页面优化

---
 src/views/salesManagement/salesLedger/index.vue |   54 ++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 25c3767..0bddaea 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"
@@ -123,15 +135,14 @@
               </el-table-column>
               <el-table-column label="蹇�掑叕鍙�"
                                prop="expressCompany"
-                               v-if="false"
                                show-overflow-tooltip />
               <el-table-column label="蹇�掑崟鍙�"
                                prop="expressNumber"
-                               v-if="false"
                                show-overflow-tooltip />
               <el-table-column label="鍙戣揣杞︾墝"
                                minWidth="100px"
-                               align="center">
+                               align="center"
+                               v-if="false">
                 <template #default="scope">
                   <div>
                     <el-tag type="success"
@@ -834,7 +845,7 @@
                     <span class="label">鍙戣揣鏃ユ湡锛�</span>
                     <span class="value">{{ formatDate(item.createTime) }}</span>
                   </div>
-                  <div>
+                  <div v-if="false">
                     <span class="label">鍙戣揣杞︾墝鍙凤細</span>
                     <span class="value">{{ item.shippingCarNumber }}</span>
                   </div>
@@ -922,7 +933,7 @@
     <!-- 鍙戣揣寮规 -->
     <el-dialog v-model="deliveryFormVisible"
                title="鍙戣揣淇℃伅"
-               width="40%"
+               width="960px"
                @close="closeDeliveryDia">
       <el-form :model="deliveryForm"
                label-width="120px"
@@ -937,11 +948,10 @@
                          placeholder="璇烽�夋嫨鍙戣揣绫诲瀷"
                          style="width: 100%"
                          @change="handleDeliveryTypeChange">
+                <el-option label="蹇��"
+                           value="蹇��" />
                 <el-option label="璐ц溅"
                            value="璐ц溅" />
-                <el-option label="蹇��"
-                           v-if="false"
-                           value="蹇��" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -973,7 +983,7 @@
           </el-col>
         </el-row>
         <el-row :gutter="30"
-                v-if="false">
+                >
           <el-col :span="24">
             <el-form-item label="蹇�掑崟鍙凤細"
                           prop="expressNumber">
@@ -1003,6 +1013,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" />
@@ -1122,6 +1139,8 @@
     searchForm: {
       customerName: "", // 瀹㈡埛鍚嶇О
       salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
+      projectName: "", // 椤圭洰鍚嶇О
+      shippingStatus: "", // 鍙戣揣鐘舵�侊紙鏈彂璐�/宸插彂璐э級
       entryDate: null, // 褰曞叆鏃ユ湡
       entryDateStart: undefined,
       entryDateEnd: undefined,
@@ -1226,6 +1245,8 @@
       item?.stockQuantity;
     return quantity ?? 0;
   };
+  const formatDeliveryBatchSalesOrderNo = item =>
+    item?.salesContractNo || "--";
   const currentStock = ref(null);
   const fetchCurrentStock = async (productModelId) => {
     if (!productModelId) {
@@ -1233,7 +1254,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 || [];
@@ -1295,9 +1316,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 || [];
@@ -1332,7 +1353,7 @@
       shippingCarNumber: "",
       expressCompany: "",
       expressNumber: "",
-      type: "璐ц溅", // 璐ц溅, 蹇��
+      type: "蹇��", // 璐ц溅, 蹇��
     },
     deliveryRules: {
       shippingCarNumber: [
@@ -2476,13 +2497,14 @@
 
     currentDeliveryRow.value = row;
     const batchNoList = await getDeliveryBatchNoList(
-      row.productModelId || row.modelId
+      row.productModelId || row.modelId,
+      row.salesLedgerId
     );
     deliveryForm.value = {
       shippingCarNumber: "",
       expressCompany: "",
       expressNumber: "",
-      type: "璐ц溅",
+      type: "蹇��",
       batchNo: [],
       batchNoList,
     };
@@ -2807,4 +2829,4 @@
       page-break-after: avoid;
     }
   }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3