From 5948315e24e88cf5b87c0aefb12c51c886da7601 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 18 十月 2023 19:50:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/components/makepager/FormBtnsView.vue | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/components/makepager/FormBtnsView.vue b/src/components/makepager/FormBtnsView.vue
index 8ed335f..b27b6b1 100644
--- a/src/components/makepager/FormBtnsView.vue
+++ b/src/components/makepager/FormBtnsView.vue
@@ -7,17 +7,20 @@
<div class="right-label">棰濆鐨勪环鏍�</div>
</div>
</div> -->
- <div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct" class="sub-number left_border no-cursor">
+ <div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct"
+ class="sub-number left_border cursor_pointer"
+ @click="inLibraryClick()"
+ >
<div class="left"><i class="el-icon-present"></i></div>
<div class="right">
- <div class="right-label">{{ countObject.inLibrary + "浠�" }}</div>
+ <div class="right-label">{{ (countObject?.inLibrary ?? 0) + "浠�" }}</div>
<div class="right-label">鍦ㄥ簱</div>
</div>
</div>
<div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct" class="sub-number no-cursor">
<div class="left"><i class="el-icon-present"></i></div>
<div class="right">
- <div class="right-label">{{ countObject.forecast + "浠�" }}</div>
+ <div class="right-label">{{ (countObject?.forecast ?? 0) + "浠�" }}</div>
<div class="right-label">棰勬祴</div>
</div>
</div>
@@ -29,8 +32,8 @@
>
<div class="left icon-view"><i class="el-icon-sort"></i></div>
<div class="right">
- <div class="right-label">{{ "杩�: " + countObject.enter }}</div>
- <div class="right-label">{{ "鍑�: " + countObject.exit }}</div>
+ <div class="right-label">{{ "杩�: " + (countObject?.enter ?? 0) }}</div>
+ <div class="right-label">{{ "鍑�: " + (countObject?.exit ?? 0) }}</div>
</div>
</div>
<!-- <div
@@ -48,14 +51,14 @@
<div v-if="!showProduct && !showWarehouse && !showPosition" class="sub-number no-cursor">
<div class="left"><i class="el-icon-refresh"></i></div>
<div class="right">
- <div class="right-label">{{ countObject.reorderRule }}</div>
+ <div class="right-label">{{ (countObject?.reorderRule ?? 0) }}</div>
<div class="right-label">閲嶈璐ц鍒�</div>
</div>
</div>
<div v-if="showProduct" class="sub-number left_border yes-cursor" @click="productClick">
<div class="left"><i class="el-icon-s-fold"></i></div>
<div class="right">
- <div class="right-label">{{ countObject.product }}</div>
+ <div class="right-label">{{ (countObject?.product ?? 0) }}</div>
<div class="right-label">浜у搧</div>
</div>
</div>
@@ -146,6 +149,10 @@
// 浜у搧
productClick() {
this.$emit("productClick")
+ },
+ // 鍦ㄥ簱
+ inLibraryClick(){
+ this.$emit("inLibraryClick")
}
}
}
--
Gitblit v1.8.0