From ef70f387ae504f20e15aa7d7a933800b768892fc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 19:26:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon

---
 seller/src/views/order/order/orderDetail.vue |  105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 102 insertions(+), 3 deletions(-)

diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index 909a124..6a63b8b 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -527,7 +527,7 @@
       </div>
     </Modal>
     <!--璁㈠崟鍒嗗寘瑁瑰彂璐�-->
-    <Modal v-model="groupShipModal" :loading="shipLoading" title="鍒嗗寘瑁瑰彂蹇��" width="1000">
+    <Modal v-model="groupShipModal" :loading="shipLoading" title="鍒嗗寘瑁瑰彂蹇��" width="1300">
       <div>
         <Form ref="groupOrderDeliveryForm" :model="groupOrderDeliveryForm" :label-width="90" :rules="groupOrderDeliverFormValidate" style="position: relative">
           <FormItem label="鐗╂祦鍏徃" prop="logisticsId">
@@ -571,7 +571,7 @@
           </div>
         </template>
         <template slot="numSlot" slot-scope="{ row, index }">
-          <InputNumber :min="0" :max="row.___num - row.deliverNumber" v-model="data[index].canNum">
+          <InputNumber :min="0" :max="row.___num - row.deliverNumber - row.returnGoodsNumber" v-model="data[index].canNum">
           </InputNumber>
         </template>
       </Table>
@@ -777,6 +777,55 @@
             );
           },
         },
+        {
+          title: "閫�娆炬暟閲�",
+          key: "returnGoodsNumber",
+          minWidth: 80,
+        },
+        {
+          title: "閫�娆鹃噾棰�",
+          key: "refundPrice",
+          minWidth: 80,
+        },
+        {
+          title: "閫�娆剧姸鎬�",
+          key: "isRefund",
+          minWidth: 80,
+          render:(h, params) => {
+            if(params.row.isRefund==='NO_REFUND'){
+              return h(
+                "div",
+                "鏈��娆�"
+              );
+            }else if(params.row.isRefund==='ALL_REFUND'){
+              return h(
+                "div",
+                { style: {color:"red"} },
+                "鍏ㄩ儴閫�娆�"
+              );
+            }else if(params.row.isRefund==='PART_REFUND'){
+              return h(
+                "div",
+                { style: {color:"red"} },
+                "閮ㄥ垎閫�娆�"
+              );
+            }else if(params.row.isRefund==='REFUNDING'){
+              return h(
+                "div",
+                { style: {color:"red"} },
+                "閫�娆句腑"
+              );
+            }
+            else {
+              return h(
+                "div",
+                { style: {color:"red"} },
+                "鏈煡鐘舵��"
+              );
+            }
+
+          }
+        },
       ],
       data: [], // 鍟嗗搧琛ㄥ崟鏁版嵁
       orderLogColumns: [
@@ -849,6 +898,55 @@
           render: (h, params) => {
             return h("div", this.$options.filters.unitPrice(params.row.subTotal, "锟�"));
           },
+        },
+        {
+          title: "閫�娆炬暟閲�",
+          key: "returnGoodsNumber",
+          minWidth: 80,
+        },
+        {
+          title: "閫�娆鹃噾棰�",
+          key: "refundPrice",
+          minWidth: 80,
+        },
+        {
+          title: "閫�娆剧姸鎬�",
+          key: "isRefund",
+          minWidth: 80,
+          render:(h, params) => {
+            if(params.row.isRefund==='NO_REFUND'){
+              return h(
+                "div",
+                "鏈��娆�"
+              );
+            }else if(params.row.isRefund==='ALL_REFUND'){
+              return h(
+                "div",
+                { style: {color:"red"} },
+                "鍏ㄩ儴閫�娆�"
+              );
+            }else if(params.row.isRefund==='PART_REFUND'){
+              return h(
+                "div",
+                { style: {color:"red"} },
+                "閮ㄥ垎閫�娆�"
+              );
+            }else if(params.row.isRefund==='REFUNDING'){
+              return h(
+                "div",
+                { style: {color:"red"} },
+                "閫�娆句腑"
+              );
+            }
+            else {
+              return h(
+                "div",
+                { style: {color:"red"} },
+                "鏈煡鐘舵��"
+              );
+            }
+
+          }
         },
       ],
       orderPackage: [],
@@ -1016,7 +1114,7 @@
             this.data = res.result.orderItems.map((item) => {
               // 鍙湪寮圭獥鎵撳紑鐘舵�佷笅鎵嶄繚鐣欑敤鎴蜂慨鏀圭殑canNum鍊�
               const existingItem = this.groupShipModalOpened ? this.data.find(d => d.id === item.id) : null;
-              const defaultCanNum = item.num - item.deliverNumber;
+              const defaultCanNum = item.num - item.deliverNumber - item.returnGoodsNumber;
 
               return {
                 ...item,
@@ -1106,6 +1204,7 @@
       }
     },
     logisticsList () {
+      this.packageTraceList = []
       this.logisticsModal = true;
       API_Order.getPackage(this.sn).then((res) => {
         if (res.success && res.result != null) {

--
Gitblit v1.8.0