From 810efcb381e78d3078d6ab572b81857faa6702e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Wed, 3 Apr 2024 15:41:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/order/index.vue | 63 ++++++++++++++++++++++++++++----------- src/views/work/index.vue | 2 +- 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/src/views/order/index.vue b/src/views/order/index.vue index 05281bd..89f1247 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -100,7 +100,7 @@ type="primary" @click="recharge = true">退单
- 重打收銀打票 + 重打收银打票 重打出品小票
@@ -176,7 +176,9 @@ 包装费：￥{{ orderDetaildata.packFee }} - +
@@ -187,13 +189,17 @@
- {{ item.productName }}
- {{ item.num }} + + +
￥{{ item.price }} @@ -203,7 +209,7 @@
退单金额：
-
￥{{ refundamount }}
+
￥{{ refundamount > 0 ? refundamount : '0.00' }}
{ //退单切换 const buttonloading = ref() //loading -const payreturnOrderclick = lodash.debounce( async () => { //搜索手机号 +const payreturnOrderclick = lodash.debounce(async () => { //搜索手机号 buttonloading.value = true if (refundamount.value == 0) { buttonloading.value = false @@ -256,7 +262,8 @@ const payreturnOrderclick = lodash.debounce( async () => { //搜索手机号 var obj = { id: item.id, orderId: orderDetaildata.value.id, - remark: remark.value + remark: remark.value, + num: item.num } } return obj @@ -313,6 +320,8 @@ const emititemboxshow = async (e) => { //接收子组件值 并赋值给父组 orderDetaildata.value = res orderDetaildata.value.detailList.forEach((e) => { e.checked = false + e.maxnum = e.num // 添加最大数量 + e.zongprice = (e.priceAmount / e.maxnum).toFixed(2) }) changechecked.value = false //清空全选 refundamount.value = 0 //退款金额清0 @@ -328,13 +337,30 @@ const changechecked = ref(false) //全选 const refundamount = ref(0)//退款金额 -const changezong = (e, b, c) => { +const changezong = (e, b, c, d, currentValue, oldValue) => { + console.log(e) if (c == 1) { - if (e.checked) { - refundamount.value = clearNoNum({ value: JSON.stringify(Number(refundamount.value) + (Number(e.num) * Number(e.price))) }) - } else { - refundamount.value = clearNoNum({ value: JSON.stringify(Number(refundamount.value) - (Number(e.num) * Number(e.price))) }) + if (d == 'num' && e.checked) { + orderDetaildata.value.detailList.forEach((item, a, b) => { + if (item.id == e.id) { + if (currentValue > oldValue) { + refundamount.value = (Number(refundamount.value) + (Number(currentValue - oldValue) * Number(item.zongprice))).toFixed(2) + } else { + refundamount.value = (Number(refundamount.value) + (Number(currentValue - oldValue) * Number(item.zongprice))).toFixed(2) + } + } + }) } + + if (d == 'quan') {//这是选择选项 + if (e.checked) { + console.log(Number(refundamount.value), Number(e.num) * Number(e.zongprice)) + refundamount.value = ((Number(refundamount.value) + (Number(e.num) * Number(e.zongprice)))).toFixed(2) + } else { + refundamount.value = ((Number(refundamount.value) - (Number(e.num) * Number(e.zongprice)))).toFixed(2) + } + } + if (orderDetaildata.value.detailList.every(item => item.checked == true)) {//判断是否全选 changechecked.value = true } else { @@ -343,13 +369,12 @@ const changezong = (e, b, c) => { } else { refundamount.value = 0 orderDetaildata.value.detailList.forEach((e, a, b) => { - console.log(e, refundamount.value) if (changechecked.value) { if (e.status == 'refund') { e.checked = false } else { e.checked = true - refundamount.value = clearNoNum({ value: JSON.stringify(Number(refundamount.value) + (Number(e.num) * Number(e.price))) }) + refundamount.value = clearNoNum({ value: JSON.stringify(Number(refundamount.value) + (Number(e.num) * Number(e.zongprice))) }) } } else { @@ -633,23 +658,25 @@ onMounted(() => { .recharge_footer_itemright_botton_item { display: flex; - justify-content: flex-start; + justify-content: space-around; align-items: center; border-bottom: 1px solid #ccc; .recharge_footer_itemright_botton_itemone { - width: 60%; + flex: 2; display: flex; justify-content: flex-start; align-items: center; } .recharge_footer_itemright_botton_itemtow { - width: 20%; + flex: 1; + } .recharge_footer_itemright_botton_itemthere { - width: 20%; + flex: 1; + text-align: right; } } } diff --git a/src/views/work/index.vue b/src/views/work/index.vue index 1bb5125..de4e967 100644 --- a/src/views/work/index.vue +++ b/src/views/work/index.vue @@ -81,7 +81,7 @@ 交班时间：
- {{ dayjs(infoData.loginOutTime).format("YYYY-MM-DD") }} + {{ dayjs(infoData.loginOutTime).format("YYYY-MM-DD HH:mm:ss") }}