From 9fa3c42e14a9ecad66137de1d92b61e8843db9b9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 11:38:42 +0800
Subject: [PATCH] feat(库存/明细账): 明细账真实导出、库存报表合并出入库、按采购订单号搜索

---
 src/views/inventoryManagement/stockReport/index.vue |   65 ++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/views/inventoryManagement/stockReport/index.vue b/src/views/inventoryManagement/stockReport/index.vue
index ae1d20c..37d4ba7 100644
--- a/src/views/inventoryManagement/stockReport/index.vue
+++ b/src/views/inventoryManagement/stockReport/index.vue
@@ -41,6 +41,11 @@
                         format="YYYY-MM-DD"
                         value-format="YYYY-MM-DD"
                         style="width: 240px;" />
+        <span class="search_title ml10">閲囪喘璁㈠崟鍙凤細</span>
+        <el-input v-model="searchForm.purchaseOrderNo"
+                  placeholder="璇疯緭鍏ラ噰璐鍗曞彿"
+                  clearable
+                  style="width: 180px;" />
         <el-button type="primary"
                    @click="onSearch"
                    style="margin-left: 10px">
@@ -148,16 +153,30 @@
                            label="搴忓彿"
                            type="index"
                            width="60" />
-          <el-table-column label="鍏ュ簱鏃堕棿"
+          <el-table-column label="鏃堕棿"
                            prop="createTime"
                            width="200"
                            show-overflow-tooltip
                            v-if="searchForm.reportType !== 'inout'" />
-          <el-table-column label="鍏ュ簱鎵规"
-                           prop="inboundBatches"
+          <el-table-column label="鏂瑰悜"
+                           width="80"
+                           align="center"
+                           v-if="searchForm.reportType !== 'inout'">
+            <template #default="scope">
+              <el-tag :type="scope.row.direction === 'out' ? 'warning' : 'success'"
+                      size="small">
+                {{ scope.row.direction === 'out' ? '鍑哄簱' : '鍏ュ簱' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="鍗曟嵁鎵规"
                            width="180"
                            show-overflow-tooltip
-                           v-if="searchForm.reportType !== 'inout'" />
+                           v-if="searchForm.reportType !== 'inout'">
+            <template #default="scope">
+              {{ scope.row.direction === 'out' ? scope.row.outboundBatches : scope.row.inboundBatches }}
+            </template>
+          </el-table-column>
           <el-table-column label="鎵瑰彿"
                            prop="batchNo"
                            width="180"
@@ -179,12 +198,25 @@
           <el-table-column label="鍏ュ簱鏁伴噺"
                            prop="stockInNum"
                            align="center"
-                           v-else />
+                           v-else>
+            <template #default="scope">
+              {{ scope.row.direction === 'out' ? '-' : scope.row.stockInNum }}
+            </template>
+          </el-table-column>
           <el-table-column label="鍑哄簱鏁伴噺"
                            prop="totalStockOut"
                            width="100"
                            align="center"
                            v-if="searchForm.reportType === 'inout'" />
+          <el-table-column label="鍑哄簱鏁伴噺"
+                           prop="stockOutNum"
+                           width="100"
+                           align="center"
+                           v-else>
+            <template #default="scope">
+              {{ scope.row.direction === 'out' ? scope.row.stockOutNum : '-' }}
+            </template>
+          </el-table-column>
           <el-table-column label="鐜板湪搴撳瓨"
                            prop="currentStock"
                            align="center" />
@@ -193,10 +225,10 @@
                            v-if="searchForm.reportType !== 'inout'"
                            show-overflow-tooltip>
             <template #default="scope">
-              {{ getRecordType(scope.row.recordType) }}
+              {{ getRecordType(scope.row) }}
             </template>
           </el-table-column>
-          <el-table-column label="鍏ュ簱浜�"
+          <el-table-column label="缁忔墜浜�"
                            prop="createBy"
                            width="80"
                            v-if="searchForm.reportType !== 'inout'"
@@ -223,6 +255,7 @@
   } from "@/api/inventoryManagement/stockInventory.js";
   import {
     findAllQualifiedStockInRecordTypeOptions,
+    findAllQualifiedStockOutRecordTypeOptions,
     // findAllUnQualifiedStockInRecordTypeOptions,
   } from "@/api/basicData/enum.js";
 
@@ -237,6 +270,7 @@
     singleDate: "",
     dateRange: [],
     monthRange: [],
+    purchaseOrderNo: "",
   });
 
   const reportData = ref({
@@ -253,12 +287,14 @@
   const total = ref(0);
 
   const stockRecordTypeOptions = ref([]);
+  const stockOutRecordTypeOptions = ref([]);
 
-  const getRecordType = recordType => {
-    return (
-      stockRecordTypeOptions.value.find(item => item.value === recordType)
-        ?.label || ""
-    );
+  const getRecordType = row => {
+    const options =
+      row.direction === "out"
+        ? stockOutRecordTypeOptions.value
+        : stockRecordTypeOptions.value;
+    return options.find(item => item.value === row.recordType)?.label || "";
   };
 
   // 鑾峰彇鏉ユ簮绫诲瀷閫夐」
@@ -271,6 +307,9 @@
       //     ...res.data,
       //   ];
       // });
+    });
+    findAllQualifiedStockOutRecordTypeOptions().then(res => {
+      stockOutRecordTypeOptions.value = res.data;
     });
   };
 
@@ -404,6 +443,7 @@
       endMonth: "",
       startDate: "",
       endDate: "",
+      purchaseOrderNo: searchForm.purchaseOrderNo,
     };
 
     if (searchForm.reportType === "daily") {
@@ -425,6 +465,7 @@
     searchForm.singleDate = "";
     searchForm.dateRange = [];
     searchForm.monthRange = [];
+    searchForm.purchaseOrderNo = "";
     reportData.value = {
       summary: null,
       chartData: null,

--
Gitblit v1.9.3