update

src/pages/counter/list/index.vue

@@ -137,7 +137,18 @@
 
             <p v-if="popText=='密码器'" class="tips"></p>
             <p v-else-if="popText=='重要空白凭证箱'||popText=='普通凭证箱'" class="tips">- 请从以下物品中选取所需材料 -</p>
-            <p v-else-if="needBackMoney" class="tips">- 请领取您所需要的现金 -</p>
+            <div v-else-if="needBackMoney">
+                <p class="tips" v-if="backMoneyArr.length===0">- 请领取您所需要的现金 -</p>
+                <p class="tips" v-else style="text-align: left">
+                    <span>您将领取:</span>
+                    <span v-for="(item, index) in backMoneyArr" :key="item.key">
+                        <span>{{ item.name  + ' * ' + item.num + ' = ' +  consumeMoney(item.name, item.num) }}</span>
+                        <span v-if="index<backMoneyArr.length-1">，</span>
+                        <span v-else>。</span>
+                    </span>
+                    总金额为: {{ backMoneyTotal + '元' }}</p>
+            </div>
+            
             <p v-else class="tips">- 请从物品栏选中或拖拽所需材料 -</p>
 
             <!-- 动画开始 -->
@@ -719,13 +730,28 @@ export default {
     },
     computed: {
         // 业务一和其他业务的银行卡不一样
+        consumeMoney() {
+            return (name, num) => {
+                if(name.includes('元')) {
+                    return parseInt(name) * num + '元'
+                }else {
+                    return (parseInt(name) * num * 0.1).toFixed(1) + '元'
+                }
+            }
+        },
         backMoneyArr() {
             return this.cashboxGoodsShelf2.filter(item => item.num>0)
         },
         backMoneyTotal() {
             return this.cashboxGoodsShelf2.reduce((total, item) => {
-                return total + parseInt(item.name) * item.num
+                if(item.name.includes('元')) {
+                    return Number((total + Number((parseInt(item.name) * item.num).toFixed(1))).toFixed(1))
+                }else {
+                    return Number((total + Number((parseInt(item.name) * item.num * 0.1).toFixed(1))).toFixed(1))
+                }
+                
             }, 0)
+            // return 666
         },
         needPasswordAgain() {
             if(this.id == '62,1' || this.id == '62,2' || this.id == '62,3' || this.id == '129' || this.id == '167' || this.id == '301') {