From f3e06fef48a351f56ff9e78c856437cc2a36157b Mon Sep 17 00:00:00 2001
From: lynn <lynnlinyong@qq.com>
Date: Tue, 6 May 2025 18:23:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=9B=98=E7=82=B9=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/stocktaking.js        | 12 ++++++++++++
 src/views/inventorys/stocktaking.vue | 28 +++++++++++++++++++---------
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/api/system/stocktaking.js b/src/api/system/stocktaking.js
index a4203e2..9bbba2f 100644
--- a/src/api/system/stocktaking.js
+++ b/src/api/system/stocktaking.js
@@ -70,3 +70,15 @@ export function getMaterialInfoList(params) {
   })
 }
 
+// 获取盘点历史记录
+export function getStocktakingHistoryList(data) {
+  return request({
+    url: '/api/admin/material-infos-history/index',
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
diff --git a/src/views/inventorys/stocktaking.vue b/src/views/inventorys/stocktaking.vue
index 4daff49..4ff3e00 100644
--- a/src/views/inventorys/stocktaking.vue
+++ b/src/views/inventorys/stocktaking.vue
@@ -357,7 +357,7 @@
 </template>
 
 <script>
-import { saveStocktakingPlan, getStocktakingPlanList, deleteStocktakingPlan, getStocktakingPlanLinkList, getStocktakingPlanLinkDetail } from '@/api/system/stocktaking'
+import { saveStocktakingPlan, getStocktakingPlanList, deleteStocktakingPlan, getStocktakingPlanLinkList, getStocktakingPlanLinkDetail, getStocktakingHistoryList } from '@/api/system/stocktaking'
 import { getStorehouseTypeList } from '@/api/system/storehouseType'
 import { getparameteritem } from '@/api/system/dictionary'
 import { index as getWarehouseList } from '@/api/system/baseForm'
@@ -846,23 +846,32 @@ export default {
       };
 
       try {
-        // 获取物资详情，包含盘点历史
-        const res = await request({
+        // 1. 获取物资详情
+        const materialRes = await request({
           url: '/api/admin/material-infos/show',
           method: 'get',
-          params: {
-            id: row.material_info.id
-          }
+          params: { id: row.material_info.id }
         });
+        if (materialRes) {
+          this.detailModal.data.material_info = materialRes;
+        }
+
+        // 2. 获取盘点历史记录
+        const params = {};
+        params['filter[0][key]'] = 'material_info_id';
+        params['filter[0][op]'] = 'eq';
+        params['filter[0][value]'] = row.material_info.id;
+        params['page'] = this.detailModal.pageIndex || 1;
+        params['page_size'] = this.detailModal.pageSize || 10;
+        const res = await getStocktakingHistoryList(qs.stringify(params));
 
         if (res) {
           // 更新物资信息和历史记录数据
           this.detailModal.data = {
             ...this.detailModal.data,
-            material_info: res || {},
-            history: res.material_infos_plan_link || []
+            history: res.data || []
           };
-          this.detailModal.total = res.material_infos_plan_link ? res.material_infos_plan_link.length : 0;
+          this.detailModal.total = res.data ? res.data.length : 0;
         }
       } catch (error) {
         this.$Message.error('获取盘点任务详情失败');
@@ -876,6 +885,7 @@ export default {
       this.materialModal.currentPlanId = planId
       this.materialModal.visible = true
       this.materialModal.pageIndex = 1
+      this.materialModal.selectedMaterialIds = new Set();
       this.searchMaterials()
     },
     isSelected(item) {