From 19b71d754fe3c163066cb9a4739733b8ca8e7011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Sat, 16 Mar 2024 12:07:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A8=82=E5=96=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/components/add.vue |  4 ++--
 src/views/order/index.vue          | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/order/components/add.vue b/src/views/order/components/add.vue
index e1d336c..95d86ce 100644
--- a/src/views/order/components/add.vue
+++ b/src/views/order/components/add.vue
@@ -32,8 +32,8 @@
                 </div>
                 <div style="color:#ff9e01;">
                     <span v-if="item.status == 'pending'">挂单</span>
-                    <span style="color: red;" v-if="item.status == 'refund'">退单</span>
-                    <span style="color:#21c36b;" v-if="item.status == 'closed'">订单完成</span>
+                    <span style="color: red;" v-if="item.status == 'refund' && item.orderType == 'return'">退单</span>
+                    <span style="color:#21c36b;" v-if="item.status == 'closed' || item.status == 'refund'">订单完成</span>
                 </div>
             </div>
         </div>
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 397e499..81192b6 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -69,8 +69,8 @@
                 </div>
                 <div class="orderbox_right_top" style="margin-top: 20px; border-bottom: 2px solid #ccc;">
                     <span style="font-size: 16px;" v-if="orderDetaildata.status == 'pending'">挂单</span>
-                    <span style="font-size: 16px; color: red;" v-if="orderDetaildata.status == 'refund'">退单</span>
-                    <span style="font-size: 16px; color:#21c36b;" v-if="orderDetaildata.status == 'closed'">订单完成</span>
+                    <span style="font-size: 16px; color: red;" v-if="orderDetaildata.status == 'refund' && orderDetaildata.orderType == 'return'">退单</span>
+                    <span style="font-size: 16px; color:#21c36b;" v-if="orderDetaildata.status == 'closed' || orderDetaildata.status == 'refund'">订单完成</span>
                 </div>
                 <div class="orderbox_right_top" style="margin-top: 20px;">
                     <span>商品明细</span>
@@ -87,13 +87,13 @@
                     <div>{{ item.productName }}-{{ item.productSkuName }}</div>
                     <div style="text-align: center;">{{ item.num }}</div>
                     <div style="text-align: center;">{{ item.price }}</div>
-                    <div v-if="item.status == 'refund'"><span
+                    <div v-if="item.status == 'refund' && item.orderType == 'return'"><span
                             style="border: 2px solid red; color: red; padding: 4px 2px;">已退</span></div>
                     <div v-else>{{ item.priceAmount }}</div>
                 </div>
             </div>
             <div class="orderbox_right_button">
-                <el-button style="width: 100%;" v-if="orderDetaildata.status != 'refund'" type="primary"
+                <el-button style="width: 100%;" v-if="orderDetaildata.status == 'refund' && orderDetaildata.orderType == 'return'" type="primary"
                     @click="recharge = true">退单</el-button>
                 <div class="orderbox_right_buttonbutton">
                     <!-- // -->
@@ -186,7 +186,7 @@
                             v-for="(item, index) in orderDetaildata.detailList" :key="index">
                             <div class="recharge_footer_itemright_botton_itemone">
                                 <el-checkbox @change="changezong(item, index, 1)"
-                                    :disabled="item.status == 'refund' ? true : false" v-model="item.checked"
+                                    :disabled="item.status == 'refund' && item.orderType == 'return' ? true : false" v-model="item.checked"
                                     size="large" />
                                 <span style="margin-left: 10px;">{{ item.productName }}</span>
                             </div>
@@ -258,8 +258,9 @@ const payreturnOrderclick = async () => {
             }
             return obj
         })
+        arr = arr.filter(item => { return item && item })
         if (arr.length != 0) {
-            await payreturnOrder(arr.filter(item => { return item && item }))
+            await payreturnOrder()
             changechecked.value = false
             recharge.value = false
             itemboxshow.value = false
@@ -331,7 +332,7 @@ const changezong = (e, b, c) => {
         } else {
             refundamount.value = clearNoNum({ value: JSON.stringify(Number(refundamount.value) - (Number(e.num) * Number(e.price))) })
         }
-        if (orderDetaildata.value.detailList.every(item => item.checked == true || item.status == 'refund')) {//判断是否全选
+        if (orderDetaildata.value.detailList.every(item => item.checked == true || item.status == 'refund' || item.orderType == 'return' )) {//判断是否全选
             changechecked.value = true
         } else {
             changechecked.value = false
@@ -341,7 +342,7 @@ const changezong = (e, b, c) => {
         orderDetaildata.value.detailList.forEach((e, a, b) => {
             console.log(e, refundamount.value)
             if (changechecked.value) {
-                if (e.status == 'refund') {
+                if (e.status == 'refund' && e.orderType == 'return') {
                     e.checked = false
                 } else {
                     e.checked = true

From 9a45998a651eedf2aac69ab46c39d6ae6b63e7e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Sat, 16 Mar 2024 13:44:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/components/add.vue |  4 +++-
 src/views/order/index.vue          | 24 ++++++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/views/order/components/add.vue b/src/views/order/components/add.vue
index 95d86ce..63a06cd 100644
--- a/src/views/order/components/add.vue
+++ b/src/views/order/components/add.vue
@@ -33,7 +33,8 @@
                 <div style="color:#ff9e01;">
                     <span v-if="item.status == 'pending'">挂单</span>
                     <span style="color: red;" v-if="item.status == 'refund' && item.orderType == 'return'">退单</span>
-                    <span style="color:#21c36b;" v-if="item.status == 'closed' || item.status == 'refund'">订单完成</span>
+                    <span style="color:#21c36b;"
+                        v-if="item.orderType != 'return' && (item.status == 'closed' || item.status == 'refund')">订单完成</span>
                 </div>
             </div>
         </div>
@@ -75,6 +76,7 @@ const clickitemboxshow = (e) => {
         justify-content: space-between;
         border-bottom: 1px solid #ccc;
         position: relative;
+
         .demo_tabs_boxitem_oneyt {
             position: absolute;
             top: 20%;
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 81192b6..203e6a4 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -69,8 +69,10 @@
                 </div>
                 <div class="orderbox_right_top" style="margin-top: 20px; border-bottom: 2px solid #ccc;">
                     <span style="font-size: 16px;" v-if="orderDetaildata.status == 'pending'">挂单</span>
-                    <span style="font-size: 16px; color: red;" v-if="orderDetaildata.status == 'refund' && orderDetaildata.orderType == 'return'">退单</span>
-                    <span style="font-size: 16px; color:#21c36b;" v-if="orderDetaildata.status == 'closed' || orderDetaildata.status == 'refund'">订单完成</span>
+                    <span style="font-size: 16px; color: red;"
+                        v-if="orderDetaildata.status == 'refund' && orderDetaildata.orderType == 'return'">退单</span>
+                    <span style="font-size: 16px; color:#21c36b;"
+                        v-if="orderDetaildata.orderType != 'return' && (orderDetaildata.status == 'refund' || orderDetaildata.status == 'closed')">订单完成</span>
                 </div>
                 <div class="orderbox_right_top" style="margin-top: 20px;">
                     <span>商品明细</span>
@@ -84,17 +86,18 @@
                 </div>
                 <div class="orderbox_right_list_item" style="margin-top: 20px;"
                     v-for="(item, index) in orderDetaildata.detailList" :key="index">
-                    <div>{{ item.productName }}-{{ item.productSkuName }}</div>
+                    <div>{{ item.productName }} {{ item.productSkuName }}</div>
                     <div style="text-align: center;">{{ item.num }}</div>
                     <div style="text-align: center;">{{ item.price }}</div>
-                    <div v-if="item.status == 'refund' && item.orderType == 'return'"><span
+                    <div v-if="item.status == 'refund'"><span
                             style="border: 2px solid red; color: red; padding: 4px 2px;">已退</span></div>
                     <div v-else>{{ item.priceAmount }}</div>
                 </div>
             </div>
             <div class="orderbox_right_button">
-                <el-button style="width: 100%;" v-if="orderDetaildata.status == 'refund' && orderDetaildata.orderType == 'return'" type="primary"
-                    @click="recharge = true">退单</el-button>
+                <el-button style="width: 100%;"
+                    v-if="orderDetaildata.orderType != 'return' && (orderDetaildata.status == 'refund' || orderDetaildata.status == 'closed')"
+                    type="primary" @click="recharge = true">退单</el-button>
                 <div class="orderbox_right_buttonbutton">
                     <!-- // -->
                     <el-button @click="print('normal')" style="width: 45%;" type="">重打收銀打票</el-button>
@@ -186,7 +189,7 @@
                             v-for="(item, index) in orderDetaildata.detailList" :key="index">
                             <div class="recharge_footer_itemright_botton_itemone">
                                 <el-checkbox @change="changezong(item, index, 1)"
-                                    :disabled="item.status == 'refund' && item.orderType == 'return' ? true : false" v-model="item.checked"
+                                    :disabled="item.status == 'refund' ? true : false" v-model="item.checked"
                                     size="large" />
                                 <span style="margin-left: 10px;">{{ item.productName }}</span>
                             </div>
@@ -244,6 +247,7 @@ const buttonloading = ref() //loading
 const payreturnOrderclick = async () => {
     buttonloading.value = true
     if (refundamount.value == 0) {
+        buttonloading.value = false
         ElMessage.error('退款金额不能为0！')
         return false
     }
@@ -260,7 +264,7 @@ const payreturnOrderclick = async () => {
         })
         arr = arr.filter(item => { return item && item })
         if (arr.length != 0) {
-            await payreturnOrder()
+            await payreturnOrder(arr)
             changechecked.value = false
             recharge.value = false
             itemboxshow.value = false
@@ -332,7 +336,7 @@ const changezong = (e, b, c) => {
         } else {
             refundamount.value = clearNoNum({ value: JSON.stringify(Number(refundamount.value) - (Number(e.num) * Number(e.price))) })
         }
-        if (orderDetaildata.value.detailList.every(item => item.checked == true || item.status == 'refund' || item.orderType == 'return' )) {//判断是否全选
+        if (orderDetaildata.value.detailList.every(item => item.checked == true)) {//判断是否全选
             changechecked.value = true
         } else {
             changechecked.value = false
@@ -342,7 +346,7 @@ const changezong = (e, b, c) => {
         orderDetaildata.value.detailList.forEach((e, a, b) => {
             console.log(e, refundamount.value)
             if (changechecked.value) {
-                if (e.status == 'refund' && e.orderType == 'return') {
+                if (e.status == 'refund') {
                     e.checked = false
                 } else {
                     e.checked = true