From 6d1c1ea20e50b8995970006ef2ec793cf66ae989 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 8 Jul 2025 16:26:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E5=93=81=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/foodManage/stockManage.js                    | 12 ++++++++----
 .../foodManage/stockManage/depotManage/index.vue     |  5 +----
 .../foodManage/stockManage/totalStock/index.vue      |  6 +++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/api/foodManage/stockManage.js b/src/api/foodManage/stockManage.js
index d396b0f4..4b1d013b 100644
--- a/src/api/foodManage/stockManage.js
+++ b/src/api/foodManage/stockManage.js
@@ -71,14 +71,18 @@ export function systemMaterialTreeApi(data) {
 
 // -------------货品库存---------------
 // 查询货品库存列表
-export function getMaterialListApi(data) {
+export function getStockMaterialListApi(data) {
     return request({
-      url: '/smart-canteen/cook_material/list',
-      method: 'get',
+      url: '/smart-canteen/ims/inventory/list',
+      method: 'post',
       headers: {
           //"merchant-id":"378915229716713472",
       },
-      params: data
+      data: data,
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
 }
 
diff --git a/src/views/foodManage/stockManage/depotManage/index.vue b/src/views/foodManage/stockManage/depotManage/index.vue
index aff1c977..1ef108da 100644
--- a/src/views/foodManage/stockManage/depotManage/index.vue
+++ b/src/views/foodManage/stockManage/depotManage/index.vue
@@ -177,10 +177,7 @@
                 <el-button type="primary" @click="submitForm">确 定</el-button>
                 <el-button @click="cancel">取 消</el-button>
             </div>
-        </el-dialog>
-        <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="dialogImageUrl" alt="">
-        </el-dialog>  
+        </el-dialog> 
     </div>
 </template>
 
diff --git a/src/views/foodManage/stockManage/totalStock/index.vue b/src/views/foodManage/stockManage/totalStock/index.vue
index 60a232a8..8be242f3 100644
--- a/src/views/foodManage/stockManage/totalStock/index.vue
+++ b/src/views/foodManage/stockManage/totalStock/index.vue
@@ -64,7 +64,7 @@
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" />
+      <el-table-column label="货品编码" align="center" prop="materialNum" :show-overflow-tooltip="true" />
       <el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true"/>
       <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
       <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="120"/>
@@ -106,7 +106,7 @@
 <script> 
 import { systemAreaTreeApi } from "@/api/base/stall";
 // import { supplierQualificationWarningPageApi } from "@/api/foodManage/supplierManage";
-import { drpWareHousePageApi,systemMaterialTreeApi,getMaterialListApi } from "@/api/foodManage/stockManage";
+import { drpWareHousePageApi,systemMaterialTreeApi,getStockMaterialListApi } from "@/api/foodManage/stockManage";
 
 export default {
   name: "",
@@ -220,7 +220,7 @@ export default {
             "materialName": this.queryParams.materialName,  
             "barCode": this.queryParams.barCode,  
           }
-          getMaterialListApi(param).then(response => {
+          getStockMaterialListApi(param).then(response => {
               this.tableListData = response.rows;
               this.total = Number(response.total);
               this.loading = false;