From cb2cae0b43c5f18b673373ad9205f1a15a990c68 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 18 Jul 2025 15:16:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/foodManage/pickManage.js | 2 +-
src/api/foodManage/returnManage.js | 2 +-
src/api/foodManage/stockManage.js | 2 +-
.../stockManage/inventoryCount/edit.vue | 8 ++--
.../stockReport/expiredWarning/index.vue | 34 ++++++++++-----
.../stockReport/stockWarning/index.vue | 42 ++++++++-----------
6 files changed, 48 insertions(+), 42 deletions(-)
diff --git a/src/api/foodManage/pickManage.js b/src/api/foodManage/pickManage.js
index 264af6ed..242022f8 100644
--- a/src/api/foodManage/pickManage.js
+++ b/src/api/foodManage/pickManage.js
@@ -23,7 +23,7 @@ export function getMaterialListApi(data) {
// 查询货品库存列表
export function getStockMaterialListApi(data) {
return request({
- url: '/smart-canteen/ims/inventory/list',
+ url: '/smart-canteen/api/v1/drpinventory/list',
method: 'post',
headers: {
//"merchant-id":"378915229716713472",
diff --git a/src/api/foodManage/returnManage.js b/src/api/foodManage/returnManage.js
index d69edf7c..de1f32e1 100644
--- a/src/api/foodManage/returnManage.js
+++ b/src/api/foodManage/returnManage.js
@@ -23,7 +23,7 @@ export function getMaterialListApi(data) {
// 查询货品库存列表
export function getStockMaterialListApi(data) {
return request({
- url: '/smart-canteen/ims/inventory/list',
+ url: '/smart-canteen/api/v1/drpinventory/list',
method: 'post',
headers: {
//"merchant-id":"378915229716713472",
diff --git a/src/api/foodManage/stockManage.js b/src/api/foodManage/stockManage.js
index 6ea4c67a..e6c158df 100644
--- a/src/api/foodManage/stockManage.js
+++ b/src/api/foodManage/stockManage.js
@@ -88,7 +88,7 @@ export function supplierPageApi(data) {
// 查询货品库存列表
export function getStockMaterialListApi(data) {
return request({
- url: '/smart-canteen/ims/inventory/list',
+ url: '/smart-canteen/api/v1/drpinventory/list',
method: 'post',
headers: {
//"merchant-id":"378915229716713472",
diff --git a/src/views/foodManage/stockManage/inventoryCount/edit.vue b/src/views/foodManage/stockManage/inventoryCount/edit.vue
index 1b590a62..40daef73 100644
--- a/src/views/foodManage/stockManage/inventoryCount/edit.vue
+++ b/src/views/foodManage/stockManage/inventoryCount/edit.vue
@@ -77,9 +77,9 @@
{{ (scope.row.price/100).toFixed(2)||"" }}
-->
-
+
- {{ scope.row.bookNum*(scope.row.price/100) }}
+ {{ (scope.row.bookAmount/100).toFixed(2)||"" }}
@@ -403,8 +403,8 @@ export default {
"categoryIds": this.queryParams.materialTypeIds,
}
getCheckInventoryMaterialPageApi(param).then(response => {
- this.tableListData = response.data;
- // this.total = Number(response.total);
+ this.tableListData = response.rows;
+ this.total = Number(response.total);
this.loading = false;
});
},
diff --git a/src/views/foodManage/stockReport/expiredWarning/index.vue b/src/views/foodManage/stockReport/expiredWarning/index.vue
index a8ed3fb8..7adeca10 100644
--- a/src/views/foodManage/stockReport/expiredWarning/index.vue
+++ b/src/views/foodManage/stockReport/expiredWarning/index.vue
@@ -21,7 +21,10 @@
-
+
+
+
+
搜索
@@ -43,19 +46,27 @@
-
-
-
-
-
-
+
- 正常
- 即将缺货
- 超额
+ {{ (scope.row.unitPrice/100).toFixed(2) }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 过期
+ 保质期内
-
+
+
{
this.tableListData = response.rows;
diff --git a/src/views/foodManage/stockReport/stockWarning/index.vue b/src/views/foodManage/stockReport/stockWarning/index.vue
index 64a1cbb5..2d5c3ecf 100644
--- a/src/views/foodManage/stockReport/stockWarning/index.vue
+++ b/src/views/foodManage/stockReport/stockWarning/index.vue
@@ -21,10 +21,7 @@
-
-
-
-
+
搜索
@@ -46,26 +43,18 @@
-
-
- {{ (scope.row.unitPrice/100).toFixed(2) }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 正常
+ 即将缺货
+ 超额
+
-
{
this.tableListData = response.rows;
+ this.tableListData.forEach(item=>{
+ let arr = item.limitRange.split("~")
+ item.minNum = arr[0]
+ item.maxNum = arr[1]
+ })
+
this.total = Number(response.total);
this.loading = false;
});