Merge branch 'feature/distribution' into test

src/pages/Groupmeal/Distrib/index.vue

@@ -131,7 +131,7 @@
         :show-close="false"
       >
         <el-form class="dioFor">
-          <el-form-item label="活动姓名" label-width="100px">
+          <el-form-item label="活动名称" label-width="100px">
             <el-select
               v-model="selectActivity"
               :disabled="isEdit"
@@ -175,7 +175,7 @@
             <el-table-column
               align="center"
               prop="deliverer_min_capacity"
-              label="最少配送量"
+              label="最小配送量"
             >
             </el-table-column>
             <el-table-column
@@ -330,6 +330,7 @@ export default {
       this.getDelivererList();
       this.multipleSelection = [];
       this.deliverer = []
+      this.isEdit = false
     },
     // 修改
     async handleModify(row) {

src/pages/Groupmeal/orderManagement/index.vue

@@ -25,10 +25,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="订单状态：" prop="order_status">
-          <el-select
-            v-model="orderQueryObj.order_status"
-            placeholder="请选择"
-          >
+          <el-select v-model="orderQueryObj.order_status" placeholder="请选择">
             <el-option
               v-for="item in orderStatusArr"
               :key="item.value"
@@ -98,11 +95,13 @@
         </el-row>
         <el-tab-pane label="全部" name="all">
           <el-table :data="orderTableData" border stripe style="width: 100%">
-            <el-table-column
-              prop="marketing_name"
-              label="活动名称"
-              width
-            ></el-table-column>
+            <el-table-column prop="marketing_name" label="活动名称">
+              <template #default="scope">
+                <div>
+                  {{ scope.row.marketing_name }}({{ scope.row.marketing_id }})
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="order_id"
               label="订单号"
@@ -120,14 +119,32 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="user_name" label="收货人"></el-table-column>
+            <el-table-column prop="user_name" label="收货人">
+              <template #default="scope">
+                <div>
+                  <span
+                    >{{ scope.row.user_name }}({{ scope.row.user_nick }})</span
+                  >
+                  <p>{{ scope.row.user_mobile }}</p>
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="sub_shop_name"
               label="自提点"
             ></el-table-column>
             <el-table-column prop="comment" label="备注"></el-table-column>
             <el-table-column prop="pay_time" label="支付时间"></el-table-column>
-            <el-table-column prop="payment" label="支付金额"></el-table-column>
+            <el-table-column prop="payment" label="支付金额">
+              <template #default="scope">
+                <div>
+                  ￥{{ scope.row.payment }}
+                  <span v-show="scope.row.refund_amount"
+                    >(已退￥{{ scope.row.refund_amount }})</span
+                  >
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="discount_fee"
               label="优惠金额"
@@ -167,11 +184,13 @@
         <el-tab-pane label="售后" name="afterSale">
           <!-- start -->
           <el-table :data="orderTableData" border stripe style="width: 100%">
-            <el-table-column
-              prop="marketing_name"
-              label="活动名称"
-              width
-            ></el-table-column>
+            <el-table-column prop="marketing_name" label="活动名称">
+              <template #default="scope">
+                <div>
+                  {{ scope.row.marketing_name }}({{ scope.row.marketing_id }})
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="order_id"
               label="订单号"
@@ -189,14 +208,32 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="user_name" label="收货人"></el-table-column>
+            <el-table-column prop="user_name" label="收货人">
+              <template #default="scope">
+                <div>
+                  <span
+                    >{{ scope.row.user_name }}({{ scope.row.user_nick }})</span
+                  >
+                  <p>{{ scope.row.user_mobile }}</p>
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="sub_shop_name"
               label="自提点"
             ></el-table-column>
             <el-table-column prop="comment" label="备注"></el-table-column>
             <el-table-column prop="pay_time" label="支付时间"></el-table-column>
-            <el-table-column prop="payment" label="支付金额"></el-table-column>
+            <el-table-column prop="payment" label="支付金额">
+              <template #default="scope">
+                <div>
+                  ￥{{ scope.row.payment }}
+                  <span v-show="scope.row.refund_amount"
+                    >(已退￥{{ scope.row.refund_amount }})</span
+                  >
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="discount_fee"
               label="优惠金额"
@@ -302,7 +339,7 @@
             <el-input-number
               v-model="item.refundableQuantity"
               @change="handleChange"
-              :min="1"
+              :min="0"
               :max="item.goods_num"
               label="描述文字"
             ></el-input-number>
@@ -456,7 +493,7 @@ export default {
   },
 
   methods: {
-    activityNameFocus(){
+    activityNameFocus() {
       this.getOrderListMet();
     },
 
@@ -590,8 +627,8 @@ export default {
     async getOrderListMet() {
       try {
         const res = await getOrderList(this.orderQueryObj);
-        this.goodsNum = res.count;
-        this.totalNum = res.count;
+        this.goodsNum = res.goods_num; // 商品共计
+        this.totalNum = res.count; // 商品总数
         this.orderTableData = res.result;
       } catch (error) {
         this.$message.error("发生未知错误,请稍后再试一下吧~~~");
@@ -655,6 +692,18 @@ export default {
       };
       const res = await orderItemList(params);
       this.refundGoods = res.result;
+      console.log(res.result);
+      for (var i in res.result) {
+        this.refundGoods[i].refundableQuantity = Number(
+          res.result[i].goods_num - res.result[i].refund_count
+        );
+        this.refundGoods[i].payment = Number(
+          res.result[i].payment - res.result[i].refund_amount
+        );
+        this.refundGoods[i].amountToRefund = Number(
+          res.result[i].payment - res.result[i].refund_amount
+        );
+      }
     },
     // 退款确认
     async handleConfirmRefund() {
@@ -687,13 +736,17 @@ export default {
       }
 
       itemsToRefund = itemsToRefund.map(processRefundItem);
+      // if ((itemsToRefund.length = 0)) {
+      //   this.$message.error("请选择退款商品");
+      //   return;
+      // }
       const res = await refundOrder(orderId, itemsToRefund);
       if (res.code === 0) {
         this.$message.success("退款成功");
         this.refundShow = false;
         return;
       }
-      this.refundShow = false;
+      // this.refundShow = false;
       this.$message.error(res.reason);
     },
   },