修改退回订单的恢复订单功能

src/views/recycleOrder/components/order-customer.vue

@@ -1,57 +1,64 @@
 <template>
-    <div class="recycle-order-number">
-        <div class="common-text" v-if="!isReturn">
-            <el-text>用户名：</el-text>
-            <el-text>{{ row.userNick }}</el-text>
-        </div>
-        <div class="common-text" v-if="isReturn">
-            <el-text>昵称：</el-text>
-            <el-text>{{ row.userNick }}
-                <el-tag type="success" size="small" v-if="platformType">
-                    {{ platformType }}
-                </el-tag>
-            </el-text>
-        </div>
-        <div class="common-text">
-            <el-text>发件人：</el-text>
-            <el-text v-if="!row.sendName">暂无信息</el-text>
-            <el-text v-else>{{ formatName(row.sendName) }}（{{ formatPhone(row.sendMobile) }}）</el-text>
-        </div>
-        <div class="common-text">
-            <el-text>省市区：</el-text>
-            <el-text>{{ row.sendSsq || '-' }}</el-text>
-        </div>
-        <div class="common-text">
-            <el-text>地址：</el-text>
-            <el-text>{{ row.sendAddress || '-' }}</el-text>
-        </div>
-        <div class="common-text" v-if="!isReturn">
-            <el-text>标签：</el-text>
-            <el-text v-if="row.userTags">{{ row.userTags.join(',') }}</el-text>
-            <el-text v-else>暂无标签</el-text>
-        </div>
+  <div class="recycle-order-number">
+    <div class="common-text" v-if="!isReturn">
+      <el-text>用户名：</el-text>
+      <el-text>{{ row.userNick }}</el-text>
     </div>
+    <div class="common-text" v-if="isReturn">
+      <el-text>昵称：</el-text>
+      <el-text
+        >{{ row.userNick }}
+        <el-tag type="success" size="small" v-if="platformType">
+          {{ platformType }}
+        </el-tag>
+      </el-text>
+    </div>
+    <div class="common-text">
+      <el-text>发件人：</el-text>
+      <el-text v-if="!row.sendName">暂无信息</el-text>
+      <el-text v-else
+        >{{ formatName(row.sendName) }}（{{
+          formatPhone(row.sendMobile)
+        }}）</el-text
+      >
+    </div>
+    <div class="common-text">
+      <el-text>省市区：</el-text>
+      <el-text>{{ row.sendSsq || '-' }}</el-text>
+    </div>
+    <div class="common-text">
+      <el-text>地址：</el-text>
+      <el-text :class="row.pirateSchoolName ? 'bg-red-300' : ''">{{
+        row.sendAddress || '-'
+      }}</el-text>
+    </div>
+    <div class="common-text" v-if="!isReturn">
+      <el-text>标签：</el-text>
+      <el-text v-if="row.userTags">{{ row.userTags.join(',') }}</el-text>
+      <el-text v-else>暂无标签</el-text>
+    </div>
+  </div>
 </template>
 
 <script setup>
-import { formatName, formatPhone } from '@/utils/common';
-import { computed } from 'vue';
+  import { formatName, formatPhone } from '@/utils/common';
+  import { computed } from 'vue';
 
-const props = defineProps({
+  const props = defineProps({
     row: {
-        type: Object,
-        default: () => { }
+      type: Object,
+      default: () => {}
     },
     isReturn: {
-        type: Boolean,
-        default: false
+      type: Boolean,
+      default: false
     }
-});
+  });
 
-const platformType = computed(() => {
+  const platformType = computed(() => {
     const value = props.row.orderFrom || props.row.plat;
     if (value === 1) return '微信';
     if (value === 2) return '支付宝';
     return '';
-});
+  });
 </script>

src/views/recycleOrder/components/order-number.vue

@@ -27,7 +27,7 @@
       </div>
       <div class="common-text">
         <el-text>订单备注：</el-text>
-        <el-text>{{ row.userExpress || '-' }}</el-text>
+        <el-text :class="row.userExpress ? 'bg-green-200' : ''">{{ row.userExpress || '-' }}</el-text>
       </div>
     </template>
 

src/views/recycleOrder/needReturned/index.vue

@@ -109,6 +109,15 @@
             >
               [取消订单]
             </el-button>
+            <el-button
+              type="danger"
+              link
+              v-if="row.status == '6'"
+              v-permission="'recycleOrder:needReturned:cancelRecover'"
+              @click="cancelRecover(row)"
+            >
+              [恢复订单]
+            </el-button>
             <el-button
               type="warning"
               link
@@ -230,7 +239,10 @@
 
   /** 搜索 */
   const reload = (where) => {
-    tableRef.value?.reload?.({ page: 1, where: { ...where, tabStatus: status.value } });
+    tableRef.value?.reload?.({
+      page: 1,
+      where: { ...where, tabStatus: status.value }
+    });
   };
 
   //订单详情
@@ -265,6 +277,14 @@
       row
     });
   }
+  //恢复订单
+  function cancelRecover(row) {
+    messageBoxConfirm({
+      message: '确认恢复?',
+      url: '/order/orderInfo/refund/cancelRecover',
+      row
+    });
+  }
   //人工发货
   const deliveryRef = ref(null);
   function handleManualDelivery(row) {