From 086e34eb89b072473e754937232f02e6199739a6 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期二, 26 三月 2024 10:02:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS into zzq
---
src/components/makepager/FormBtnsView.vue | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/components/makepager/FormBtnsView.vue b/src/components/makepager/FormBtnsView.vue
index 653231a..35c4d25 100644
--- a/src/components/makepager/FormBtnsView.vue
+++ b/src/components/makepager/FormBtnsView.vue
@@ -14,27 +14,26 @@
>
<div class="left"><i class="el-icon-present"></i></div>
<div class="right">
- <div class="right-label">{{ (countObject?.inLibrary ?? 0) + "浠�" }}</div>
+ <div class="right-label">{{ (countObject?.amount ?? 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 ?? 0) + "浠�" }}</div>
+ <div class="right-label">{{ (countObject?.predictionAmount ?? 0) + "浠�" }}</div>
<div class="right-label">棰勬祴</div>
</div>
</div>
<div
v-if="!showProduct && !showWarehouse && !showPosition"
class="sub-number yes-cursor"
- @click="inOutBoundClick"
:class="{ left_border: addProduct }"
>
<div class="left icon-view"><i class="el-icon-sort"></i></div>
<div class="right">
- <div class="right-label">{{ "杩�: " + (countObject?.enter ?? 0) }}</div>
- <div class="right-label">{{ "鍑�: " + (countObject?.exit ?? 0) }}</div>
+ <div class="right-label" @click="inOutBoundClick('杩�')">{{ "杩�: " + (countObject?.inputAmount ?? 0) }}</div>
+ <div class="right-label" @click="inOutBoundClick('鍑�')">{{ "鍑�: " + (countObject?.outputAmount ?? 0) }}</div>
</div>
</div>
<!-- <div
@@ -56,14 +55,20 @@
>
<div class="left"><i class="el-icon-refresh"></i></div>
<div class="right">
- <div class="right-label">{{ countObject?.reorderRule ?? 0 }}</div>
- <div class="right-label">閲嶈璐ц鍒�</div>
+ <template v-if="countObject?.reorderRuleNum== 1">
+ <div class="right-label">鏈�灏忥細{{ countObject?.minInventoryRule ?? 0 }}</div>
+ <div class="right-label">鏈�澶э細{{ countObject?.maxInventoryRule ?? 0 }}</div>
+ </template>
+ <template v-else>
+ <div class="right-label">{{ countObject?.reorderRuleNum ?? 0 }}</div>
+ <div class="right-label">閲嶈璐ц鍒�</div>
+ </template>
</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 ?? 0 }}</div>
+ <div class="right-label">{{ countObject?.reorderRuleNum ?? 0 }}</div>
<div class="right-label">浜у搧</div>
</div>
</div>
@@ -87,7 +92,7 @@
<div class="right-label">宸插敭</div>
</div>
</div> -->
- <div v-if="showPosition" class="sub-number no-cursor">
+ <div v-if="showPosition" :class="showPositionCursor?'sub-number yes-cursor':'no-cursor sub-number'" @click="positionReport">
<div class="left"><i class="el-icon-help"></i></div>
<div class="right">
<div class="right-one">褰撳墠搴撳瓨</div>
@@ -129,6 +134,10 @@
type: Boolean,
default: true
},
+ showPositionCursor:{
+ type: Boolean,
+ default: false,
+ },
countObject: {
type: Object,
default: () => {
@@ -147,9 +156,12 @@
return {}
},
methods: {
+ positionReport(){
+ this.$emit("positionReport")
+ },
// 杩涘嚭
- inOutBoundClick() {
- this.$emit("inOutBoundClick")
+ inOutBoundClick(val) {
+ this.$emit("inOutBoundClick",val)
},
// 浜у搧
productClick() {
@@ -181,12 +193,12 @@
padding: 0px 10px;
font-size: 13px;
.sub-number {
- width: 12.5%;
+ width: 13%;
border-right: 1px solid #e9e9e9;
border-top: 1px solid #e9e9e9;
border-bottom: 1px solid #e9e9e9;
display: flex;
- padding: 3px 9px;
+ padding: 3px 5px;
.left {
margin-top: 3px;
font-size: 22px;
--
Gitblit v1.8.0