From f9dde5f2f75298ff2aa50f2f7ecff3b47ac570e9 Mon Sep 17 00:00:00 2001 From: haoxuan <haoxuan> Date: 星期三, 18 十月 2023 11:05:33 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into wn --- src/components/makepager/FormBtnsView.vue | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/components/makepager/FormBtnsView.vue b/src/components/makepager/FormBtnsView.vue index 201eb77..8ed335f 100644 --- a/src/components/makepager/FormBtnsView.vue +++ b/src/components/makepager/FormBtnsView.vue @@ -10,14 +10,14 @@ <div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct" class="sub-number left_border 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.inLibrary + "浠�" }}</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 + "浠�" }}</div> <div class="right-label">棰勬祴</div> </div> </div> @@ -29,8 +29,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 }}</div> + <div class="right-label">{{ "鍑�: " + countObject.exit }}</div> </div> </div> <!-- <div @@ -48,14 +48,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">{{ 0 }}</div> + <div class="right-label">{{ countObject.reorderRule }}</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 }}</div> <div class="right-label">浜у搧</div> </div> </div> @@ -120,6 +120,19 @@ showSale: { type: Boolean, default: true + }, + countObject: { + type: Object, + default: () => { + return { + inLibrary: 0, // 鍦ㄥ簱 + forecast: 0, // 棰勬祴 + enter: 0, // 杩� + exit: 0, // 鍑� + reorderRule: 0, // 閲嶈璐ц鍒� + product: 0 // 浜у搧 + } + } } }, data() { -- Gitblit v1.8.0