From 563c60ab9d465e275bf18b57fde7b51c4bc020da Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 29 十一月 2023 15:32:56 +0800
Subject: [PATCH] 出入库明细单打印功能调整，新引入三方库:html2Canvas,jsPdf,vue-office
---
src/components/makepager/FormBtnsView.vue | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/components/makepager/FormBtnsView.vue b/src/components/makepager/FormBtnsView.vue
index 6a1fafa..876a61c 100644
--- a/src/components/makepager/FormBtnsView.vue
+++ b/src/components/makepager/FormBtnsView.vue
@@ -14,14 +14,14 @@
>
<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>
@@ -33,8 +33,8 @@
>
<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">{{ "杩�: " + (countObject?.inputAmount ?? 0) }}</div>
+ <div class="right-label">{{ "鍑�: " + (countObject?.outputAmount ?? 0) }}</div>
</div>
</div>
<!-- <div
@@ -56,14 +56,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>
@@ -188,12 +194,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