From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/components/makepager/FormBtnsView.vue | 56 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/src/components/makepager/FormBtnsView.vue b/src/components/makepager/FormBtnsView.vue
index 1a31735..653231a 100644
--- a/src/components/makepager/FormBtnsView.vue
+++ b/src/components/makepager/FormBtnsView.vue
@@ -7,17 +7,21 @@
<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">{{ "0.00" + "浠�" }}</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">{{ "0.00" + "浠�" }}</div>
+ <div class="right-label">{{ (countObject?.forecast ?? 0) + "浠�" }}</div>
<div class="right-label">棰勬祴</div>
</div>
</div>
@@ -29,8 +33,8 @@
>
<div class="left icon-view"><i class="el-icon-sort"></i></div>
<div class="right">
- <div class="right-label">{{ "杩�: " + 0 }}</div>
- <div class="right-label">{{ "鍑�: " + 0 }}</div>
+ <div class="right-label">{{ "杩�: " + (countObject?.enter ?? 0) }}</div>
+ <div class="right-label">{{ "鍑�: " + (countObject?.exit ?? 0) }}</div>
</div>
</div>
<!-- <div
@@ -45,21 +49,25 @@
<div class="right-label">BOM</div>
</div>
</div> -->
- <div v-if="!showProduct && !showWarehouse && !showPosition" class="sub-number no-cursor">
+ <div
+ v-if="!showProduct && !showWarehouse && !showPosition"
+ class="sub-number yes-cursor"
+ @click="reorderRulesClick"
+ >
<div class="left"><i class="el-icon-refresh"></i></div>
<div class="right">
- <div class="right-label">{{ 0 }}</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">{{ 0 }}</div>
+ <div class="right-label">{{ countObject?.product ?? 0 }}</div>
<div class="right-label">浜у搧</div>
</div>
</div>
- <div v-if="!showWarehouse" class="sub-number left_border no-cursor">
+ <div v-if="!showWarehouse" class="sub-number left_border yes-cursor" @click="listingRulesClick">
<div class="left"><i class="el-icon-refresh"></i></div>
<div class="right">
<div class="right-one">涓婃灦瑙勫垯</div>
@@ -120,6 +128,19 @@
showSale: {
type: Boolean,
default: true
+ },
+ countObject: {
+ type: Object,
+ default: () => {
+ return {
+ inLibrary: 0, // 鍦ㄥ簱
+ forecast: 0, // 棰勬祴
+ enter: 0, // 杩�
+ exit: 0, // 鍑�
+ reorderRule: 0, // 閲嶈璐ц鍒�
+ product: 0 // 浜у搧
+ }
+ }
}
},
data() {
@@ -133,6 +154,18 @@
// 浜у搧
productClick() {
this.$emit("productClick")
+ },
+ // 鍦ㄥ簱
+ inLibraryClick() {
+ this.$emit("inLibraryClick")
+ },
+ // 涓婃灦瑙勫垯
+ listingRulesClick() {
+ this.$emit("listingRulesClick")
+ },
+ // 閲嶈璐ц鍒�
+ reorderRulesClick() {
+ this.$emit("reorderRulesClick")
}
}
}
@@ -144,11 +177,14 @@
display: flex;
justify-content: right;
height: 44px;
- border-bottom: 1px solid #e9e9e9;
+ // border-bottom: 1px solid #e9e9e9;
+ padding: 0px 10px;
font-size: 13px;
.sub-number {
width: 12.5%;
border-right: 1px solid #e9e9e9;
+ border-top: 1px solid #e9e9e9;
+ border-bottom: 1px solid #e9e9e9;
display: flex;
padding: 3px 9px;
.left {
--
Gitblit v1.8.0